Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/complete
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12273/src/test/java/org/xdoclet/plugin/xwork/complete
Modified Files:
xwork.xml
Added Files:
SimpleAction.java TrickyAction.java
Removed Files:
DontHavePackageAtMergeFile2Action.java
DontHavePackageAtMergeFileAction.java
HavePackageAtMergeFileAndHaveDoubleDeclarationAction.java
Log Message:
action mapping plugin is ready to be testeed
--- DontHavePackageAtMergeFile2Action.java DELETED ---
Index: xwork.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/complete/xwork.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xwork.xml 28 Nov 2004 19:44:24 -0000 1.2
--- xwork.xml 12 Apr 2006 18:18:12 -0000 1.3
***************
*** 3,7 ****
<package name="default" extends="webwork-default">
<result-types>
! <result-type name="freemarker"
class="org.intelliframework.webwork.workaround.FreemarkerResult"
default="true"/>
</result-types>
<interceptors>
--- 3,8 ----
<package name="default" extends="webwork-default">
<result-types>
! <result-type name="freemarker"
!
class="org.intelliframework.webwork.workaround.FreemarkerResult"
default="true"/>
</result-types>
<interceptors>
***************
*** 14,41 ****
<default-interceptor-ref name="default"/>
</package>
! <package name="anything" namespace="/alreadyConfiguredAtMergeFile">
! <action name="anythingA"
class="org.xdoclet.plugin.xwork.complete.HavePackageAtMergeFileAndHaveDoubleDeclarationAction">
! <interceptor-ref name="interceptorOne"/>
! <interceptor-ref name="interceptorTwo">
! <param name="param1">value1</param>
! <param name="param2">value2</param>
! </interceptor-ref>
! <interceptor-ref name="interceptorThree">free</interceptor-ref>
! <result name="nameA1" type="redirect">
! <param name="location">/pathA/file1.ftl</param>
! <param name="parse">false</param>
</result>
! <result name="nameA2" type="freemarker">/pathA/file2.ftl</result>
! <result name="nameA3">/pathA/file3.ftl</result>
</action>
! <action name="anythingB"
class="org.xdoclet.plugin.xwork.complete.HavePackageAtMergeFileAndHaveDoubleDeclarationAction">
! <result name="nameB1">/pathB/file1.ftl</result>
! <result name="nameB2" type="freemarker">/pathB/file2.ftl</result>
! <result name="nameB3">/pathB/file3.ftl</result>
</action>
! </package>
! <package name="/notPreviouslyConfigured"
namespace="/notPreviouslyConfigured" extends="default">
! <action name="anythingElse2"
class="org.xdoclet.plugin.xwork.complete.DontHavePackageAtMergeFile2Action"/>
! <action name="anythingElse"
class="org.xdoclet.plugin.xwork.complete.DontHavePackageAtMergeFileAction"/>
</package>
</xwork>
--- 15,39 ----
<default-interceptor-ref name="default"/>
</package>
! <package name="anything" namespace="/alreadyConfiguredAtMergeFile"/>
!
! <package name="testPackage" namespace="/glum/glam/glarch"
extends="whateveryoulike" abstract="true">
! <action name="simple"
class="org.xdoclet.plugin.xwork.complete.SimpleAction">
! <param name="foo">bar</param>
! <result>defaultResult.vm</result>
! <result name="input" type="glum">/foo/bar/glum.vm</result>
! <result name="withParam" type="glee">
! <param name="url">glum</param>
</result>
! <interceptor-ref name="blam">
! <param name="foo">bar</param>
! </interceptor-ref>
! <exception-mapping exception="foo.bar.Baz" result="glum">
! <param name="baz">bang</param>
! </exception-mapping>
</action>
! <action name="tricky"
class="org.xdoclet.plugin.xwork.complete.TrickyAction" method="blam">
! <result>defaultResult.vm</result>
</action>
!
</package>
</xwork>
--- NEW FILE: TrickyAction.java ---
package org.xdoclet.plugin.xwork.complete;
/**
* action mapping to methods
* @author ko5tik
*
*/
public class TrickyAction {
/**
* webwork action method
* @xwork.action name="tricky"
* @xwork.result value="defaultResult.vm"
* @return
*/
public String blam() {
return "success";
}
}
--- DontHavePackageAtMergeFileAction.java DELETED ---
--- NEW FILE: SimpleAction.java ---
/*
* Copyright (c) 2003
* XDoclet Team
* All rights reserved.
*/
package org.xdoclet.plugin.xwork.complete;
/**
* simple test action
* @author ko5tik
* @version $Revision: 1.1 $
* @xwork.action name="simple"
* @xwork.param name="foo" value="bar"
*
* @xwork.result value="defaultResult.vm"
*
* @xwork.result name="input" value="/foo/bar/glum.vm" type="glum"
*
* @xwork.result name="withParam" type="glee"
* @xwork.param name="url" value="glum"
*
* @xwork.interceptor-ref name="blam"
* @xwork.param name="foo" value="bar"
*
* @xwork.exception-mapping exception="foo.bar.Baz" result="glum"
* @xwork.param name="baz" value="bang"
*/
public class SimpleAction {
}
--- HavePackageAtMergeFileAndHaveDoubleDeclarationAction.java DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits