Author: mrdon
Date: Thu Jan 4 14:43:10 2007
New Revision: 492788
URL: http://svn.apache.org/viewvc?view=rev&rev=492788
Log:
Added ability to customize template path prefix
WW-1595
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=492788&r1=492787&r2=492788
==============================================================================
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Thu Jan 4 14:43:10 2007
@@ -53,14 +53,19 @@
*/
public class CodebehindUnknownHandler implements UnknownHandler {
- protected String defaultPackageName = "codebehind-default";
+ protected String defaultPackageName;
protected ServletContext servletContext;
protected Map<String,ResultTypeConfig> resultsByExtension;
- protected String templatePathPrefix = "/";
+ protected String templatePathPrefix;
protected Configuration configuration;
protected ObjectFactory objectFactory;
protected static final Log LOG =
LogFactory.getLog(CodebehindUnknownHandler.class);
+
+ @Inject("struts.codebehind.pathPrefix")
+ public void setPathPrefix(String prefix) {
+ this.templatePathPrefix=prefix;
+ }
@Inject("struts.codebehind.defaultPackage")
public void setDefaultPackage(String pkg) {
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml?view=diff&rev=492788&r1=492787&r2=492788
==============================================================================
---
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
Thu Jan 4 14:43:10 2007
@@ -6,7 +6,10 @@
<struts>
<bean type="com.opensymphony.xwork2.UnknownHandler"
class="org.apache.struts2.codebehind.CodebehindUnknownHandler" />
-
+
+ <constant name="struts.codebehind.pathPrefix" value="/"/>
+ <constant name="struts.codebehind.defaultPackage"
value="codebehind-default"/>
+
<package name="codebehind-default" extends="struts-default">
</package>
</struts>
Modified:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?view=diff&rev=492788&r1=492787&r2=492788
==============================================================================
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Thu Jan 4 14:43:10 2007
@@ -44,10 +44,11 @@
super.setUp();
mockServletContext = new Mock(ServletContext.class);
handler = new CodebehindUnknownHandler();
+ handler.setDefaultPackage("codebehind-default");
+ handler.setPathPrefix("/");
handler.setConfiguration(configuration);
handler.setObjectFactory(container.getInstance(ObjectFactory.class));
handler.setServletContext((ServletContext)mockServletContext.proxy());
-
}
public void testBuildResult() {
