Author: cbrisson
Date: Mon Jun 25 22:45:28 2018
New Revision: 1834383
URL: http://svn.apache.org/viewvc?rev=1834383&view=rev
Log:
[tools/view] No more dynamic layout change apart from the demo showcase webapp
Added:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/org/apache/velocity/tools/examples/showcase/ShowcaseLayoutServlet.java
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/velocity.properties
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
Added:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/org/apache/velocity/tools/examples/showcase/ShowcaseLayoutServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/org/apache/velocity/tools/examples/showcase/ShowcaseLayoutServlet.java?rev=1834383&view=auto
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/org/apache/velocity/tools/examples/showcase/ShowcaseLayoutServlet.java
(added)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/org/apache/velocity/tools/examples/showcase/ShowcaseLayoutServlet.java
Mon Jun 25 22:45:28 2018
@@ -0,0 +1,21 @@
+package org.apache.velocity.tools.examples.showcase;
+
+import org.apache.velocity.tools.view.VelocityLayoutServlet;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ShowcaseLayoutServlet extends VelocityLayoutServlet
+{
+ /**
+ * Searches for a non-default layout to be used for this request.
+ * This implementation checks the request parameters and attributes.
+ */
+ protected String findLayout(HttpServletRequest request)
+ {
+ // check if an alternate layout has been specified
+ // by way of the request parameters
+ String layout = request.getParameter(KEY_LAYOUT);
+ return layout == null ? super.findLayout(request) : layout;
+ }
+
+}
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/velocity.properties
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/velocity.properties?rev=1834383&r1=1834382&r2=1834383&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/velocity.properties
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/velocity.properties
Mon Jun 25 22:45:28 2018
@@ -31,6 +31,3 @@ tools.view.servlet.layout.directory = la
# relative to the layout directory
# NOT relative to the root directory of the webapp!
tools.view.servlet.layout.default.template = Default.vm
-
-# Allow dynamic layout changes by 'layout=' query string parameter
-tools.view.servlet.layout.dynamic = true
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml?rev=1834383&r1=1834382&r2=1834383&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
Mon Jun 25 22:45:28 2018
@@ -25,7 +25,7 @@
version="3.0">
<servlet>
<servlet-name>velocity</servlet-name>
-
<servlet-class>org.apache.velocity.tools.view.VelocityLayoutServlet</servlet-class>
+
<servlet-class>org.apache.velocity.tools.examples.showcase.ShowcaseLayoutServlet</servlet-class>
<init-param>
<param-name>org.apache.velocity.tools.loadDefaults</param-name>
<param-value>true</param-value>
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java?rev=1834383&r1=1834382&r2=1834383&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
Mon Jun 25 22:45:28 2018
@@ -126,7 +126,6 @@ public class VelocityLayoutServlet exten
protected String errorTemplate;
protected String layoutDir;
protected String defaultLayout;
- protected boolean allowDynamicLayout;
/**
* Initializes Velocity, the view servlet and checks for changes to
@@ -160,9 +159,6 @@ public class VelocityLayoutServlet exten
// for efficiency's sake, make defaultLayout a full path now
defaultLayout = layoutDir + defaultLayout;
-
- // initialize dynamic layout availability
- allowDynamicLayout =
"true".equalsIgnoreCase(getVelocityProperty(PROPERTY_DYNAMIC_LAYOUT, "false"));
}
@@ -189,15 +185,8 @@ public class VelocityLayoutServlet exten
*/
protected String findLayout(HttpServletRequest request)
{
- // check if an alternate layout has been specified
- // by way of the request parameters
- String layout = allowDynamicLayout ? request.getParameter(KEY_LAYOUT)
: null;
- // also look in the request attributes
- if (layout == null)
- {
- layout = (String)request.getAttribute(KEY_LAYOUT);
- }
- return layout;
+ // look in the request attributes
+ return (String)request.getAttribute(KEY_LAYOUT);
}
/**
