User: pathoss
Date: 02/07/10 12:01:35
Modified: modules/apache/src/xdoclet/modules/apache/struts/resources
struts_config_xml.xdt
Log:
Fixed merge points to support Struts 1.1.
Revision Changes Path
1.7 +24 -15
xdoclet/modules/apache/src/xdoclet/modules/apache/struts/resources/struts_config_xml.xdt
Index: struts_config_xml.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/apache/src/xdoclet/modules/apache/struts/resources/struts_config_xml.xdt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- struts_config_xml.xdt 10 Jul 2002 18:50:35 -0000 1.6
+++ struts_config_xml.xdt 10 Jul 2002 19:01:35 -0000 1.7
@@ -3,6 +3,16 @@
<!DOCTYPE struts-config PUBLIC "<XDtXml:publicId/>" "<XDtXml:systemId/>">
<struts-config>
+
+ <!-- ========== Data Sources Definitions =================================== -->
+ <XDtMerge:merge file="struts-data-sources.xml">
+ <!--
+ Define your Struts data sources in a file called struts-data-sources.xml and
place
+ it in your merge directory.
+ -->
+ </XDtMerge:merge>
+
+
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
<XDtClass:forAllClasses type="org.apache.struts.action.ActionForm">
@@ -15,19 +25,22 @@
</XDtClass:forAllClasses>
<XDtMerge:merge file="struts-forms.xml">
- <!-- If you have non XDoclet forms, define them in a file called
struts-forms.xml and place it in your merge directory. -->
+ <!--
+ If you have non XDoclet forms, define them in a file called
struts-forms.xml and
+ place it in your merge directory.
+ -->
</XDtMerge:merge>
</form-beans>
- <!-- ========= Global Exceptions Definitions ============================= -->
+ <!-- ========== Global Exceptions Definitions ===================================
-->
<XDtMerge:merge file="global-exceptions.xml">
<!--
- Define your global exceptions in a file called global-exceptions.xml and place
+ Define your exceptions in a file called global-exceptions.xml and place
it in your merge directory.
-->
</XDtMerge:merge>
- <!-- ========== Global Forward Definitions ============================== -->
+ <!-- ========== Global Forward Definitions =================================== -->
<XDtMerge:merge file="global-forwards.xml">
<!--
Define your forwards in a file called global-forwards.xml and place
@@ -35,15 +48,7 @@
-->
</XDtMerge:merge>
- <!-- ========== Global Exception Definitions ============================== -->
- <XDtMerge:merge file="global-exceptions.xml">
- <!--
- Define your exceptions in a file called global-exceptions.xml and place
- it in your merge directory.
- -->
- </XDtMerge:merge>
-
- <!-- ========== Action Mapping Definitions ============================== -->
+ <!-- ========== Action Mapping Definitions =================================== -->
<action-mappings>
<XDtClass:forAllClasses type="org.apache.struts.action.Action">
<XDtClass:forAllClassTags tagName="struts:action">
@@ -114,8 +119,12 @@
</XDtMerge:merge>
</action-mappings>
- <XDtMerge:merge file="struts-controllers.xml">
- <!-- Define your Struts controllers in a file called struts-controllers.xml and
place it in your merge directory. -->
+ <XDtMerge:merge file="struts-controller.xml">
+ <!-- Define your Struts controller in a file called struts-controller.xml and
place it in your merge directory. -->
+ </XDtMerge:merge>
+
+ <XDtMerge:merge file="struts-message-resources.xml">
+ <!-- Define your Struts message-resources in a file called
struts-message-resources.xml and place it in your merge directory. -->
</XDtMerge:merge>
<XDtMerge:merge file="struts-plugins.xml">
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Two, two, TWO treats in one.
http://thinkgeek.com/sf
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
