|
|
hlship 2005/02/25 10:01:31
Modified: framework/src/descriptor/META-INF tapestry.request.xml
tapestry.persist.xml tapestry.state.xml
tapestry.services.xml hivemodule.xml
framework/src/java/org/apache/tapestry/services/impl
InfrastructureImpl.java
framework/src/java/org/apache/tapestry/services
Infrastructure.java
Log:
Change infrastructure: properties request and response to be type WebRequest
and WebResponse.
Revision Changes Path
1.14 +1 -1
jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.request.xml
Index: tapestry.request.xml
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.request.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tapestry.request.xml 25 Feb 2005 15:01:53 -0000 1.13
+++ tapestry.request.xml 25 Feb 2005 18:01:31 -0000 1.14
@@ -134,7 +134,7 @@
<invoke-factory>
<construct class="impl.AbsoluteURLBuilderImpl">
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
</construct>
</invoke-factory>
1.5 +1 -1
jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.persist.xml
Index: tapestry.persist.xml
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.persist.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tapestry.persist.xml 25 Feb 2005 00:54:46 -0000 1.4
+++ tapestry.persist.xml 25 Feb 2005 18:01:31 -0000 1.5
@@ -51,7 +51,7 @@
<invoke-factory>
<construct class="SessionPropertyPersistenceStrategy">
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
<set-object property="applicationId"
value="infrastructure:applicationId"/>
</construct>
</invoke-factory>
1.6 +1 -1
jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.state.xml
Index: tapestry.state.xml
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.state.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tapestry.state.xml 25 Feb 2005 15:01:53 -0000 1.5
+++ tapestry.state.xml 25 Feb 2005 18:01:31 -0000 1.6
@@ -169,7 +169,7 @@
<invoke-factory>
<construct class="SessionScopeManager">
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
<set-object property="applicationId"
value="infrastructure:applicationId"/>
</construct>
</invoke-factory>
1.13 +2 -2
jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.services.xml
Index: tapestry.services.xml
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.services.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tapestry.services.xml 25 Feb 2005 15:01:53 -0000 1.12
+++ tapestry.services.xml 25 Feb 2005 18:01:31 -0000 1.13
@@ -102,7 +102,7 @@
<invoke-factory model="primitive">
<construct class="ActionService">
<set-object property="responseRenderer"
value="infrastructure:responseRenderer"/>
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
<set-object property="linkFactory"
value="infrastructure:linkFactory"/>
</construct>
</invoke-factory>
@@ -112,7 +112,7 @@
<invoke-factory model="primitive">
<construct class="DirectService">
<set-object property="responseRenderer"
value="infrastructure:responseRenderer"/>
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
</construct>
</invoke-factory>
</service-point>
1.27 +3 -5
jakarta-tapestry/framework/src/descriptor/META-INF/hivemodule.xml
Index: hivemodule.xml
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/hivemodule.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hivemodule.xml 25 Feb 2005 00:54:46 -0000 1.26
+++ hivemodule.xml 25 Feb 2005 18:01:31 -0000 1.27
@@ -77,10 +77,8 @@
<set-service property="linkFactory"
service-id="tapestry.url.LinkFactory"/>
<set-service property="requestCycleFactory"
service-id="tapestry.request.RequestCycleFactory"/>
<set-service property="applicationStateManager"
service-id="tapestry.state.ApplicationStateManager"/>
- <set-service property="request"
service-id="tapestry.globals.HttpServletRequest"/>
- <set-service property="webRequest"
service-id="tapestry.globals.WebRequest"/>
- <set-service property="response"
service-id="tapestry.globals.HttpServletResponse"/>
- <set-service property="webResponse"
service-id="tapestry.globals.WebResponse"/>
+ <set-service property="request"
service-id="tapestry.globals.WebRequest"/>
+ <set-service property="response"
service-id="tapestry.globals.WebResponse"/>
<set-service property="componentPropertySource"
service-id="tapestry.props.ComponentPropertySource"/>
<set-object property="applicationId"
value="service-property:tapestry.globals.ApplicationGlobals:servletName"/>
<set-object property="context"
value="service-property:tapestry.globals.ApplicationGlobals:webContext"/>
@@ -177,7 +175,7 @@
<invoke-factory>
<construct class="impl.RequestExceptionReporterImpl">
- <set-object property="request" value="infrastructure:webRequest"/>
+ <set-object property="request" value="infrastructure:request"/>
</construct>
</invoke-factory>
</service-point>
1.21 +11 -38
jakarta-tapestry/framework/src/java/org/apache/tapestry/services/impl/InfrastructureImpl.java
Index: InfrastructureImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/services/impl/InfrastructureImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- InfrastructureImpl.java 25 Feb 2005 00:54:47 -0000 1.20
+++ InfrastructureImpl.java 25 Feb 2005 18:01:31 -0000 1.21
@@ -14,9 +14,6 @@
package org.apache.tapestry.services.impl;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.Resource;
import org.apache.tapestry.engine.IPageSource;
@@ -37,8 +34,8 @@
import org.apache.tapestry.services.ServiceMap;
import org.apache.tapestry.services.TemplateSource;
import org.apache.tapestry.spec.IApplicationSpecification;
-import org.apache.tapestry.web.WebContextResource;
import org.apache.tapestry.web.WebContext;
+import org.apache.tapestry.web.WebContextResource;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebResponse;
@@ -86,19 +83,15 @@
private ApplicationStateManager _applicationStateManager;
- private HttpServletRequest _request;
-
- private HttpServletResponse _response;
-
private WebContext _context;
private String _applicationId;
private ComponentPropertySource _componentPropertySource;
- private WebRequest _containerRequest;
+ private WebRequest _request;
- private WebResponse _containerResponse;
+ private WebResponse _response;
public IScriptSource getScriptSource()
{
@@ -271,26 +264,6 @@
_applicationStateManager = applicationStateManager;
}
- public HttpServletRequest getRequest()
- {
- return _request;
- }
-
- public void setRequest(HttpServletRequest request)
- {
- _request = request;
- }
-
- public HttpServletResponse getResponse()
- {
- return _response;
- }
-
- public void setResponse(HttpServletResponse response)
- {
- _response = response;
- }
-
public String getContextPath()
{
return _request.getContextPath();
@@ -336,23 +309,23 @@
_componentPropertySource = componentPropertySource;
}
- public WebRequest getWebRequest()
+ public WebRequest getRequest()
{
- return _containerRequest;
+ return _request;
}
- public void setContainerRequest(WebRequest containerRequest)
+ public void setRequest(WebRequest request)
{
- _containerRequest = containerRequest;
+ _request = request;
}
- public WebResponse getWebResponse()
+ public WebResponse getResponse()
{
- return _containerResponse;
+ return _response;
}
- public void setContainerResponse(WebResponse containerResponse)
+ public void setResponse(WebResponse response)
{
- _containerResponse = containerResponse;
+ _response = response;
}
}
\ No newline at end of file
1.20 +18 -37
jakarta-tapestry/framework/src/java/org/apache/tapestry/services/Infrastructure.java
Index: Infrastructure.java
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/services/Infrastructure.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Infrastructure.java 25 Feb 2005 00:54:47 -0000 1.19
+++ Infrastructure.java 25 Feb 2005 18:01:31 -0000 1.20
@@ -49,13 +49,12 @@
* See <code>tapestry.ApplicationPropertySource</code>.
*/
public IPropertySource getApplicationPropertySource();
-
+
/**
- * Returns an {@link IPropertySource} configured to search
- * the servlet, servlet context, and factory defaults.
- *
+ * Returns an {@link IPropertySource}configured to search the servlet,
servlet context, and
+ * factory defaults.
*/
-
+
public IPropertySource getGlobalPropertySource();
/**
@@ -155,36 +154,20 @@
public ApplicationStateManager getApplicationStateManager();
/**
- * Returns the request for the current request cycle.
- *
- * <p>Note: to be removed.
+ * Returns the container request for the current request cycle.
+ * <p>
+ * Note: to be renamed to getRequest().
*/
- public HttpServletRequest getRequest();
+ public WebRequest getRequest();
/**
- * Returns the response for the current request.
- */
-
- public HttpServletResponse getResponse();
-
- /**
- * Returns the container request for the current request cycle.
- *
- * <p>Note: to be renamed to getRequest().
- *
- */
-
- public WebRequest getWebRequest();
-
- /**
* Returns the container response for the current request cycle.
- *
- * <p>Note: to be renamed to getResponse().
- *
+ * <p>
+ * Note: to be renamed to getResponse().
*/
-
- public WebResponse getWebResponse();
+
+ public WebResponse getResponse();
/**
* Returns the context path, which identifies the application within the
application server.
@@ -201,19 +184,17 @@
*/
public String getApplicationId();
-
+
/**
- * Returns the root context resource, which is the starting point when
looking for
- * resources within the application.
- *
+ * Returns the root context resource, which is the starting point when
looking for resources
+ * within the application.
*/
-
+
public Resource getContextRoot();
-
+
/**
* Returns an object used to access component meta-data properties.
- *
*/
-
+
public ComponentPropertySource getComponentPropertySource();
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@xxxxxxxxxxxxxxxxxx
For additional commands, e-mail: tapestry-dev-help@xxxxxxxxxxxxxxxxxx
|
|