The following issue has been updated:
Updater: Glauber Kliemann (mailto:[EMAIL PROTECTED])
Date: Thu, 22 Jan 2004 6:37 AM
Comment:
Patch for modules/jboss/web/JBossWebXmlSubTask.java
Changes:
Attachment changed to patch2.diff
---------------------------------------------------------------------
For a full history of the issue, see:
http://opensource.atlassian.com/projects/xdoclet/secure/ViewIssue.jspa?key=XDT-779&page=history
---------------------------------------------------------------------
View the issue:
http://opensource.atlassian.com/projects/xdoclet/secure/ViewIssue.jspa?key=XDT-779
Here is an overview of the issue:
---------------------------------------------------------------------
Key: XDT-779
Summary: Include merge points to jboss-web.xml
Type: New Feature
Status: Open
Priority: Major
Original Estimate: 5 minutes
Time Spent: Unknown
Remaining: 5 minutes
Project: XDoclet
Components:
JBoss Module
Versions:
1.2
Assignee: xdoclet-devel (Use for new issues)
Reporter: Glauber Kliemann
Created: Thu, 22 Jan 2004 6:30 AM
Updated: Thu, 22 Jan 2004 6:37 AM
Description:
Create merge points to jboss-web.xml, affects two files:
1) modules/jboss/web/resources/jboss_web_xml.xdt
[[[BEGIN PATCH]]]
Index: jboss_web_xml.xdt
===================================================================
retrieving revision 1.7
diff -u -r1.7 jboss_web_xml.xdt
--- jboss_web_xml.xdt 30 Jan 2003 14:02:22 -0000 1.7
+++ jboss_web_xml.xdt 22 Jan 2004 12:23:41 -0000
@@ -15,6 +15,11 @@
<!-- Resource Environment References -->
<XDtConfig:ifConfigParamGreaterOrEquals paramName="version" value="3.0">
+ <XDtMerge:merge file="resource-env-ref.xml">
+ <!--
+ resource-env-ref.xml
+ -->
+ </XDtMerge:merge>
<XDtJBossWeb:forAllResourceEnvRefs>
<resource-env-ref>
<resource-env-ref-name><XDtClass:classTagValue tagName="jboss:resource-env-ref"
paramName="resource-env-ref-name"/></resource-env-ref-name>
@@ -24,6 +29,11 @@
</XDtConfig:ifConfigParamGreaterOrEquals>
<!-- Resource references -->
+ <XDtMerge:merge file="resource-ref.xml">
+ <!--
+ resource-ref.xml
+ -->
+ </XDtMerge:merge>
<XDtJBossWeb:forAllResourceRefs>
<resource-ref>
<res-ref-name><XDtClass:classTagValue tagName="jboss:resource-ref"
paramName="res-ref-name"/></res-ref-name>
@@ -32,6 +42,11 @@
</XDtJBossWeb:forAllResourceRefs>
<!-- EJB References -->
+ <XDtMerge:merge file="ejb-ref.xml">
+ <!--
+ ejb-ref.xml
+ -->
+ </XDtMerge:merge>
<XDtJBossWeb:forAllEjbRefs>
<ejb-ref>
<ejb-ref-name><XDtClass:classTagValue tagName="jboss:ejb-ref-jndi"
paramName="ref-name"/></ejb-ref-name>
[[[END PATCH]]]
2) modules/jboss/web/JBossWebXmlSubTask.java
[[[BEGIN PATCH]]]
Index: JBossWebXmlSubTask.java
===================================================================
retrieving revision 1.7
diff -u -r1.7 JBossWebXmlSubTask.java
--- JBossWebXmlSubTask.java 12 Sep 2002 04:01:08 -0000 1.7
+++ JBossWebXmlSubTask.java 22 Jan 2004 12:24:47 -0000
@@ -16,6 +16,12 @@
* @created August 9, 2001
* @ant.element display-name="JBoss" name="jbosswebxml"
parent="xdoclet.modules.web.WebDocletTask"
* @version $Revision: 1.7 $
+ * @xdoclet.merge-file file="resource-env-ref.xml" relates-to="jboss-web.xml"
description="An XML document containing
+ * the optional resource-env-ref element."
+ * @xdoclet.merge-file file="resource-ref.xml" relates-to="jboss-web.xml"
description="An XML document containing the
+ * optional resource-ref element."
+ * @xdoclet.merge-file file="ejb-ref.xml" relates-to="jboss-web.xml"
description="An XML document containing the
+ * optional ejb-ref element."
*/
public class JBossWebXmlSubTask extends XmlSubTask
{
[[[END PATCH]]]
---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://opensource.atlassian.com/projects/xdoclet/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
