Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11857/src/test/java/org/xdoclet/plugin/struts/complete
Modified Files:
struts-config.xml
Log Message:
fixed merging
Index: struts-config.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete/struts-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** struts-config.xml 20 Feb 2005 17:29:54 -0000 1.4
--- struts-config.xml 22 Jun 2005 15:37:48 -0000 1.5
***************
*** 2,5 ****
--- 2,6 ----
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
+ <data-sources></data-sources>
<form-beans>
<form-bean name="/simpleDynaForm"
type="org.apache.struts.validator.DynaValidatorForm" validate="true">
***************
*** 13,16 ****
--- 14,20 ----
<form-bean name="/simpleValidatorFormWithNoField"
type="org.xdoclet.plugin.struts.complete.SimpleValidatorFormWithNoFields"/>
</form-beans>
+ <global-exceptions></global-exceptions>
+ <global-forwards></global-forwards>
+
<action-mappings>
<action name="/simpleAction" roles="foo,bar,baz,blurge" scope="request"
type="org.xdoclet.plugin.struts.complete.SimpleAction" path="/simpleAction"
validate="true" parameter="glarch">
***************
*** 21,23 ****
--- 25,32 ----
</action>
</action-mappings>
+ <controller className="blam.blum.Flee"></controller>
+ <message-resources className="blam.blum.Flee"
parameter="glem"></message-resources>
+ <plug-in name="foo.bar.baz.Bang"></plug-in>
+ <plug-in name="blurge.glem.Glam"></plug-in>
+
</struts-config>
\ No newline at end of file
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
