Author: apetrelli
Date: Wed Jan 12 13:49:44 2011
New Revision: 1058140
URL: http://svn.apache.org/viewvc?rev=1058140&view=rev
Log:
TILESSB-38
Fixed tiles-velocity Checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package.html
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Added:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java?rev=1058140&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
Wed Jan 12 13:49:44 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Classes to support Velocity under a servlet environment in Tiles.
+ */
+package org.apache.tiles.velocity;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java?rev=1058140&r1=1058139&r2=1058140&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
Wed Jan 12 13:49:44 2011
@@ -231,6 +231,13 @@ public class VelocityStyleTilesTool exte
return "";
}
+ /**
+ * Creates a Velocity request.
+ *
+ * @param servletContext The servlet context.
+ * @param writer The writer.
+ * @return The created request.
+ */
protected Request createVelocityRequest(
ServletContext servletContext, Writer writer) {
return VelocityRequest.createVelocityRequest(ServletUtil
Added:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java?rev=1058140&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
Wed Jan 12 13:49:44 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Classes that allow the use of "Tiles template" as a Velocity tool.
+ */
+package org.apache.tiles.velocity.template;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java?rev=1058140&r1=1058139&r2=1058140&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Wed Jan 12 13:49:44 2011
@@ -118,7 +118,7 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
@@ -126,10 +126,12 @@ public class VelocityStyleTilesToolTest
.andReturn(attributeContext);
expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute);
- replay(velocityContext, request, response, servletContext, container,
attributeContext, applicationContext, resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
initializeTool();
assertEquals(attribute, tool.get("myAttribute"));
- verify(velocityContext, request, response, servletContext, container,
attributeContext, applicationContext, resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
}
/**
@@ -196,19 +198,19 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
container.render(eq(attribute), isA(VelocityRequest.class));
- replay(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
initializeTool();
Renderable renderable = tool.render(attribute);
renderable.render(internalContextAdapter, writer);
- verify(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
}
/**
@@ -230,19 +232,19 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
container.render(eq("myDefinition"), isA(VelocityRequest.class));
- replay(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
initializeTool();
Renderable renderable = tool.renderDefinition("myDefinition");
renderable.render(internalContextAdapter, writer);
- verify(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
}
/**
@@ -263,19 +265,19 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
container.renderContext(isA(VelocityRequest.class));
- replay(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
initializeTool();
Renderable renderable = tool.renderAttributeContext();
renderable.render(internalContextAdapter, writer);
- verify(velocityContext, request, response, servletContext,
container,
- internalContextAdapter, applicationContext,
resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ internalContextAdapter, applicationContext, resolver);
}
/**
@@ -294,19 +296,19 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
expect(container.startContext(isA(VelocityRequest.class)))
.andReturn(attributeContext);
- replay(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
initializeTool();
assertEquals(attributeContext, tool.startAttributeContext());
- verify(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
}
/**
@@ -325,18 +327,18 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
container.endContext(isA(VelocityRequest.class));
- replay(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
initializeTool();
tool.endAttributeContext();
- verify(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
}
/**
@@ -355,19 +357,19 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
expect(container.getAttributeContext(isA(VelocityRequest.class)))
.andReturn(attributeContext);
- replay(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ replay(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
initializeTool();
assertEquals(attributeContext, tool.getAttributeContext());
- verify(velocityContext, request, response, servletContext,
container,
- attributeContext, applicationContext, resolver);
+ verify(velocityContext, request, response, servletContext, container,
+ attributeContext, applicationContext, resolver);
}
/**
@@ -386,7 +388,7 @@ public class VelocityStyleTilesToolTest
expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes();
expect(resolver.getContext(isA(VelocityRequest.class),
- eq("request"))).andReturn(requestScope).anyTimes();
+ eq("request"))).andReturn(requestScope).anyTimes();
expect(servletContext.getAttribute(ApplicationAccess
.APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
.anyTimes();
