tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/services/impl ServletInfoImpl.java
Date Sun, 04 Jul 2004 15:55:31 GMT
hlship      2004/07/04 08:55:31

  Modified:    .        status.xml
               framework/src/org/apache/tapestry/test Creator.java
               junit/src/org/apache/tapestry/services/impl
                        TestBasicInfrastructure.java
               framework/src/org/apache/tapestry/services/impl
                        ServletInfoImpl.java
  Added:       lib/ext  hivemind-lib-1.0-beta-1.jar hivemind-1.0-beta-1.jar
  Removed:     lib/ext  hivemind-lib-1.0-beta-1-snapshot.jar
                        hivemind-1.0-beta-1-snapshot.jar
  Log:
  Upgrade to hivemind-1.0-beta-1.
  Change ServletInfoImpl to use the simpler threaded model.
  
  Revision  Changes    Path
  1.49      +0 -1      jakarta-tapestry/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/status.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- status.xml	3 May 2004 16:04:40 -0000	1.48
  +++ status.xml	4 Jul 2004 15:55:30 -0000	1.49
  @@ -1,5 +1,4 @@
   <?xml version="1.0"?>
  -<!-- $Id$ -->
   <status>
   
     <developers>
  
  
  
  1.1                  jakarta-tapestry/lib/ext/hivemind-lib-1.0-beta-1.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tapestry/lib/ext/hivemind-1.0-beta-1.jar
  
  	<<Binary file>>
  
  
  1.2       +0 -1      jakarta-tapestry/framework/src/org/apache/tapestry/test/Creator.java
  
  Index: Creator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/test/Creator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Creator.java	17 Jun 2004 21:32:01 -0000	1.1
  +++ Creator.java	4 Jul 2004 15:55:31 -0000	1.2
  @@ -28,7 +28,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.hivemind.ApplicationRuntimeException;
  -import org.apache.hivemind.ClassResolver;
   import org.apache.hivemind.service.ClassFab;
   import org.apache.hivemind.service.ClassFabUtils;
   import org.apache.hivemind.service.MethodSignature;
  
  
  
  1.2       +0 -1      jakarta-tapestry/junit/src/org/apache/tapestry/services/impl/TestBasicInfrastructure.java
  
  Index: TestBasicInfrastructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/junit/src/org/apache/tapestry/services/impl/TestBasicInfrastructure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBasicInfrastructure.java	21 Jun 2004 19:11:53 -0000	1.1
  +++ TestBasicInfrastructure.java	4 Jul 2004 15:55:31 -0000	1.2
  @@ -53,7 +53,6 @@
       public void testServletInfoImpl()
       {
           ServletInfoImpl si = new ServletInfoImpl();
  -        si.setStorage(new MockThreadLocalStorage());
   
           HttpServletRequest r = (HttpServletRequest) newMock(HttpServletRequest.class);
           HttpServletResponse p = (HttpServletResponse) newMock(HttpServletResponse.class);
  
  
  
  1.2       +6 -15     jakarta-tapestry/framework/src/org/apache/tapestry/services/impl/ServletInfoImpl.java
  
  Index: ServletInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/services/impl/ServletInfoImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletInfoImpl.java	21 Jun 2004 19:11:52 -0000	1.1
  +++ ServletInfoImpl.java	4 Jul 2004 15:55:31 -0000	1.2
  @@ -18,7 +18,6 @@
   import javax.servlet.http.HttpServletResponse;
   
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.service.ThreadLocalStorage;
   import org.apache.tapestry.services.ServletInfo;
   
   /**
  @@ -30,30 +29,22 @@
    */
   public class ServletInfoImpl extends BaseLocatable implements ServletInfo
   {
  -    private ThreadLocalStorage _storage;
  -
  -    public static final String REQUEST_KEY = "org.apache.tapestry.servlet-request";
  -    public static final String RESPONSE_KEY = "org.apache.tapestry.servlet-response";
  +    private HttpServletRequest _request;
  +    private HttpServletResponse _response;
   
       public void store(HttpServletRequest request, HttpServletResponse response)
       {
  -        _storage.put(REQUEST_KEY, request);
  -        _storage.put(RESPONSE_KEY, response);
  +        _request = request;
  +        _response = response;
       }
   
       public HttpServletRequest getRequest()
       {
  -        return (HttpServletRequest) _storage.get(REQUEST_KEY);
  +        return _request;
       }
   
       public HttpServletResponse getResponse()
       {
  -        return (HttpServletResponse) _storage.get(RESPONSE_KEY);
  +        return _response;
       }
  -
  -    public void setStorage(ThreadLocalStorage storage)
  -    {
  -        _storage = storage;
  -    }
  -
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org


Mime
View raw message