You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2005/08/06 22:34:04 UTC
svn commit: r230581 - in /struts/sandbox/trunk/ti/src/java:
org/apache/ti/config/xdocletToXWork.vm ti-default.xml xwork-default.xml
Author: mrdon
Date: Sat Aug 6 13:34:02 2005
New Revision: 230581
URL: http://svn.apache.org/viewcvs?rev=230581&view=rev
Log:
Finished webwork integration - Ti apps should now mostly have the full
capabilities of webwork, including their results and tag lib
Added:
struts/sandbox/trunk/ti/src/java/ti-default.xml
- copied, changed from r230569, struts/sandbox/trunk/ti/src/java/xwork-default.xml
Removed:
struts/sandbox/trunk/ti/src/java/xwork-default.xml
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm?rev=230581&r1=230580&r2=230581&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm Sat Aug 6 13:34:02 2005
@@ -5,19 +5,20 @@
>
<xwork>
-<include file="xwork-default.xml"/>
+<include file="ti-default.xml"/>
#set( $pkg=$xclass.containingPackage)
#if( $pkg.name=="")
-<package name="default" extends="xwork-default">
+<package name="default" extends="ti-default">
#else
<package name="$pkg.name" namespace="/${pkg.name}" extends="xwork-default">
#end
- <result-types>
+<!-- <result-types>
<result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
<result-type name="dispatcher" class="org.apache.ti.servlet.ServletDispatcherResult" default="true"/>
</result-types>
+-->
#foreach( $method in $xclass.getMethods(true) )
#if( $method.returnType.type.type == "java.lang.String.class" && $method.doc.hasTag("ti.action"))
#if( $method.parameters.size() == 0 || $method.parameters.size() == 1)
Copied: struts/sandbox/trunk/ti/src/java/ti-default.xml (from r230569, struts/sandbox/trunk/ti/src/java/xwork-default.xml)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/ti-default.xml?p2=struts/sandbox/trunk/ti/src/java/ti-default.xml&p1=struts/sandbox/trunk/ti/src/java/xwork-default.xml&r1=230569&r2=230581&rev=230581&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/xwork-default.xml (original)
+++ struts/sandbox/trunk/ti/src/java/ti-default.xml Sat Aug 6 13:34:02 2005
@@ -1,10 +1,18 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
+<!-- // START SNIPPET: webwork-default -->
<xwork>
- <package name="xwork-default">
+ <package name="ti-default">
<result-types>
+ <result-type name="dispatcher" class="com.opensymphony.webwork.dispatcher.ServletDispatcherResult" default="true"/>
+ <result-type name="redirect" class="com.opensymphony.webwork.dispatcher.ServletRedirectResult"/>
+ <result-type name="velocity" class="com.opensymphony.webwork.dispatcher.VelocityResult"/>
<result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
- <result-type name="dispatcher" class="org.apache.ti.servlet.ServletDispatcherResult" default="true"/>
+ <result-type name="xslt" class="com.opensymphony.webwork.views.xslt.XSLTResult"/>
+ <result-type name="jasper" class="com.opensymphony.webwork.views.jasperreports.JasperReportsResult"/>
+ <result-type name="freemarker" class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
+ <result-type name="httpheader" class="com.opensymphony.webwork.dispatcher.HttpHeaderResult"/>
+ <result-type name="stream" class="com.opensymphony.webwork.dispatcher.StreamResult"/>
</result-types>
<interceptors>
@@ -15,21 +23,86 @@
<interceptor name="params" class="com.opensymphony.xwork.interceptor.ParametersInterceptor"/>
<interceptor name="model-driven" class="com.opensymphony.xwork.interceptor.ModelDrivenInterceptor"/>
<interceptor name="component" class="com.opensymphony.xwork.interceptor.component.ComponentInterceptor"/>
+ <interceptor name="token" class="com.opensymphony.webwork.interceptor.TokenInterceptor"/>
+ <interceptor name="token-session" class="com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation" class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
<interceptor name="workflow" class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
+ <interceptor name="servlet-config" class="com.opensymphony.webwork.interceptor.ServletConfigInterceptor"/>
<interceptor name="prepare" class="com.opensymphony.xwork.interceptor.PrepareInterceptor"/>
- <interceptor name="conversionError" class="com.opensymphony.xwork.interceptor.ConversionErrorInterceptor"/>
+ <interceptor name="conversionError" class="com.opensymphony.webwork.interceptor.WebWorkConversionErrorInterceptor"/>
+ <interceptor name="fileUpload" class="com.opensymphony.webwork.interceptor.FileUploadInterceptor"/>
+ <interceptor name="execAndWait" class="com.opensymphony.webwork.interceptor.ExecuteAndWaitInterceptor"/>
+ <!-- Basic stack -->
<interceptor-stack name="defaultStack">
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="prepare"/>
<interceptor-ref name="static-params"/>
<interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
</interceptor-stack>
+
+ <!-- Sample validation and workflow stack -->
<interceptor-stack name="validationWorkflowStack">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="validation"/>
<interceptor-ref name="workflow"/>
</interceptor-stack>
+
+ <!-- Sample file upload stack -->
+ <interceptor-stack name="fileUploadStack">
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <!-- Sample Inversion of Control stack -->
+ <interceptor-stack name="componentStack">
+ <interceptor-ref name="component"/>
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <!-- Sample model-driven stack -->
+ <interceptor-stack name="modelDrivenStack">
+ <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <!-- Sample action chaining stack -->
+ <interceptor-stack name="chainStack">
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <!-- Sample execute and wait stack.
+ Note: execAndWait should always be the *last* interceptor. -->
+ <interceptor-stack name="executeAndWaitStack">
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="execAndWait"/>
+ </interceptor-stack>
+
+ <!-- A complete stack with all the common interceptors in place.
+ Generally, this stack should be the one you use, though it
+ may process additional stuff you don't need, which could
+ lead to some performance problems. Also, the ordering can be
+ switched around (ex: if you wish to have your components
+ before prepare() is called, you'd need to move the component
+ interceptor up -->
+ <interceptor-stack name="completeStack">
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="component"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="validation"/>
+ <interceptor-ref name="workflow"/>
+ </interceptor-stack>
</interceptors>
+
+ <default-interceptor-ref name="completeStack"/>
</package>
-</xwork>
\ No newline at end of file
+</xwork>
+<!-- // END SNIPPET: ti-default -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org