You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/12/18 21:22:35 UTC
svn commit: r892369 [3/4] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/
tiles-request/tiles-request-freemarker/src/main/...
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -34,9 +34,9 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.DefinitionModel;
import org.junit.Before;
@@ -140,8 +140,8 @@
tModel.start(eq("myName"), eq("myTemplate"), eq("myRole"),
eq("myExtends"), eq("myPreparer"),
- isA(FreeMarkerTilesRequestContext.class));
- tModel.end(isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
+ tModel.end(isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -35,9 +35,9 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.GetAsStringModel;
import org.junit.Before;
@@ -145,8 +145,8 @@
tModel.start(eq(false), eq("myPreparer"), eq("myRole"),
eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"),
eq("myName"), eq(attribute),
- isA(FreeMarkerTilesRequestContext.class));
- tModel.end(eq(false), isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
+ tModel.end(eq(false), isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -39,8 +39,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.ImportAttributeModel;
import org.junit.Before;
@@ -141,7 +141,7 @@
params.put("ignore", objectWrapper.wrap(false));
tModel.execute(eq("myName"), (String) isNull(), eq("myToName"), eq(false),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
replay(tModel, body, attribute, applicationContext);
fmModel.execute(env, params, null, body);
@@ -185,7 +185,7 @@
params.put("scope", objectWrapper.wrap("request"));
tModel.execute(eq("myName"), eq("request"), eq("myToName"), eq(false),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
replay(tModel, body, attribute, applicationContext);
fmModel.execute(env, params, null, body);
@@ -229,7 +229,7 @@
params.put("scope", objectWrapper.wrap("session"));
tModel.execute(eq("myName"), eq("session"), eq("myToName"), eq(false),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
replay(tModel, body, attribute, applicationContext);
fmModel.execute(env, params, null, body);
@@ -273,7 +273,7 @@
params.put("scope", objectWrapper.wrap("application"));
tModel.execute(eq("myName"), eq("application"), eq("myToName"), eq(false),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
replay(tModel, body, attribute, applicationContext);
fmModel.execute(env, params, null, body);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -35,9 +35,9 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.InsertAttributeModel;
import org.junit.Before;
@@ -145,8 +145,8 @@
tModel.start(eq(false), eq("myPreparer"), eq("myRole"),
eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"),
eq("myName"), eq(attribute),
- isA(FreeMarkerTilesRequestContext.class));
- tModel.end(eq(false), isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
+ tModel.end(eq(false), isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -35,9 +35,9 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.InsertDefinitionModel;
import org.junit.Before;
@@ -141,10 +141,10 @@
params.put("role", objectWrapper.wrap("myRole"));
params.put("preparer", objectWrapper.wrap("myPreparer"));
- tModel.start(isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(isA(FreemarkerRequest.class));
tModel.end(eq("myName"), eq("myTemplate"), eq("myTemplateType"),
eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -35,9 +35,9 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.InsertTemplateModel;
import org.junit.Before;
@@ -142,10 +142,10 @@
params.put("role", objectWrapper.wrap("myRole"));
params.put("preparer", objectWrapper.wrap("myPreparer"));
- tModel.start(isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(isA(FreemarkerRequest.class));
tModel.end(eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"),
eq("myRole"), eq("myPreparer"),
- isA(FreeMarkerTilesRequestContext.class));
+ isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -34,8 +34,8 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.PutAttributeModel;
import org.junit.Before;
@@ -139,9 +139,9 @@
params.put("type", objectWrapper.wrap("myType"));
params.put("cascade", objectWrapper.wrap(false));
- tModel.start(isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(isA(FreemarkerRequest.class));
tModel.end(eq("myName"), eq(value), eq("myExpression"), eq(""),
- eq("myRole"), eq("myType"), eq(false), isA(FreeMarkerTilesRequestContext.class));
+ eq("myRole"), eq("myType"), eq(false), isA(FreemarkerRequest.class));
body.render(isA(StringWriter.class));
replay(tModel, body, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -34,9 +34,9 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.PutListAttributeModel;
import org.junit.Before;
@@ -137,8 +137,8 @@
params.put("inherit", objectWrapper.wrap(false));
params.put("cascade", objectWrapper.wrap(false));
- tModel.start(eq("myRole"), eq(false), isA(FreeMarkerTilesRequestContext.class));
- tModel.end(eq("myName"), eq(false), isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(eq("myRole"), eq(false), isA(FreemarkerRequest.class));
+ tModel.end(eq("myName"), eq(false), isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(tModel, body, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java Fri Dec 18 20:21:36 2009
@@ -35,8 +35,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.template.SetCurrentContainerModel;
import org.junit.Before;
@@ -124,7 +124,7 @@
expect(servlet.getServletContext()).andReturn(servletContext).times(2);
expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE))
.andReturn(applicationContext);
- sccModel.execute(eq("myContainerKey"), isA(FreeMarkerTilesRequestContext.class));
+ sccModel.execute(eq("myContainerKey"), isA(FreemarkerRequest.class));
replay(servlet, servletContext);
ServletContextHashModel servletContextModel = new ServletContextHashModel(servlet, objectWrapper);
expect(model.get(FreemarkerServlet.KEY_REQUEST)).andReturn(requestModel);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.AddAttributeModel;
/**
@@ -201,7 +201,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext pageContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(pageContext),
(PageContext) pageContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.AddListAttributeModel;
/**
@@ -121,7 +121,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.GetAsStringModel;
@@ -305,7 +305,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -24,8 +24,8 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.ImportAttributeModel;
/**
@@ -155,7 +155,7 @@
@Override
public void doTag() {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -30,8 +30,8 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.InsertAttributeModel;
@@ -315,7 +315,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.InsertDefinitionModel;
/**
@@ -284,7 +284,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.InsertTemplateModel;
/**
@@ -260,7 +260,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.PutAttributeModel;
/**
@@ -268,7 +268,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.PutListAttributeModel;
/**
@@ -207,7 +207,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Fri Dec 18 20:21:36 2009
@@ -28,8 +28,8 @@
import javax.servlet.jsp.tagext.TagExtraInfo;
import javax.servlet.jsp.tagext.VariableInfo;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.ImportAttributeModel;
/**
@@ -178,7 +178,7 @@
@Override
public void doTag() {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil
.getApplicationContext(jspContext),
(PageContext) jspContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java Fri Dec 18 20:21:36 2009
@@ -28,9 +28,9 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.jsp.JspUtil;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.template.DefinitionModel;
/**
@@ -166,7 +166,7 @@
@Override
public void doTag() throws JspException, IOException {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
org.apache.tiles.request.jsp.JspUtil.getApplicationContext(jspContext),
(PageContext) jspContext);
model.start(name, template, role, extend, preparer, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java Fri Dec 18 20:21:36 2009
@@ -25,8 +25,8 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.request.jsp.JspUtil;
import org.apache.tiles.template.SetCurrentContainerModel;
@@ -69,7 +69,7 @@
@Override
public void doTag() {
JspContext jspContext = getJspContext();
- Request request = JspTilesRequestContext.createServletJspRequest(
+ Request request = JspRequest.createServletJspRequest(
JspUtil.getApplicationContext(jspContext),
(PageContext) jspContext);
model.execute(containerKey, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java Fri Dec 18 20:21:36 2009
@@ -2,75 +2,73 @@
import java.util.Map;
-import org.apache.tiles.request.Request;
-
import ognl.OgnlContext;
-import ognl.OgnlException;
import ognl.PropertyAccessor;
+import org.apache.tiles.request.Request;
+
public class AnyScopePropertyAccessor implements PropertyAccessor {
- @SuppressWarnings("unchecked")
- @Override
- public Object getProperty(Map context, Object target, Object name)
- throws OgnlException {
- Request request = (Request) target;
- String attributeName = (String) name;
- for (String scopeName: request.getAvailableScopes()) {
- Map<String, Object> scope = request.getContext(scopeName);
- if (scope.containsKey(attributeName)) {
- return scope.get(attributeName);
- }
- }
- return null;
- }
-
- @Override
- public String getSourceAccessor(OgnlContext context, Object target,
- Object index) {
- Request request = (Request) target;
- String attributeName = (String) index;
- for (String scopeName: request.getAvailableScopes()) {
- Map<String, Object> scope = request.getContext(scopeName);
- if (scope.containsKey(attributeName)) {
- return ".getContext(\"" + scopeName + "\").get(index)";
- }
- }
- return null;
- }
-
- @Override
- public String getSourceSetter(OgnlContext context, Object target,
- Object index) {
- Request request = (Request) target;
- String attributeName = (String) index;
- String[] availableScopes = request.getAvailableScopes();
- for (String scopeName: availableScopes) {
- Map<String, Object> scope = request.getContext(scopeName);
- if (scope.containsKey(attributeName)) {
- return ".getContext(\"" + scopeName + "\").put(index, target)";
- }
- }
- return ".getContext(\"" + availableScopes[0] + "\").put(index, target)";
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public void setProperty(Map context, Object target, Object name,
- Object value) throws OgnlException {
- Request request = (Request) target;
- String attributeName = (String) name;
- String[] availableScopes = request.getAvailableScopes();
- for (String scopeName: availableScopes) {
- Map<String, Object> scope = request.getContext(scopeName);
- if (scope.containsKey(attributeName)) {
- scope.put(attributeName, value);
- return;
- }
- }
- if (availableScopes.length > 0) {
- request.getContext(availableScopes[0]).put(attributeName, value);
- }
- }
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object getProperty(Map context, Object target, Object name) {
+ Request request = (Request) target;
+ String attributeName = (String) name;
+ for (String scopeName: request.getAvailableScopes()) {
+ Map<String, Object> scope = request.getContext(scopeName);
+ if (scope.containsKey(attributeName)) {
+ return scope.get(attributeName);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getSourceAccessor(OgnlContext context, Object target,
+ Object index) {
+ Request request = (Request) target;
+ String attributeName = (String) index;
+ for (String scopeName: request.getAvailableScopes()) {
+ Map<String, Object> scope = request.getContext(scopeName);
+ if (scope.containsKey(attributeName)) {
+ return ".getContext(\"" + scopeName + "\").get(index)";
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getSourceSetter(OgnlContext context, Object target,
+ Object index) {
+ Request request = (Request) target;
+ String attributeName = (String) index;
+ String[] availableScopes = request.getAvailableScopes();
+ for (String scopeName: availableScopes) {
+ Map<String, Object> scope = request.getContext(scopeName);
+ if (scope.containsKey(attributeName)) {
+ return ".getContext(\"" + scopeName + "\").put(index, target)";
+ }
+ }
+ return ".getContext(\"" + availableScopes[0] + "\").put(index, target)";
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void setProperty(Map context, Object target, Object name,
+ Object value) {
+ Request request = (Request) target;
+ String attributeName = (String) name;
+ String[] availableScopes = request.getAvailableScopes();
+ for (String scopeName: availableScopes) {
+ Map<String, Object> scope = request.getContext(scopeName);
+ if (scope.containsKey(attributeName)) {
+ scope.put(attributeName, value);
+ return;
+ }
+ }
+ if (availableScopes.length > 0) {
+ request.getContext(availableScopes[0]).put(attributeName, value);
+ }
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java Fri Dec 18 20:21:36 2009
@@ -3,48 +3,46 @@
import java.util.Map;
import ognl.OgnlContext;
-import ognl.OgnlException;
import ognl.PropertyAccessor;
import org.apache.tiles.request.Request;
public class ScopePropertyAccessor implements PropertyAccessor {
- @SuppressWarnings("unchecked")
- @Override
- public Object getProperty(Map context, Object target, Object name)
- throws OgnlException {
- Request request = (Request) target;
- String scope = (String) name;
- if (scope.endsWith("Scope")) {
- String scopeName = scope.substring(0, scope.length() - 5);
- return request.getContext(scopeName);
- }
- return null;
- }
-
- @Override
- public String getSourceAccessor(OgnlContext context, Object target,
- Object index) {
- String scope = (String) index;
- if (scope.endsWith("Scope")) {
- String scopeName = scope.substring(0, scope.length() - 5);
- return ".getContext(\"" + scopeName + "\")";
- }
- return null;
- }
-
- @Override
- public String getSourceSetter(OgnlContext context, Object target,
- Object index) {
- return null;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public void setProperty(Map context, Object target, Object name,
- Object value) throws OgnlException {
- // Does nothing.
- }
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object getProperty(Map context, Object target, Object name) {
+ Request request = (Request) target;
+ String scope = (String) name;
+ if (scope.endsWith("Scope")) {
+ String scopeName = scope.substring(0, scope.length() - 5);
+ return request.getContext(scopeName);
+ }
+ return null;
+ }
+
+ @Override
+ public String getSourceAccessor(OgnlContext context, Object target,
+ Object index) {
+ String scope = (String) index;
+ if (scope.endsWith("Scope")) {
+ String scopeName = scope.substring(0, scope.length() - 5);
+ return ".getContext(\"" + scopeName + "\")";
+ }
+ return null;
+ }
+
+ @Override
+ public String getSourceSetter(OgnlContext context, Object target,
+ Object index) {
+ return null;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void setProperty(Map context, Object target, Object name,
+ Object value) {
+ // Does nothing.
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java Fri Dec 18 20:21:36 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.ognl;
-import java.util.Map;
-
import ognl.PropertyAccessor;
import org.apache.tiles.request.ApplicationContext;
@@ -94,10 +92,10 @@
Request request) {
PropertyAccessor retValue;
if (propertyName.endsWith("Scope")) {
- String scopeName = propertyName.substring(0, propertyName.length() - 5);
- if (request.getContext(scopeName) != null) {
- return scopePropertyAccessor;
- }
+ String scopeName = propertyName.substring(0, propertyName.length() - 5);
+ if (request.getContext(scopeName) != null) {
+ return scopePropertyAccessor;
+ }
}
if (beanInfo.getMappedDescriptors(Request.class)
.containsKey(propertyName)) {
@@ -106,7 +104,7 @@
.containsKey(propertyName)) {
retValue = applicationContextPropertyAccessor;
} else {
- return anyScopePropertyAccessor;
+ return anyScopePropertyAccessor;
}
return retValue;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Fri Dec 18 20:21:36 2009
@@ -27,8 +27,8 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.NotAServletEnvironmentException;
-import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
-import org.apache.tiles.request.servlet.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
+import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.util.TilesRequestContextWrapper;
@@ -55,15 +55,15 @@
* context could not be found.
* @since 2.2.0
*/
- public static ServletTilesRequestContext getServletRequest(Request request) {
+ public static ServletRequest getServletRequest(Request request) {
Request currentRequest = request;
while (true) {
if (currentRequest == null) {
throw new NotAServletEnvironmentException("Last Tiles request context is null");
}
- if (currentRequest instanceof ServletTilesRequestContext) {
- return (ServletTilesRequestContext) currentRequest;
+ if (currentRequest instanceof ServletRequest) {
+ return (ServletRequest) currentRequest;
}
if (!(currentRequest instanceof TilesRequestContextWrapper)) {
throw new NotAServletEnvironmentException("Not a Servlet environment, not supported");
@@ -82,8 +82,8 @@
* @since 2.2.0
*/
public static ServletContext getServletContext(ApplicationContext applicationContext) {
- if (applicationContext instanceof ServletTilesApplicationContext) {
- return (ServletContext) ((ServletTilesApplicationContext) applicationContext).getContext();
+ if (applicationContext instanceof ServletApplicationContext) {
+ return (ServletContext) ((ServletApplicationContext) applicationContext).getContext();
}
throw new NotAServletEnvironmentException("Not a Servlet-based environment");
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java Fri Dec 18 20:21:36 2009
@@ -21,10 +21,9 @@
package org.apache.tiles.web.startup;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.startup.TilesInitializer;
import org.apache.tiles.web.util.ServletContextAdapter;
@@ -52,11 +51,11 @@
/** {@inheritDoc} */
@Override
- public void init() throws ServletException {
+ public void init() {
initializer = createTilesInitializer();
ServletContext adaptedContext = new ServletContextAdapter(
getServletConfig());
- ServletTilesApplicationContext preliminaryContext = new ServletTilesApplicationContext(
+ ServletApplicationContext preliminaryContext = new ServletApplicationContext(
adaptedContext);
initializer.initialize(preliminaryContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java Fri Dec 18 20:21:36 2009
@@ -27,7 +27,7 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.startup.TilesInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
public void contextInitialized(ServletContextEvent event) {
ServletContext servletContext = event.getServletContext();
initializer = createTilesInitializer();
- initializer.initialize(new ServletTilesApplicationContext(
+ initializer.initialize(new ServletApplicationContext(
servletContext));
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java Fri Dec 18 20:21:36 2009
@@ -30,7 +30,6 @@
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,7 +41,7 @@
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -222,7 +221,7 @@
/**
* {@inheritDoc}
*/
- public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain)
+ public void doFilter(javax.servlet.ServletRequest req, ServletResponse res, FilterChain filterChain)
throws IOException, ServletException {
// If the request contains the prevent token, we must not reapply the definition.
// This is used to ensure that filters mapped to wild cards do not infinately
@@ -234,7 +233,7 @@
ApplicationContext applicationContext = org.apache.tiles.request.servlet.ServletUtil
.getApplicationContext(getServletContext());
- Request request = new ServletTilesRequestContext(applicationContext,
+ Request request = new ServletRequest(applicationContext,
(HttpServletRequest) req, (HttpServletResponse) res);
TilesContainer container = TilesAccess.getContainer(applicationContext,
containerKey);
@@ -252,7 +251,7 @@
* @param request The request object.
* @return The final definition name.
*/
- private String getDefinitionForRequest(ServletRequest request) {
+ private String getDefinitionForRequest(javax.servlet.ServletRequest request) {
if (alternateDefinitions.size() < 1) {
return definitionName;
}
@@ -272,7 +271,7 @@
* @param request The request object to use.
* @return The request base.
*/
- private String getRequestBase(ServletRequest request) {
+ private String getRequestBase(javax.servlet.ServletRequest request) {
// Included Path
String include = (String) request.getAttribute("javax.servlet.include.servlet_path");
if (include != null) {
@@ -290,7 +289,7 @@
class DefaultMutator implements AttributeContextMutator {
/** {@inheritDoc} */
- public void mutate(AttributeContext ctx, ServletRequest req) {
+ public void mutate(AttributeContext ctx, javax.servlet.ServletRequest req) {
Attribute attr = new Attribute();
attr.setRenderer("template");
attr.setValue(getRequestBase(req));
@@ -304,7 +303,7 @@
* @param request The HTTP request object.
* @return <code>true</code> if the token is present.
*/
- private boolean isPreventTokenPresent(ServletRequest request) {
+ private boolean isPreventTokenPresent(javax.servlet.ServletRequest request) {
return preventDecorationToken != null && request.getAttribute(preventDecorationToken) != null;
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Fri Dec 18 20:21:36 2009
@@ -21,7 +21,6 @@
package org.apache.tiles.web.util;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -32,7 +31,7 @@
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +93,7 @@
ApplicationContext applicationContext = org.apache.tiles.request.servlet.ServletUtil
.getApplicationContext(getServletContext());
- Request request = new ServletTilesRequestContext(applicationContext,
+ Request request = new ServletRequest(applicationContext,
req, res);
TilesContainer container = TilesAccess.getContainer(applicationContext,
containerKey);
@@ -137,7 +136,7 @@
class DefaultMutator implements AttributeContextMutator {
/** {@inheritDoc} */
- public void mutate(AttributeContext context, ServletRequest request) {
+ public void mutate(AttributeContext context, javax.servlet.ServletRequest request) {
// noop;
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java Fri Dec 18 20:21:36 2009
@@ -25,7 +25,7 @@
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.wildcard.WildcardServletApplicationContext;
import org.apache.tiles.startup.AbstractTilesInitializer;
/**
@@ -53,7 +53,7 @@
@Override
protected ApplicationContext createTilesApplicationContext(
ApplicationContext preliminaryContext) {
- return new WildcardServletTilesApplicationContext(
+ return new WildcardServletApplicationContext(
(ServletContext) preliminaryContext.getContext());
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java Fri Dec 18 20:21:36 2009
@@ -25,7 +25,7 @@
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.wildcard.WildcardServletApplicationContext;
import org.apache.tiles.startup.AbstractTilesInitializer;
import org.apache.tiles.test.factory.TestTilesContainerFactory;
@@ -47,7 +47,7 @@
@Override
protected ApplicationContext createTilesApplicationContext(
ApplicationContext preliminaryContext) {
- return new WildcardServletTilesApplicationContext(
+ return new WildcardServletApplicationContext(
(ServletContext) preliminaryContext.getContext());
}
-}
\ No newline at end of file
+}
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java Fri Dec 18 20:21:36 2009
@@ -28,7 +28,6 @@
import javax.portlet.GenericPortlet;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletSession;
import javax.portlet.PortletURL;
@@ -38,8 +37,8 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.portlet.context.PortletTilesRequestContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.portlet.PortletRequest;
/**
* Test Portlet.
@@ -58,7 +57,7 @@
portletSession.removeAttribute("definition");
TilesContainer container = getCurrentContainer(request,
getPortletContext());
- Request currentRequest = new PortletTilesRequestContext(container
+ Request currentRequest = new PortletRequest(container
.getApplicationContext(), getPortletContext(), request,
response);
if (container.isValidDefinition(definition, currentRequest)) {
@@ -113,8 +112,8 @@
* @return The current Tiles container to use in web pages.
* @since 2.1.0
*/
- private static TilesContainer getCurrentContainer(PortletRequest request,
- PortletContext context) {
+ private static TilesContainer getCurrentContainer(
+ javax.portlet.PortletRequest request, PortletContext context) {
TilesContainer container = (TilesContainer) request
.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME);
if (container == null) {
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java Fri Dec 18 20:21:36 2009
@@ -34,7 +34,7 @@
import org.apache.tiles.locale.impl.DefaultLocaleResolver;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ServletRequest;
/**
* Servlet able to let a user choose a locale.
@@ -101,7 +101,7 @@
session.setAttribute(DefaultLocaleResolver.LOCALE_KEY, locale);
ApplicationContext applicationContext = org.apache.tiles.request.servlet.ServletUtil
.getApplicationContext(getServletContext());
- Request currentRequest = new ServletTilesRequestContext(applicationContext, request, response);
+ Request currentRequest = new ServletRequest(applicationContext, request, response);
TilesAccess.setCurrentContainer(currentRequest, containerKey);
TilesContainer container = TilesAccess.getCurrentContainer(currentRequest);
container.render(definitionName, currentRequest);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java Fri Dec 18 20:21:36 2009
@@ -21,7 +21,6 @@
package org.apache.tiles.velocity.context;
-import java.io.IOException;
import java.io.Writer;
import java.util.Map;
@@ -56,8 +55,7 @@
return "";
}
- public boolean render(InternalContextAdapter context, Writer writer)
- throws IOException {
+ public boolean render(InternalContextAdapter context, Writer writer) {
// Does nothing, really!
return true;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java Fri Dec 18 20:21:36 2009
@@ -29,12 +29,12 @@
import javax.servlet.ServletContext;
import org.apache.tiles.Attribute;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
+import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.util.IteratorEnumeration;
import org.apache.velocity.Template;
@@ -54,7 +54,7 @@
*/
public class VelocityAttributeRenderer extends
AbstractTypeDetectingAttributeRenderer implements
- TilesApplicationContextAware {
+ ApplicationContextAware {
/**
* The VelocityView object to use.
@@ -109,7 +109,7 @@
Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
- ServletTilesRequestContext servletRequest = ServletUtil.getServletRequest(request);
+ ServletRequest servletRequest = ServletUtil.getServletRequest(request);
// then get a context
Context context = velocityView.createContext(servletRequest
.getRequest(), servletRequest.getResponse());
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.AddAttributeModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
@@ -72,7 +72,7 @@
public Renderable execute(HttpServletRequest request,
HttpServletResponse response, Context velocityContext,
Map<String, Object> params) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -87,7 +87,7 @@
Context velocityContext) {
Map<String, Object> params = VelocityUtil.getParameterStack(
velocityContext).pop();
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -101,7 +101,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.AddListAttributeModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
@@ -71,7 +71,7 @@
/** {@inheritDoc} */
public Renderable end(HttpServletRequest request, HttpServletResponse response,
Context velocityContext) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -82,7 +82,7 @@
/** {@inheritDoc} */
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.DefinitionModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
@@ -74,7 +74,7 @@
public Renderable execute(HttpServletRequest request,
HttpServletResponse response, Context velocityContext,
Map<String, Object> params) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -88,7 +88,7 @@
/** {@inheritDoc} */
public Renderable end(HttpServletRequest request,
HttpServletResponse response, Context velocityContext) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -99,7 +99,7 @@
/** {@inheritDoc} */
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java Fri Dec 18 20:21:36 2009
@@ -32,8 +32,8 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.GetAsStringModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -85,7 +85,7 @@
public boolean render(InternalContextAdapter context, Writer writer)
throws IOException {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -106,7 +106,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -127,7 +127,7 @@
public boolean render(InternalContextAdapter context, Writer writer)
throws IOException {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java Fri Dec 18 20:21:36 2009
@@ -30,8 +30,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.ImportAttributeModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -78,7 +78,7 @@
response, request) {
public boolean render(InternalContextAdapter context, Writer writer) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java Fri Dec 18 20:21:36 2009
@@ -32,8 +32,8 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.InsertAttributeModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -85,7 +85,7 @@
public boolean render(InternalContextAdapter context, Writer writer)
throws IOException {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -100,7 +100,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -120,7 +120,7 @@
public boolean render(InternalContextAdapter context, Writer writer)
throws IOException {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java Fri Dec 18 20:21:36 2009
@@ -30,8 +30,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.InsertDefinitionModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -81,7 +81,7 @@
return new AbstractDefaultToStringRenderable(velocityContext, params, response, request) {
public boolean render(InternalContextAdapter context, Writer writer) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -103,7 +103,7 @@
response, request) {
public boolean render(InternalContextAdapter context, Writer writer) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -121,7 +121,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java Fri Dec 18 20:21:36 2009
@@ -30,8 +30,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.InsertTemplateModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -81,7 +81,7 @@
return new AbstractDefaultToStringRenderable(velocityContext, params, response, request) {
public boolean render(InternalContextAdapter context, Writer writer) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -102,7 +102,7 @@
return new AbstractDefaultToStringRenderable(velocityContext, params, response, request) {
public boolean render(InternalContextAdapter context, Writer writer) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, writer);
@@ -120,7 +120,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java Fri Dec 18 20:21:36 2009
@@ -29,8 +29,8 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.tiles.template.PutAttributeModel;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
@@ -76,7 +76,7 @@
public Renderable execute(HttpServletRequest request,
HttpServletResponse response, Context velocityContext,
Map<String, Object> params) {
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -95,7 +95,7 @@
Context velocityContext) {
Map<String, Object> params = VelocityUtil.getParameterStack(
velocityContext).pop();
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);
@@ -112,7 +112,7 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
VelocityUtil.getParameterStack(velocityContext).push(params);
- Request currentRequest = VelocityTilesRequestContext
+ Request currentRequest = VelocityRequest
.createVelocityRequest(ServletUtil
.getApplicationContext(servletContext), request,
response, velocityContext, null);