Author: husted
Date: Sun Mar 11 08:31:14 2007
New Revision: 516928
URL: http://svn.apache.org/viewvc?view=rev&rev=516928
Log:
WW-1781 - Set DevMode to false for example applications. Remove other redundant
or obsolete settings. Conform indentation n struts-default.xml.
Removed:
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
Modified:
struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.xml?view=diff&rev=516928&r1=516927&r2=516928
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/struts.xml Sun Mar 11
08:31:14 2007
@@ -6,7 +6,7 @@
<struts>
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.devMode" value="true" />
+ <constant name="struts.devMode" value="false" />
<include file="example.xml"/>
Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=516928&r1=516927&r2=516928
==============================================================================
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Sun Mar 11 08:31:14 2007
@@ -31,11 +31,6 @@
<artifactId>struts-mailreader-dao</artifactId>
<version>1.3.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-spring-plugin</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
Modified: struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml?view=diff&rev=516928&r1=516927&r2=516928
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml Sun Mar 11
08:31:14 2007
@@ -8,7 +8,6 @@
<constant name="struts.action.extension" value="do" />
<constant name="struts.devMode" value="false" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.objectFactory" value="spring" />
<include file="mailreader-default.xml"/>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=516928&r1=516927&r2=516928
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Sun Mar 11
08:31:14 2007
@@ -7,16 +7,27 @@
<!-- START SNIPPET: xworkSample -->
<struts>
+ <!-- Some or all of these can be flipped to true for debugging -->
+ <constant name="struts.i18n.reload" value="false" />
+ <constant name="struts.devMode" value="false" />
+ <constant name="struts.configuration.xml.reload" value="false" />
+ <constant name="struts.custom.i18n.resources" value="globalMessages" />
+
+ <constant name="struts.codebehind.defaultPackage" value="person" />
+ <constant name="struts.freemarker.manager.classname"
value="customFreemarkerManager" />
+ <constant name="struts.serve.static" value="true" />
+ <constant name="struts.serve.static.browserCache" value="false" />
+
<include file="struts-chat.xml" />
-
+
<include file="struts-hangman.xml" />
-
+
<include file="struts-continuations.xml"/>
<include file="struts-tags.xml"/>
-
+
<include file="struts-validation.xml" />
-
+
<include file="struts-actionchaining.xml" />
<include file="struts-ajax.xml" />
@@ -26,19 +37,19 @@
<include file="struts-person.xml" />
<include file="struts-wait.xml" />
-
+
<include file="struts-jsf.xml" />
<include file="struts-token.xml" />
-
+
<include file="struts-model-driven.xml" />
-
+
<include file="struts-integration.xml" />
-
+
<include file="struts-filedownload.xml" />
-
+
<include file="struts-conversion.xml" />
-
+
<include file="struts-freemarker.xml" />
<include file="struts-tiles.xml" />
@@ -48,17 +59,17 @@
<package name="default" extends="struts-default">
<interceptors>
<interceptor-stack name="crudStack">
- <interceptor-ref name="checkbox" />
+ <interceptor-ref name="checkbox" />
<interceptor-ref name="params" />
- <interceptor-ref name="static-params" />
+ <interceptor-ref name="static-params" />
<interceptor-ref name="defaultStack" />
</interceptor-stack>
</interceptors>
-
+
<action name="showcase">
<result>showcase.jsp</result>
</action>
-
+
<action name="viewSource"
class="org.apache.struts2.showcase.source.ViewSourceAction">
<result>viewSource.jsp</result>
</action>
@@ -99,7 +110,7 @@
<interceptor-ref name="basicStack"/>
</action>
<action name="edit-*"
class="org.apache.struts2.showcase.action.EmployeeAction">
- <param name="empId">{1}</param>
+ <param name="empId">{1}</param>
<result>/empmanager/editEmployee.jsp</result>
<interceptor-ref name="crudStack"><param
name="validation.excludeMethods">execute</param></interceptor-ref>
</action>
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?view=diff&rev=516928&r1=516927&r2=516928
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sun Mar 11
08:31:14 2007
@@ -3,40 +3,38 @@
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd";>
-
+
<struts>
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="struts"
class="org.apache.struts2.impl.StrutsObjectFactory" />
-
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="xwork"
class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts"
class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
-
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="tiger" class="com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="notiger"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="struts" class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
-
+ <bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
+ <bean type="com.opensymphony.xwork2.ObjectFactory" name="struts"
class="org.apache.struts2.impl.StrutsObjectFactory" />
+
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="xwork"
class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts"
class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
+
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer" name="tiger"
class="com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer"/>
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="notiger"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer" name="struts"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
+
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="struts" class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper"
/>
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="composite"
class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="restful" class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper"
/>
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="restful2"
class="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
-
+
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="struts"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default" optional="true"/>
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="jakarta"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default" optional="true" />
-
+
<bean type="org.apache.struts2.views.TagLibrary" name="s"
class="org.apache.struts2.views.DefaultTagLibrary" />
-
+
<bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="struts" optional="true"/>
<bean class="org.apache.struts2.views.velocity.VelocityManager"
name="struts" optional="true" />
-
+
<bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="ftl"
class="org.apache.struts2.components.template.FreemarkerTemplateEngine" />
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="vm" class="org.apache.struts2.components.template.VelocityTemplateEngine"
/>
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
- <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="xwork1"
class="com.opensymphony.xwork2.util.XWorkConverter" />
+ <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="xwork1"
class="com.opensymphony.xwork2.util.XWorkConverter" />
<bean type="com.opensymphony.xwork2.util.XWorkConverter" name="struts"
class="com.opensymphony.xwork2.util.AnnotationXWorkConverter" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="xwork1"
class="com.opensymphony.xwork2.TextProviderSupport" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="struts"
class="com.opensymphony.xwork2.TextProviderSupport" />
<!-- Only have static injections -->
<bean class="com.opensymphony.xwork2.util.OgnlValueStack" static="true" />
@@ -47,7 +45,7 @@
<bean class="org.apache.struts2.views.util.UrlHelper" static="true" />
<bean class="com.opensymphony.xwork2.util.XWorkConverter" static="true" />
<bean class="com.opensymphony.xwork2.ObjectFactory" static="true" />
-
+
<package name="struts-default">
<result-types>
<result-type name="chain"
class="com.opensymphony.xwork2.ActionChainResult"/>
@@ -92,7 +90,7 @@
<interceptor name="checkbox"
class="org.apache.struts2.interceptor.CheckboxInterceptor" />
<interceptor name="profiling"
class="org.apache.struts2.interceptor.ProfilingActivationInterceptor" />
<interceptor name="roles"
class="org.apache.struts2.interceptor.RolesInterceptor" />
-
+
<!-- Basic stack -->
<interceptor-stack name="basicStack">
<interceptor-ref name="exception"/>
@@ -194,7 +192,7 @@
<interceptor-ref name="checkbox"/>
<interceptor-ref name="static-params"/>
<interceptor-ref name="params">
- <param name="excludeParams">dojo\..*</param>
+ <param name="excludeParams">dojo\..*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
@@ -223,9 +221,9 @@
<param name="excludeMethods">input,back,cancel</param>
</interceptor-ref>
</interceptor-stack>
-
+
</interceptors>
-
+
<default-interceptor-ref name="defaultStack"/>
</package>
