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 [2/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/...
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java Fri Dec 18 20:21:36 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.portlet.context;
+package org.apache.tiles.request.portlet;
import java.io.IOException;
import java.io.OutputStream;
@@ -30,23 +30,23 @@
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.tiles.request.AbstractRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.util.TilesApplicationContextWrapper;
/**
* Portlet-based TilesApplicationContext implementation.
*
* @version $Rev$ $Date$
*/
-public class PortletTilesRequestContext extends TilesApplicationContextWrapper
- implements Request {
+public class PortletRequest extends AbstractRequest {
+
+ private static final String[] SCOPES = {"request", "portletSession", "session", "application"};
/**
* <p>The lazily instantiated <code>Map</code> of header name-value
@@ -69,7 +69,7 @@
/**
* <p>The <code>PortletRequest</code> for this request.</p>
*/
- protected PortletRequest request = null;
+ protected javax.portlet.PortletRequest request = null;
/**
@@ -96,6 +96,12 @@
*/
private Map<String, Object> sessionScope = null;
+ /**
+ * <p>The lazily instantiated <code>Map</code> of portlet session scope
+ * attributes.</p>
+ */
+ private Map<String, Object> portletSessionScope = null;
+
/**
* <p>Indicates whether the request is an ActionRequest or RenderRequest.
@@ -122,23 +128,23 @@
* @param response The response object to use.
* @since 2.1.1
*/
- public PortletTilesRequestContext(
- ApplicationContext applicationContext, PortletContext context,
- PortletRequest request, PortletResponse response) {
+ public PortletRequest(ApplicationContext applicationContext,
+ PortletContext context, javax.portlet.PortletRequest request,
+ PortletResponse response) {
super(applicationContext);
this.context = context;
initialize(request, response);
}
/**
- * <p>Initialize (or reinitialize) this {@link PortletTilesRequestContext} instance
+ * <p>Initialize (or reinitialize) this {@link PortletRequest} instance
* for the specified Portlet API objects.</p>
*
* @param request The <code>PortletRequest</code> for this request
* @param response The <code>PortletResponse</code> for this request
*/
- public void initialize(PortletRequest request,
- PortletResponse response) {
+ public void initialize(javax.portlet.PortletRequest request,
+ PortletResponse response) {
// Save the specified Portlet API object references
this.request = request;
this.response = response;
@@ -179,7 +185,7 @@
*
* @return The used portlet request.
*/
- public PortletRequest getRequest() {
+ public javax.portlet.PortletRequest getRequest() {
return (this.request);
}
@@ -237,15 +243,22 @@
/** {@inheritDoc} */
public Map<String, Object> getSessionScope() {
if ((sessionScope == null) && (request != null)) {
- sessionScope =
- new PortletSessionScopeMap(request.getPortletSession());
+ sessionScope = new PortletSessionScopeMap(request, PortletSession.APPLICATION_SCOPE);
}
return (sessionScope);
}
/** {@inheritDoc} */
- public ApplicationContext getApplicationContext() {
- return getWrappedApplicationContext();
+ public Map<String, Object> getPortletSessionScope() {
+ if ((portletSessionScope == null) && (request != null)) {
+ portletSessionScope = new PortletSessionScopeMap(request, PortletSession.PORTLET_SCOPE);
+ }
+ return (portletSessionScope);
+ }
+
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
}
/** {@inheritDoc} */
@@ -313,9 +326,8 @@
public Locale getRequestLocale() {
if (request != null) {
return request.getLocale();
- } else {
- return null;
}
+ return null;
}
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequestScopeMap.java?rev=892369&r1=884019&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequestScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequestScopeMap.java Fri Dec 18 20:21:36 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.portlet.context;
+package org.apache.tiles.request.portlet;
import java.util.ArrayList;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletSessionScopeMap.java (from r884031, tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletSessionScopeMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletSessionScopeMap.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java&r1=884031&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletSessionScopeMap.java Fri Dec 18 20:21:36 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.portlet.context;
+package org.apache.tiles.request.portlet;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletUtil.java (from r884031, tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletUtil.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletUtil.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java&r1=884031&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletUtil.java Fri Dec 18 20:21:36 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.portlet.context;
+package org.apache.tiles.request.portlet;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java Fri Dec 18 20:21:36 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.portlet.context;
+package org.apache.tiles.request.portlet;
import java.util.Map;
@@ -28,13 +28,14 @@
//import org.apache.shale.test.mock.MockPortletResponse;
//import org.apache.shale.test.mock.MockPortletSession;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.portlet.PortletRequest;
import junit.framework.TestCase;
/**
* @version $Rev$ $Date$
*/
-public class PortletTilesRequestContextTest extends TestCase {
+public class PortletRequestTest extends TestCase {
/**
* The used request context.
@@ -116,7 +117,7 @@
}
/**
- * Tests {@link PortletTilesRequestContext#getApplicationContext()}.
+ * Tests {@link PortletRequest#getApplicationContext()}.
*/
public void testGetApplicationContext() {
// assertTrue("The objects are not the same", context == context
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContext.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContext.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContext.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContext.java Fri Dec 18 20:21:36 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.servlet.wildcard;
+package org.apache.tiles.request.servlet.wildcard;
import java.io.IOException;
import java.net.URL;
@@ -28,7 +28,7 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.web.context.support.ServletContextResourcePatternResolver;
@@ -40,8 +40,8 @@
* @version $Rev$ $Date$
* @since 2.2.1
*/
-public class WildcardServletTilesApplicationContext extends
- ServletTilesApplicationContext {
+public class WildcardServletApplicationContext extends
+ ServletApplicationContext {
/**
* The pattern resolver.
@@ -56,7 +56,7 @@
* @param servletContext The servlet context.
* @since 2.2.1
*/
- public WildcardServletTilesApplicationContext(ServletContext servletContext) {
+ public WildcardServletApplicationContext(ServletContext servletContext) {
super(servletContext);
}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContextTest.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContextTest.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java Fri Dec 18 20:21:36 2009
@@ -18,11 +18,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.wildcard;
+package org.apache.tiles.request.servlet.wildcard;
import junit.framework.TestCase;
-import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
import org.easymock.EasyMock;
import java.io.File;
@@ -38,11 +37,11 @@
/**
- * Tests {@link WildcardServletTilesApplicationContext}.
+ * Tests {@link WildcardServletApplicationContext}.
*
* @version $Rev$ $Date$
*/
-public class WildcardServletTilesApplicationContextTest extends TestCase {
+public class WildcardServletApplicationContextTest extends TestCase {
/**
* Number of properties container inside the test.properties file.
@@ -57,7 +56,7 @@
/**
* The enhanced Tiles application context.
*/
- private WildcardServletTilesApplicationContext context;
+ private WildcardServletApplicationContext context;
/**
* The original class loader.
@@ -74,12 +73,12 @@
} catch (MalformedURLException e) {
throw new RuntimeException("Error when using the mock classloader");
}
- context = new WildcardServletTilesApplicationContext(servletContext);
+ context = new WildcardServletApplicationContext(servletContext);
}
/** {@inheritDoc} */
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() {
Thread.currentThread().setContextClassLoader(original);
}
@@ -112,7 +111,7 @@
"classpath*:/test.properties").size());
assertEquals(1, context.getResources(
- "classpath*:/org/apache/tiles/servlet/wildcard/*Test.class").size());
+ "classpath*:/org/apache/tiles/request/servlet/wildcard/*Test.class").size());
EasyMock.verify(servletContext);
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java Fri Dec 18 20:21:36 2009
@@ -21,7 +21,6 @@
package org.apache.tiles.request.servlet;
-import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.http.HttpServletResponse;
@@ -55,7 +54,7 @@
/** {@inheritDoc} */
@Override
- public PrintWriter getWriter() throws IOException {
+ public PrintWriter getWriter() {
return writer;
}
}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java Fri Dec 18 20:21:36 2009
@@ -35,7 +35,7 @@
*
* @version $Rev$ $Date$
*/
-public class ServletTilesApplicationContext implements ApplicationContext {
+public class ServletApplicationContext implements ApplicationContext {
/**
* The servlet context to use.
@@ -62,7 +62,7 @@
*
* @param servletContext The servlet context to use.
*/
- public ServletTilesApplicationContext(ServletContext servletContext) {
+ public ServletApplicationContext(ServletContext servletContext) {
initialize(servletContext);
}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java (from r887761, tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java&r1=887761&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java Fri Dec 18 20:21:36 2009
@@ -40,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class ServletTilesRequestContext extends AbstractRequest {
+public class ServletRequest extends AbstractRequest {
private static final String[] SCOPES = {"request", "session", "application"};
@@ -117,7 +117,7 @@
* @param response The response object.
* @since 2.1.1
*/
- public ServletTilesRequestContext(
+ public ServletRequest(
ApplicationContext applicationContext,
HttpServletRequest request, HttpServletResponse response) {
super(applicationContext);
@@ -301,7 +301,7 @@
}
/**
- * <p>Initialize (or reinitialize) this {@link ServletTilesRequestContext} instance
+ * <p>Initialize (or reinitialize) this {@link ServletRequest} instance
* for the specified Servlet API objects.</p>
*
* @param request The <code>HttpServletRequest</code> for this request
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java Fri Dec 18 20:21:36 2009
@@ -44,7 +44,7 @@
* @throws IOException If something goes wrong.
*/
@Test
- public void testGetWriter() throws IOException {
+ public void testGetWriter() {
HttpServletResponse wrappedResponse = createMock(HttpServletResponse.class);
Writer writer = new StringWriter();
PrintWriter printWriter = new PrintWriter(writer);
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java (from r884837, tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java&r1=884837&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java Fri Dec 18 20:21:36 2009
@@ -42,7 +42,7 @@
/**
* @version $Rev$ $Date$
*/
-public class ServletTilesRequestContextTest extends TestCase {
+public class ServletRequestTest extends TestCase {
/**
* Test path to check forward and include.
@@ -52,7 +52,7 @@
/**
* The request context.
*/
- private ServletTilesRequestContext context;
+ private ServletRequest context;
/**
* The servlet context.
@@ -86,7 +86,7 @@
request.addParameter("myParam", "value1");
request.addParameter("myParam", "value2");
- context = new ServletTilesRequestContext(applicationContext, request,
+ context = new ServletRequest(applicationContext, request,
response);
Map<String, Object> requestScope = context.getRequestScope();
@@ -171,7 +171,7 @@
}
/**
- * Tests {@link ServletTilesRequestContext#getApplicationContext()}.
+ * Tests {@link ServletRequest#getApplicationContext()}.
*/
public void testGetApplicationContext() {
assertTrue("The objects are not the same",
@@ -202,7 +202,7 @@
}
/**
- * Tests {@link ServletTilesRequestContext#getOutputStream()}.
+ * Tests {@link ServletRequest#getOutputStream()}.
*
* @throws IOException If something goes wrong.
*/
@@ -216,14 +216,14 @@
ServletOutputStream os = EasyMock.createMock(ServletOutputStream.class);
EasyMock.expect(response.getOutputStream()).andReturn(os);
EasyMock.replay(request, response, applicationContext, os);
- ServletTilesRequestContext requestContext = new ServletTilesRequestContext(
+ ServletRequest requestContext = new ServletRequest(
applicationContext, request, response);
assertEquals(os, requestContext.getOutputStream());
EasyMock.verify(request, response, applicationContext, os);
}
/**
- * Tests {@link ServletTilesRequestContext#getWriter()}.
+ * Tests {@link ServletRequest#getWriter()}.
*
* @throws IOException If something goes wrong.
*/
@@ -237,14 +237,14 @@
PrintWriter writer = EasyMock.createMock(PrintWriter.class);
EasyMock.expect(response.getWriter()).andReturn(writer);
EasyMock.replay(request, response, applicationContext, writer);
- ServletTilesRequestContext requestContext = new ServletTilesRequestContext(
+ ServletRequest requestContext = new ServletRequest(
applicationContext, request, response);
assertEquals(writer, requestContext.getWriter());
EasyMock.verify(request, response, applicationContext, writer);
}
/**
- * Tests {@link ServletTilesRequestContext#getPrintWriter()}.
+ * Tests {@link ServletRequest#getPrintWriter()}.
*
* @throws IOException If something goes wrong.
*/
@@ -258,7 +258,7 @@
PrintWriter writer = EasyMock.createMock(PrintWriter.class);
EasyMock.expect(response.getWriter()).andReturn(writer);
EasyMock.replay(request, response, applicationContext, writer);
- ServletTilesRequestContext requestContext = new ServletTilesRequestContext(
+ ServletRequest requestContext = new ServletRequest(
applicationContext, request, response);
assertEquals(writer, requestContext.getPrintWriter());
EasyMock.verify(request, response, applicationContext, writer);
@@ -329,10 +329,10 @@
}
/**
- * Extends {@link ServletTilesRequestContext} to check forward and include.
+ * Extends {@link ServletRequest} to check forward and include.
*/
private static class MockServletTilesRequestContext extends
- ServletTilesRequestContext {
+ ServletRequest {
/**
* The number of times that forward has been called.
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java Fri Dec 18 20:21:36 2009
@@ -19,11 +19,12 @@
* under the License.
*/
-package org.apache.tiles.velocity.context;
+package org.apache.tiles.request.velocity;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -32,9 +33,9 @@
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.ServletUtil;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
+import org.apache.tiles.request.servlet.ServletRequest;
+import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.tiles.request.util.TilesRequestContextWrapper;
import org.apache.velocity.context.Context;
@@ -44,7 +45,9 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class VelocityTilesRequestContext extends TilesRequestContextWrapper {
+public class VelocityRequest extends TilesRequestContextWrapper {
+
+ private static final String[] SCOPES = {"page"};
/**
* The Velocity current context.
@@ -61,6 +64,8 @@
*/
private Writer writer;
+ private Map<String, Object> pageScope;
+
/**
* Constructor.
*
@@ -69,13 +74,18 @@
* @param writer The writer to use to render the response. It may be null, if not necessary.
* @since 2.2.0
*/
- public VelocityTilesRequestContext(
+ public VelocityRequest(
Request enclosedRequest, Context ctx, Writer writer) {
super(enclosedRequest);
this.ctx = ctx;
this.writer = writer;
}
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
+ }
+
/** {@inheritDoc} */
@Override
public void dispatch(String path) throws IOException {
@@ -108,21 +118,20 @@
/** {@inheritDoc} */
@Override
- public PrintWriter getPrintWriter() throws IOException {
+ public PrintWriter getPrintWriter() {
if (writer == null) {
throw new IllegalStateException(
"A writer-less Tiles request has been created, cannot return a PrintWriter");
}
if (writer instanceof PrintWriter) {
return (PrintWriter) writer;
- } else {
- return new PrintWriter(writer);
}
+ return new PrintWriter(writer);
}
/** {@inheritDoc} */
@Override
- public Writer getWriter() throws IOException {
+ public Writer getWriter() {
if (writer == null) {
throw new IllegalStateException(
"A writer-less Tiles request has been created, cannot return a PrintWriter");
@@ -151,12 +160,19 @@
return requestObjects;
}
+ public Map<String, Object> getPageScope() {
+ if (pageScope == null) {
+ pageScope = new VelocityScopeMap(ctx);
+ }
+ return pageScope;
+ }
+
public static Request createVelocityRequest(ApplicationContext applicationContext,
HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Writer writer) {
- Request servletRequest = new ServletTilesRequestContext(
+ Request servletRequest = new ServletRequest(
applicationContext, request, response);
- Request velocityRequest = new VelocityTilesRequestContext(
+ Request velocityRequest = new VelocityRequest(
servletRequest, velocityContext, writer);
return velocityRequest;
}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java (from r884031, tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityScopeMap.java&r1=884031&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java Fri Dec 18 20:21:36 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.velocity.context;
+package org.apache.tiles.request.velocity;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java (from r884019, tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java&r1=884019&r2=892369&rev=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java Fri Dec 18 20:21:36 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.velocity.context;
+package org.apache.tiles.request.velocity;
import static org.junit.Assert.*;
import static org.easymock.classextension.EasyMock.*;
@@ -35,19 +35,20 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
+import org.apache.tiles.request.velocity.VelocityRequest;
import org.apache.velocity.context.Context;
import org.junit.Before;
import org.junit.Test;
/**
- * Tests {@link VelocityTilesRequestContext}.
+ * Tests {@link VelocityRequest}.
*/
-public class VelocityTilesRequestContextTest {
+public class VelocityRequestTest {
/**
* The request context to test.
*/
- private VelocityTilesRequestContext context;
+ private VelocityRequest context;
/**
* The Velocity context.
@@ -60,16 +61,16 @@
private StringWriter writer;
/**
- * @throws java.lang.Exception If something goes wrong.
+ * Sets up the test.
*/
@Before
- public void setUp() throws Exception {
+ public void setUp() {
velocityContext = createMock(Context.class);
writer = new StringWriter();
}
/**
- * Tests {@link VelocityTilesRequestContext#dispatch(String)}.
+ * Tests {@link VelocityRequest#dispatch(String)}.
*
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
@@ -91,13 +92,13 @@
expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
replay(velocityContext, enclosedRequest);
- context = new VelocityTilesRequestContext(enclosedRequest, velocityContext, writer);
+ context = new VelocityRequest(enclosedRequest, velocityContext, writer);
context.dispatch(path);
verify(velocityContext, enclosedRequest, servletRequest, response, dispatcher);
}
/**
- * Tests {@link VelocityTilesRequestContext#include(String)}.
+ * Tests {@link VelocityRequest#include(String)}.
*
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
@@ -119,48 +120,48 @@
expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
replay(velocityContext, enclosedRequest);
- context = new VelocityTilesRequestContext(enclosedRequest, velocityContext, writer);
+ context = new VelocityRequest(enclosedRequest, velocityContext, writer);
context.include(path);
verify(velocityContext, enclosedRequest, servletRequest, response, dispatcher);
}
/**
- * Tests {@link VelocityTilesRequestContext#getPrintWriter()}.
+ * Tests {@link VelocityRequest#getPrintWriter()}.
*
* @throws IOException If something goes wrong.
*/
@Test
- public void testGetPrintWriter() throws IOException {
+ public void testGetPrintWriter() {
Request enclosedRequest = createMock(Request.class);
replay(velocityContext, enclosedRequest);
- context = new VelocityTilesRequestContext(enclosedRequest, velocityContext, writer);
+ context = new VelocityRequest(enclosedRequest, velocityContext, writer);
assertNotNull(context.getPrintWriter());
verify(velocityContext, enclosedRequest);
}
/**
- * Tests {@link VelocityTilesRequestContext#getWriter()}.
+ * Tests {@link VelocityRequest#getWriter()}.
*
* @throws IOException If something goes wrong.
*/
@Test
- public void testGetWriter() throws IOException {
+ public void testGetWriter() {
Request enclosedRequest = createMock(Request.class);
replay(velocityContext, enclosedRequest);
- context = new VelocityTilesRequestContext(enclosedRequest, velocityContext, writer);
+ context = new VelocityRequest(enclosedRequest, velocityContext, writer);
assertEquals(writer, context.getWriter());
verify(velocityContext, enclosedRequest);
}
/**
- * Tests {@link VelocityTilesRequestContext#getRequestObjects()}.
+ * Tests {@link VelocityRequest#getRequestObjects()}.
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
@Test
- public void testGetRequestObjects() throws ServletException, IOException {
+ public void testGetRequestObjects() {
Request enclosedRequest = createMock(Request.class);
HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
@@ -171,7 +172,7 @@
expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
replay(velocityContext, enclosedRequest);
- context = new VelocityTilesRequestContext(enclosedRequest, velocityContext, writer);
+ context = new VelocityRequest(enclosedRequest, velocityContext, writer);
assertArrayEquals(new Object[] { velocityContext, servletRequest,
response, writer }, context.getRequestObjects());
verify(velocityContext, enclosedRequest, servletRequest, response);
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java Fri Dec 18 20:21:36 2009
@@ -98,9 +98,8 @@
int n = size();
if (n <= 0) {
throw new EmptyStackException();
- } else {
- return get(n - 1);
}
+ return get(n - 1);
}
/**
@@ -116,9 +115,8 @@
int m = (size() - n) - 1;
if (m < 0) {
throw new EmptyStackException();
- } else {
- return get(m);
}
+ return get(m);
}
/**
@@ -131,9 +129,8 @@
int n = size();
if (n <= 0) {
throw new EmptyStackException();
- } else {
- return remove(n - 1);
}
+ return remove(n - 1);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java Fri Dec 18 20:21:36 2009
@@ -209,11 +209,9 @@
}
// Sets attributes.
- cascadedAttributes = addMissingAttributes(
- ((BasicAttributeContext) parent).cascadedAttributes,
+ cascadedAttributes = addMissingAttributes(parent.cascadedAttributes,
cascadedAttributes);
- attributes = addMissingAttributes(
- ((BasicAttributeContext) parent).attributes, attributes);
+ attributes = addMissingAttributes(parent.attributes, attributes);
}
/**
@@ -307,18 +305,16 @@
public Set<String> getLocalAttributeNames() {
if (attributes != null && !attributes.isEmpty()) {
return attributes.keySet();
- } else {
- return null;
}
+ return null;
}
/** {@inheritDoc} */
public Set<String> getCascadedAttributeNames() {
if (cascadedAttributes != null && !cascadedAttributes.isEmpty()) {
return cascadedAttributes.keySet();
- } else {
- return null;
}
+ return null;
}
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java Fri Dec 18 20:21:36 2009
@@ -33,8 +33,8 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
-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.easymock.EasyMock;
import junit.framework.TestCase;
@@ -73,9 +73,9 @@
ServletContext servletContext = EasyMock
.createMock(ServletContext.class);
RequestDispatcher rd = EasyMock.createMock(RequestDispatcher.class);
- ApplicationContext applicationContext = new ServletTilesApplicationContext(
+ ApplicationContext applicationContext = new ServletApplicationContext(
servletContext);
- Request requestContext = new ServletTilesRequestContext(
+ Request requestContext = new ServletRequest(
applicationContext, request, response);
AttributeContext attributeContext = EasyMock
.createMock(AttributeContext.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java Fri Dec 18 20:21:36 2009
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
+import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
@@ -40,7 +40,7 @@
* @since 2.1.0
*/
public class BasicRendererFactory implements RendererFactory,
- TilesContainerAware, TilesApplicationContextAware,
+ TilesContainerAware, ApplicationContextAware,
AttributeEvaluatorFactoryAware {
/**
@@ -180,8 +180,8 @@
* @since 2.1.0
*/
protected void initializeRenderer(AttributeRenderer renderer) {
- if (renderer instanceof TilesApplicationContextAware) {
- ((TilesApplicationContextAware) renderer)
+ if (renderer instanceof ApplicationContextAware) {
+ ((ApplicationContextAware) renderer)
.setApplicationContext(applicationContext);
}
if (renderer instanceof TilesContainerAware) {
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java Fri Dec 18 20:21:36 2009
@@ -25,7 +25,7 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
+import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.request.ApplicationContext;
/**
@@ -35,7 +35,7 @@
* @since 2.2.1
*/
public class JspExpressionFactoryFactory implements ExpressionFactoryFactory,
- TilesApplicationContextAware {
+ ApplicationContextAware {
/**
* The servlet context.
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java Fri Dec 18 20:21:36 2009
@@ -22,7 +22,6 @@
import java.beans.FeatureDescriptor;
import java.beans.PropertyDescriptor;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -31,12 +30,9 @@
import junit.framework.TestCase;
-import org.apache.tiles.el.ELContextImpl;
-import org.apache.tiles.el.TilesContextELResolver;
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.easymock.EasyMock;
/**
* Tests {@link TilesContextELResolver}.
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java Fri Dec 18 20:21:36 2009
@@ -25,11 +25,11 @@
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;
/**
- * This initializer uses {@link WildcardServletTilesApplicationContext} to
+ * This initializer uses {@link WildcardServletApplicationContext} to
* retrieve resources using Ant-style patterns and creates a
* {@link CompleteAutoloadTilesContainerFactory} to load all new features of
* Tiles at once.
@@ -43,7 +43,7 @@
@Override
protected ApplicationContext createTilesApplicationContext(
ApplicationContext preliminaryContext) {
- return new WildcardServletTilesApplicationContext(
+ return new WildcardServletApplicationContext(
(ServletContext) preliminaryContext.getContext());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java Fri Dec 18 20:21:36 2009
@@ -36,7 +36,7 @@
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.reflect.ClassUtil;
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.TilesInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@
/** {@inheritDoc} */
public void initialize(ApplicationContext preliminaryContext) {
- ApplicationContext applicationContext = new WildcardServletTilesApplicationContext(
+ ApplicationContext applicationContext = new WildcardServletApplicationContext(
(ServletContext) preliminaryContext.getContext());
loadInitializers(applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java Fri Dec 18 20:21:36 2009
@@ -57,7 +57,7 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.apache.velocity.tools.view.VelocityView;
import org.junit.Before;
@@ -104,7 +104,7 @@
@Test
public void testRegisterAttributeRenderers() {
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
- ServletTilesApplicationContext applicationContext = createMock(ServletTilesApplicationContext.class);
+ ServletApplicationContext applicationContext = createMock(ServletApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
ServletContext servletContext = createMock(ServletContext.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java Fri Dec 18 20:21:36 2009
@@ -27,7 +27,7 @@
import javax.servlet.ServletContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.wildcard.WildcardServletApplicationContext;
import org.junit.Before;
import org.junit.Test;
@@ -63,7 +63,7 @@
replay(preliminaryContext, servletContext);
assertTrue(initializer
- .createTilesApplicationContext(preliminaryContext) instanceof WildcardServletTilesApplicationContext);
+ .createTilesApplicationContext(preliminaryContext) instanceof WildcardServletApplicationContext);
verify(preliminaryContext, servletContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java Fri Dec 18 20:21:36 2009
@@ -26,6 +26,7 @@
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.io.NullWriter;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import freemarker.core.Environment;
import freemarker.template.TemplateDirectiveBody;
@@ -62,7 +63,7 @@
*/
public static boolean isForceInclude(Environment env) {
return org.apache.tiles.request.servlet.ServletUtil
- .isForceInclude(FreeMarkerRequestUtil.getRequestHashModel(env).getRequest());
+ .isForceInclude(FreemarkerRequestUtil.getRequestHashModel(env).getRequest());
}
/**
@@ -75,7 +76,7 @@
*/
public static void setForceInclude(Environment env, boolean forceInclude) {
org.apache.tiles.request.servlet.ServletUtil.setForceInclude(
- FreeMarkerRequestUtil.getRequestHashModel(env).getRequest(), forceInclude);
+ FreemarkerRequestUtil.getRequestHashModel(env).getRequest(), forceInclude);
}
/**
@@ -149,12 +150,12 @@
"Error when wrapping an object", e);
}
} else if ("request".equals(scope)) {
- FreeMarkerRequestUtil.getRequestHashModel(env).getRequest().setAttribute(name, obj);
+ FreemarkerRequestUtil.getRequestHashModel(env).getRequest().setAttribute(name, obj);
} else if ("session".equals(scope)) {
- FreeMarkerRequestUtil.getRequestHashModel(env).getRequest().getSession().setAttribute(
+ FreemarkerRequestUtil.getRequestHashModel(env).getRequest().getSession().setAttribute(
name, obj);
} else if ("application".equals(scope)) {
- FreeMarkerRequestUtil.getServletContextHashModel(env).getServlet().getServletContext()
+ FreemarkerRequestUtil.getServletContextHashModel(env).getServlet().getServletContext()
.setAttribute(name, obj);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java Fri Dec 18 20:21:36 2009
@@ -21,7 +21,6 @@
package org.apache.tiles.freemarker.io;
-import java.io.IOException;
import java.io.Writer;
/**
@@ -34,19 +33,19 @@
/** {@inheritDoc} */
@Override
- public void close() throws IOException {
+ public void close() {
// Does nothing
}
/** {@inheritDoc} */
@Override
- public void flush() throws IOException {
+ public void flush() {
// Does nothing
}
/** {@inheritDoc} */
@Override
- public void write(char[] cbuf, int off, int len) throws IOException {
+ public void write(char[] cbuf, int off, int len) {
// Does nothing
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java Fri Dec 18 20:21:36 2009
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
+import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.servlet.TilesFreemarkerServlet;
import org.apache.tiles.impl.InvalidTemplateException;
@@ -41,7 +41,7 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
-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;
@@ -57,7 +57,7 @@
*/
public class FreeMarkerAttributeRenderer extends
AbstractTypeDetectingAttributeRenderer implements
- TilesApplicationContextAware {
+ ApplicationContextAware {
/**
* The servlet that is used to forward the request to.
@@ -118,7 +118,7 @@
Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
- ServletTilesRequestContext servletRequest = ServletUtil.getServletRequest(request);
+ ServletRequest servletRequest = ServletUtil.getServletRequest(request);
HttpServletRequest httpRequest = servletRequest.getRequest();
HttpServletResponse httpResponse = servletRequest.getResponse();
servlet.setValue((String) value);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java Fri Dec 18 20:21:36 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.freemarker.servlet;
-import java.io.IOException;
-
import org.apache.tiles.freemarker.template.TilesFMModelRepository;
import freemarker.cache.TemplateLoader;
@@ -53,8 +51,7 @@
/** {@inheritDoc} */
@Override
- protected TemplateLoader createTemplateLoader(String templatePath)
- throws IOException {
+ protected TemplateLoader createTemplateLoader(String templatePath) {
return new WebappClassTemplateLoader(getServletContext());
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.AddAttributeModel;
import freemarker.core.Environment;
@@ -65,8 +65,8 @@
@SuppressWarnings("unchecked")
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(request);
String bodyString = FreeMarkerUtil.renderAsString(body);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.AddListAttributeModel;
import freemarker.core.Environment;
@@ -65,8 +65,8 @@
@SuppressWarnings("unchecked")
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
Map<String, TemplateModel> parms = params;
model.start(FreeMarkerUtil.getAsString(parms.get("role")), request);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.DefinitionModel;
import freemarker.core.Environment;
@@ -66,8 +66,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(FreeMarkerUtil.getAsString(parms.get("name")),
FreeMarkerUtil.getAsString(parms.get("template")),
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java Fri Dec 18 20:21:36 2009
@@ -25,10 +25,10 @@
import java.util.Map;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.GetAsStringModel;
import freemarker.core.Environment;
@@ -71,8 +71,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(
FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -23,10 +23,10 @@
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.ImportAttributeModel;
import freemarker.core.Environment;
@@ -66,8 +66,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.execute(FreeMarkerUtil.getAsString(parms.get("name")),
FreeMarkerUtil.getAsString(parms.get("scope")), FreeMarkerUtil
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -25,10 +25,10 @@
import java.util.Map;
import org.apache.tiles.Attribute;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.InsertAttributeModel;
import freemarker.core.Environment;
@@ -71,8 +71,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false), FreeMarkerUtil.getAsString(parms.get("preparer")),
FreeMarkerUtil.getAsString(parms.get("role")),
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.InsertDefinitionModel;
import freemarker.core.Environment;
@@ -70,8 +70,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(request);
FreeMarkerUtil.evaluateBody(body);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.InsertTemplateModel;
import freemarker.core.Environment;
@@ -70,8 +70,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(request);
FreeMarkerUtil.evaluateBody(body);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.PutAttributeModel;
import freemarker.core.Environment;
@@ -67,8 +67,8 @@
@SuppressWarnings("unchecked")
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(request);
String bodyString = FreeMarkerUtil.renderAsString(body);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java Fri Dec 18 20:21:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.PutListAttributeModel;
import freemarker.core.Environment;
@@ -69,8 +69,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.start(FreeMarkerUtil.getAsString(parms.get("role")),
FreeMarkerUtil
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java Fri Dec 18 20:21:36 2009
@@ -23,10 +23,10 @@
import java.util.Map;
-import org.apache.tiles.freemarker.context.FreeMarkerRequestUtil;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.template.SetCurrentContainerModel;
import freemarker.core.Environment;
@@ -54,8 +54,8 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) {
Map<String, TemplateModel> parms = params;
- Request request = FreeMarkerTilesRequestContext
- .createServletFreemarkerRequest(FreeMarkerRequestUtil
+ Request request = FreemarkerRequest
+ .createServletFreemarkerRequest(FreemarkerRequestUtil
.getApplicationContext(env), env);
model.execute(FreeMarkerUtil.getAsString(parms.get("containerKey")),
request);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java Fri Dec 18 20:21:36 2009
@@ -20,8 +20,6 @@
*/
package org.apache.tiles.freemarker.io;
-import java.io.IOException;
-
import org.junit.Before;
import org.junit.Test;
@@ -42,37 +40,34 @@
private NullWriter writer;
/**
- * @throws java.lang.Exception If something goes wrong.
+ * Sets up the test.
*/
@Before
- public void setUp() throws Exception {
+ public void setUp() {
writer = new NullWriter();
}
/**
* Test method for {@link org.apache.tiles.freemarker.io.NullWriter#write(char[], int, int)}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testWriteCharArrayIntInt() throws IOException {
+ public void testWriteCharArrayIntInt() {
writer.write("Hello there".toCharArray(), 0, DUMMY_SIZE);
}
/**
* Test method for {@link org.apache.tiles.freemarker.io.NullWriter#flush()}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testFlush() throws IOException {
+ public void testFlush() {
writer.flush();
}
/**
* Test method for {@link org.apache.tiles.freemarker.io.NullWriter#close()}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testClose() throws IOException {
+ public void testClose() {
writer.close();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.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.AddAttributeModel;
import org.junit.Before;
@@ -136,9 +136,9 @@
params.put("role", objectWrapper.wrap("myRole"));
params.put("type", objectWrapper.wrap("myType"));
- tModel.start(isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(isA(FreemarkerRequest.class));
tModel.end(eq(value), eq("myExpression"), eq(""), eq("myRole"),
- eq("myType"), isA(FreeMarkerTilesRequestContext.class));
+ eq("myType"), isA(FreemarkerRequest.class));
body.render(isA(StringWriter.class));
replay(request, tModel, body, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java?rev=892369&r1=892368&r2=892369&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.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.AddListAttributeModel;
import org.junit.Before;
@@ -132,8 +132,8 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put("role", objectWrapper.wrap("myRole"));
- tModel.start(eq("myRole"), isA(FreeMarkerTilesRequestContext.class));
- tModel.end(isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(eq("myRole"), isA(FreemarkerRequest.class));
+ tModel.end(isA(FreemarkerRequest.class));
body.render(isA(NullWriter.class));
replay(request, tModel, body, applicationContext);