You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/05/08 20:35:17 UTC
svn commit: r405125 - in
/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear:
ApplicationXmlWriter.java GenerateApplicationXmlMojo.java
Author: snicoll
Date: Mon May 8 11:35:15 2006
New Revision: 405125
URL: http://svn.apache.org/viewcvs?rev=405125&view=rev
Log:
MEAR-28: Added the ability to generate JavaEE5 deployement descriptor
Submitted By: Stefan Arentz
Reviewed By: Stephane Nicoll
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=405125&r1=405124&r2=405125&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java Mon May 8 11:35:15 2006
@@ -80,6 +80,12 @@
writeDescription( description, writer );
writeDisplayName( displayName, writer );
}
+ else if ( GenerateApplicationXmlMojo.VERSION_5.equals( version ) )
+ {
+ writer = initializeRootElementFive( w );
+ writeDescription( description, writer );
+ writeDisplayName( displayName, writer );
+ }
final Iterator moduleIt = earModules.iterator();
while ( moduleIt.hasNext() )
@@ -153,6 +159,18 @@
writer.addAttribute( "xsi:schemaLocation",
"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" );
writer.addAttribute( "version", "1.4" );
+ return writer;
+ }
+
+ private XMLWriter initializeRootElementFive( FileWriter w )
+ {
+ XMLWriter writer = new PrettyPrintXMLWriter( w, encoding, null );
+ writer.startElement( APPLICATION_ELEMENT );
+ writer.addAttribute( "xmlns", "http://java.sun.com/xml/ns/javaee" );
+ writer.addAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
+ writer.addAttribute( "xsi:schemaLocation",
+ "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" );
+ writer.addAttribute( "version", "5" );
return writer;
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=405125&r1=405124&r2=405125&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java Mon May 8 11:35:15 2006
@@ -44,6 +44,8 @@
public static final String VERSION_1_4 = "1.4";
+ public static final String VERSION_5 = "5";
+
public static final String UTF_8 = "UTF-8";
@@ -56,7 +58,7 @@
/**
* The version of the application.xml to generate. Valid values
- * are 1.3 and 1.4.
+ * are 1.3, 1.4 and 5.
*
* @parameter
*/
@@ -114,7 +116,7 @@
}
// Check version
- if ( !version.equals( VERSION_1_3 ) && !version.equals( VERSION_1_4 ) )
+ if ( !version.equals( VERSION_1_3 ) && !version.equals( VERSION_1_4 ) && !version.equals( VERSION_5 ) )
{
throw new MojoExecutionException( "Invalid version[" + version + "]" );
}