bwalding 2003/07/25 07:59:16
Modified: src/plugins-build/ear/xdocs properties.xml
src/plugins-build/ear plugin.jelly plugin.properties
Log:
Ensure ear files are correctly versioned for validating j2ee containers.
PR: MAVEN-613
Submitted by: Thomas Christensen
Revision Changes Path
1.7 +10 -0 maven/src/plugins-build/ear/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml 15 Jul 2003 19:05:12 -0000 1.6
+++ properties.xml 25 Jul 2003 14:59:16 -0000 1.7
@@ -43,6 +43,16 @@
</td>
</tr>
<tr>
+ <td>maven.ear.appxml.version</td>
+ <td>Yes</td>
+ <td>
+ Inserts the doctype header depending on the specified version. Default
is 1.3
+ </td>
+ <td>
+ false
+ </td>
+ </tr>
+ <tr>
<td>maven.ear.displayname</td>
<td>Yes</td>
<td>
1.13 +11 -1 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 15 Jul 2003 19:05:12 -0000 1.12
+++ plugin.jelly 25 Jul 2003 14:59:16 -0000 1.13
@@ -131,13 +131,23 @@
<!--==================================================================-->
<goal name="ear:generate-ear-descriptor" description="Generates the ear
descriptor">
- <ant:echo>Generating appxml file:"${maven.ear.appxml}"</ant:echo>
+ <ant:echo>Generating appxml file:"${maven.ear.appxml} version
${maven.ear.appxml.version}"</ant:echo>
<j:file name="${maven.ear.appxml}"
outputMode="xml"
prettyPrint="true"
encoding="UTF-8"
>
+
+ <j:switch on="${maven.ear.appxml.version}">
+ <j:case value="1.3">
+ <x:doctype name="application" publicId="-//Sun Microsystems,
Inc.//DTD J2EE Application 1.3//EN"
systemId="http://java.sun.com/dtd/application_1_3.dtd"/>
+ </j:case>
+ <j:default>
+ <x:doctype name="application" publicId="-//Sun Microsystems,
Inc.//DTD J2EE Application 1.2//EN"
systemId="http://java.sun.com/j2ee/dtds/application_1_2.dtd"/>
+ </j:default>
+ </j:switch>
+
<x:element name="application">
<x:element name="display-name">${maven.ear.displayname}</x:element>
<j:forEach var="lib" items="${pom.artifacts}">
1.3 +1 -0 maven/src/plugins-build/ear/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 8 May 2003 20:53:55 -0000 1.2
+++ plugin.properties 25 Jul 2003 14:59:16 -0000 1.3
@@ -11,3 +11,4 @@
maven.ear.manifest=${maven.ear.descriptordir}/MANIFEST.MF
maven.ear.appxml.generate=false
maven.ear.displayname=${pom.id}
+maven.ear.appxml.version=1.3
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
