Author: nilsga
Date: Sun Aug 12 05:24:16 2007
New Revision: 565047
URL: http://svn.apache.org/viewvc?view=rev&rev=565047
Log:
Restructured configuration files and added uncommented entry for dispatcher
servlet in web.xml
Added:
struts/struts2/trunk/apps/portlet/src/main/resources/struts-edit.xml
struts/struts2/trunk/apps/portlet/src/main/resources/struts-help.xml
struts/struts2/trunk/apps/portlet/src/main/resources/struts-view.xml
Modified:
struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
Added: struts/struts2/trunk/apps/portlet/src/main/resources/struts-edit.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts-edit.xml?view=auto&rev=565047
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/resources/struts-edit.xml (added)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/struts-edit.xml Sun
Aug 12 05:24:16 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
+ <package name="edit" extends="struts-portlet-default"
+ namespace="/edit">
+ <action name="index"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success">/WEB-INF/edit/index.jsp</result>
+ </action>
+ <action name="test"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success">/WEB-INF/edit/test.jsp</result>
+ </action>
+ <action name="formExampleEdit"
+ class="org.apache.struts2.portlet.example.FormExample"
method="input">
+ <result name="input">
+ /WEB-INF/edit/formExampleInput.jsp
+ </result>
+ </action>
+
+ <action name="processFormExampleEdit"
+ class="org.apache.struts2.portlet.example.FormExample">
+ <result name="input">
+ /WEB-INF/edit/formExampleInput.jsp
+ </result>
+ <result name="success">
+
/edit/processFormExampleForward.action?firstName=${firstName}&lastName=${lastName}
+ </result>
+ </action>
+
+ <action name="processFormExampleForward"
+ class="org.apache.struts2.portlet.example.FormExample">
+ <result name="success">
+ /WEB-INF/edit/formExample.jsp
+ </result>
+ </action>
+ </package>
+
+ <package name="editTest" extends="edit" namespace="/edit/dummy/test">
+ <action name="testAction"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result
name="success">/WEB-INF/edit/namespaceTest.jsp</result>
+ </action>
+ </package>
+</struts>
\ No newline at end of file
Added: struts/struts2/trunk/apps/portlet/src/main/resources/struts-help.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts-help.xml?view=auto&rev=565047
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/resources/struts-help.xml (added)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/struts-help.xml Sun
Aug 12 05:24:16 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
+ <package name="help" extends="struts-portlet-default"
+ namespace="/help">
+ <action name="index"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success">/WEB-INF/help/index.jsp</result>
+ </action>
+ </package>
+</struts>
\ No newline at end of file
Added: struts/struts2/trunk/apps/portlet/src/main/resources/struts-view.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts-view.xml?view=auto&rev=565047
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/resources/struts-view.xml (added)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/struts-view.xml Sun
Aug 12 05:24:16 2007
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
+ <package name="view" extends="struts-portlet-default"
+ namespace="/view">
+ <action name="index"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success">/WEB-INF/view/index.jsp</result>
+ </action>
+
+ <action name="formExample"
+ class="org.apache.struts2.portlet.example.FormExample"
method="input">
+ <result name="input">
+ /WEB-INF/view/formExampleInput.jsp
+ </result>
+ </action>
+
+ <action name="processFormExample"
+ class="org.apache.struts2.portlet.example.FormExample">
+ <result name="input">
+ /WEB-INF/view/formExampleInput.jsp
+ </result>
+ <result name="success">
+ /WEB-INF/view/formExample.jsp
+ </result>
+ </action>
+
+ <action name="validationExample"
+ class="org.apache.struts2.portlet.example.FormExample"
method="input">
+ <result name="input">
+ /WEB-INF/view/formExampleInputValidation.jsp
+ </result>
+ </action>
+
+ <action name="processValidationExample"
+ class="org.apache.struts2.portlet.example.FormExample">
+ <result name="success">
+ /WEB-INF/view/formExample.jsp
+ </result>
+ <result name="input">
+ /WEB-INF/view/formExampleInputValidation.jsp
+ </result>
+ <interceptor-ref name="validationWorkflowStack" />
+ </action>
+
+ <action name="tokenExample"
+ class="com.opensymphony.xwork2.ActionSupport"
method="input">
+ <result name="input">
+ /WEB-INF/view/tokenExampleInput.jsp
+ </result>
+ </action>
+
+ <action name="processTokenExample"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="input">
+ /WEB-INF/view/tokenExampleInput.jsp
+ </result>
+ <result name="invalid.token">
+ /WEB-INF/view/tokenExampleInput.jsp
+ </result>
+ <result name="success">
+ /WEB-INF/view/tokenExample.jsp
+ </result>
+ <interceptor-ref name="token" />
+ <interceptor-ref name="defaultStack" />
+ </action>
+
+ <action name="springExample" class="springAction">
+ <result name="success">
+ /WEB-INF/view/springExample.jsp
+ </result>
+ </action>
+
+ <action name="ajaxExample"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success">
+ /WEB-INF/view/ajaxExample.jsp
+ </result>
+ </action>
+
+ <action name="ajaxData"
+ class="com.opensymphony.xwork2.ActionSupport">
+ <result
name="success">/WEB-INF/view/ajaxData.jsp</result>
+ </action>
+
+ <action name="freeMarkerExample"
+ class="com.opensymphony.xwork2.ActionSupport"
method="input">
+ <result type="freemarker" name="input">
+ /WEB-INF/view/freeMarkerExampleInput.ftl
+ </result>
+ </action>
+
+ <action name="processFreeMarkerExample"
+ class="org.apache.struts2.portlet.example.FormExample">
+ <result
name="success">/view/processFreeMarkerView.action?firstName=${firstName}&lastName=${lastName}</result>
+ </action>
+
+ <action name="processFreeMarkerView"
class="org.apache.struts2.portlet.example.FormExample">
+ <result type="freemarker"
name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
+ </action>
+
+ <action name="velocityHelloWorld"
class="com.opensymphony.xwork2.ActionSupport">
+ <result type="velocity"
name="success">/WEB-INF/view/helloWorld.vm</result>
+ </action>
+
+ </package>
+</struts>
Modified: struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml?view=diff&rev=565047&r1=565046&r2=565047
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml Sun Aug 12
05:24:16 2007
@@ -4,159 +4,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="struts-portlet-default.xml" />
-
- <package name="view" extends="struts-portlet-default"
- namespace="/view">
- <action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="success">/WEB-INF/view/index.jsp</result>
- </action>
-
- <action name="formExample"
- class="org.apache.struts2.portlet.example.FormExample"
method="input">
- <result name="input">
- /WEB-INF/view/formExampleInput.jsp
- </result>
- </action>
-
- <action name="processFormExample"
- class="org.apache.struts2.portlet.example.FormExample">
- <result name="input">
- /WEB-INF/view/formExampleInput.jsp
- </result>
- <result name="success">
- /WEB-INF/view/formExample.jsp
- </result>
- </action>
-
- <action name="validationExample"
- class="org.apache.struts2.portlet.example.FormExample"
method="input">
- <result name="input">
- /WEB-INF/view/formExampleInputValidation.jsp
- </result>
- </action>
-
- <action name="processValidationExample"
- class="org.apache.struts2.portlet.example.FormExample">
- <result name="success">
- /WEB-INF/view/formExample.jsp
- </result>
- <result name="input">
- /WEB-INF/view/formExampleInputValidation.jsp
- </result>
- <interceptor-ref name="validationWorkflowStack" />
- </action>
-
- <action name="tokenExample"
- class="com.opensymphony.xwork2.ActionSupport"
method="input">
- <result name="input">
- /WEB-INF/view/tokenExampleInput.jsp
- </result>
- </action>
-
- <action name="processTokenExample"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="input">
- /WEB-INF/view/tokenExampleInput.jsp
- </result>
- <result name="invalid.token">
- /WEB-INF/view/tokenExampleInput.jsp
- </result>
- <result name="success">
- /WEB-INF/view/tokenExample.jsp
- </result>
- <interceptor-ref name="token" />
- <interceptor-ref name="defaultStack" />
- </action>
-
- <action name="springExample" class="springAction">
- <result name="success">
- /WEB-INF/view/springExample.jsp
- </result>
- </action>
-
- <action name="ajaxExample"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="success">
- /WEB-INF/view/ajaxExample.jsp
- </result>
- </action>
-
- <action name="ajaxData"
- class="com.opensymphony.xwork2.ActionSupport">
- <result
name="success">/WEB-INF/view/ajaxData.jsp</result>
- </action>
-
- <action name="freeMarkerExample"
- class="com.opensymphony.xwork2.ActionSupport"
method="input">
- <result type="freemarker" name="input">
- /WEB-INF/view/freeMarkerExampleInput.ftl
- </result>
- </action>
-
- <action name="processFreeMarkerExample"
- class="org.apache.struts2.portlet.example.FormExample">
- <result
name="success">/view/processFreeMarkerView.action?firstName=${firstName}&lastName=${lastName}</result>
- </action>
-
- <action name="processFreeMarkerView"
class="org.apache.struts2.portlet.example.FormExample">
- <result type="freemarker"
name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
- </action>
-
- <action name="velocityHelloWorld"
class="com.opensymphony.xwork2.ActionSupport">
- <result type="velocity"
name="success">/WEB-INF/view/helloWorld.vm</result>
- </action>
-
- </package>
-
- <package name="edit" extends="struts-portlet-default"
- namespace="/edit">
- <action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="success">/WEB-INF/edit/index.jsp</result>
- </action>
- <action name="test"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="success">/WEB-INF/edit/test.jsp</result>
- </action>
- <action name="formExampleEdit"
- class="org.apache.struts2.portlet.example.FormExample"
method="input">
- <result name="input">
- /WEB-INF/edit/formExampleInput.jsp
- </result>
- </action>
-
- <action name="processFormExampleEdit"
- class="org.apache.struts2.portlet.example.FormExample">
- <result name="input">
- /WEB-INF/edit/formExampleInput.jsp
- </result>
- <result name="success">
-
/edit/processFormExampleForward.action?firstName=${firstName}&lastName=${lastName}
- </result>
- </action>
-
- <action name="processFormExampleForward"
- class="org.apache.struts2.portlet.example.FormExample">
- <result name="success">
- /WEB-INF/edit/formExample.jsp
- </result>
- </action>
- </package>
-
- <package name="editTest" extends="edit" namespace="/edit/dummy/test">
- <action name="testAction"
- class="com.opensymphony.xwork2.ActionSupport">
- <result
name="success">/WEB-INF/edit/namespaceTest.jsp</result>
- </action>
- </package>
-
- <package name="help" extends="struts-portlet-default"
- namespace="/help">
- <action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
- <result name="success">/WEB-INF/help/index.jsp</result>
- </action>
- </package>
+ <include file="struts-view.xml"/>
+ <include file="struts-edit.xml"/>
+ <include file="struts-help.xml"/>
</struts>
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?view=diff&rev=565047&r1=565046&r2=565047
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Sun Aug
12 05:24:16 2007
@@ -24,5 +24,10 @@
</listener-class>
</listener>
-
+ <!-- Uncomment to use the dispatcher servlet -->
+ <!--<servlet id="dispatcherServlet">
+ <servlet-name>dispatcherServlet</servlet-name>
+
<servlet-class>org.apache.struts2.portlet.dispatcher.DispatcherServlet</servlet-class>
+ </servlet>-->
+
</web-app>
