Author: hermanns
Date: Tue Apr 11 04:06:50 2006
New Revision: 393184

URL: http://svn.apache.org/viewcvs?rev=393184&view=rev
Log:
Refactoring struts-default.xml
o moving portlet related action configs to struts-portlet-default.xml

Added:
    incubator/webwork2/action/src/main/resources/struts-portlet-default.xml   
(with props)
Modified:
    incubator/webwork2/action/src/main/resources/struts-default.xml

Modified: incubator/webwork2/action/src/main/resources/struts-default.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/struts-default.xml?rev=393184&r1=393183&r2=393184&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/struts-default.xml (original)
+++ incubator/webwork2/action/src/main/resources/struts-default.xml Tue Apr 11 
04:06:50 2006
@@ -181,22 +181,5 @@
 
         <default-interceptor-ref name="defaultStack"/>
     </package>
-    <package name="struts-portlet-default" extends="struts-default">
 
-          <result-types>
-                       <result-type name="dispatcher" 
class="org.apache.struts.action2.portlet.result.PortletResult" default="true"/>
-                       <result-type name="freemarker" 
class="org.apache.struts.action2.views.freemarker.PortletFreemarkerResult"/>
-                       <result-type name="velocity" 
class="org.apache.struts.action2.portlet.result.PortletVelocityResult"/>
-          </result-types>
-
-          <action name="renderDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
-                       <result name="success">${location}</result>
-          </action>
-          <action name="freemarkerDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
-                       <result type="freemarker" 
name="success">${location}</result>
-          </action>
-          <action name="velocityDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
-                       <result type="velocity" 
name="success">${location}</result>
-          </action>
-       </package>
 </xwork>

Added: incubator/webwork2/action/src/main/resources/struts-portlet-default.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/struts-portlet-default.xml?rev=393184&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/struts-portlet-default.xml 
(added)
+++ incubator/webwork2/action/src/main/resources/struts-portlet-default.xml Tue 
Apr 11 04:06:50 2006
@@ -0,0 +1,23 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" 
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<xwork>
+    <include file="struts-default.xml"/>
+
+    <package name="struts-portlet-default" extends="struts-default">
+
+          <result-types>
+                       <result-type name="dispatcher" 
class="org.apache.struts.action2.portlet.result.PortletResult" default="true"/>
+                       <result-type name="freemarker" 
class="org.apache.struts.action2.views.freemarker.PortletFreemarkerResult"/>
+                       <result-type name="velocity" 
class="org.apache.struts.action2.portlet.result.PortletVelocityResult"/>
+          </result-types>
+
+          <action name="renderDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+                       <result name="success">${location}</result>
+          </action>
+          <action name="freemarkerDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+                       <result type="freemarker" 
name="success">${location}</result>
+          </action>
+          <action name="velocityDirect" 
class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+                       <result type="velocity" 
name="success">${location}</result>
+          </action>
+       </package>
+</xwork>
\ No newline at end of file

Propchange: 
incubator/webwork2/action/src/main/resources/struts-portlet-default.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to