Author: mkleint
Date: Mon Aug 10 07:57:43 2009
New Revision: 802682
URL: http://svn.apache.org/viewvc?rev=802682&view=rev
Log:
MEAR-112 add "6"/VERSION_6 as a valid value of version parameter
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
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/EarMojo.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/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=802682&r1=802681&r2=802682&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Mon Aug 10 07:57:43 2009
@@ -51,6 +51,8 @@
public static final String VERSION_5 = "5";
+ public static final String VERSION_6 = "6";
+
public static final String APPLICATION_XML_URI =
"META-INF/application.xml";
public static final String META_INF = "META-INF";
@@ -59,7 +61,7 @@
/**
* The version of the application.xml to generate. Valid values
- * are 1.3, 1.4 and 5.
+ * are 1.3, 1.4, 5 and 6.
*
* @parameter default-value="1.3"
*/
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=802682&r1=802681&r2=802682&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 Aug 10 07:57:43 2009
@@ -58,21 +58,21 @@
if ( GenerateApplicationXmlMojo.VERSION_1_3.equals( version ) )
{
writer = initializeRootElementOneDotThree( w );
- writeDisplayName( context.getDisplayName(), writer );
- writeDescription( context.getDescription(), writer );
}
else if ( GenerateApplicationXmlMojo.VERSION_1_4.equals( version ) )
{
writer = initializeRootElementOneDotFour( w );
- writeDescription( context.getDescription(), writer );
- writeDisplayName( context.getDisplayName(), writer );
}
else if ( GenerateApplicationXmlMojo.VERSION_5.equals( version ) )
{
writer = initializeRootElementFive( w );
- writeDescription( context.getDescription(), writer );
- writeDisplayName( context.getDisplayName(), writer );
}
+ else if ( GenerateApplicationXmlMojo.VERSION_6.equals( version ))
+ {
+ writer = initializeRootElementSix( w );
+ }
+ writeDisplayName( context.getDisplayName(), writer );
+ writeDescription( context.getDescription(), writer );
final Iterator moduleIt = context.getEarModules().iterator();
while ( moduleIt.hasNext() )
@@ -158,4 +158,17 @@
writer.addAttribute( "version", "5" );
return writer;
}
+
+ private XMLWriter initializeRootElementSix( Writer w )
+ {
+ XMLWriter writer = initializeXmlWriter( w, 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"; ); //TODO
+ writer.addAttribute( "version", "5" ); //TODO
+ return writer;
+ }
+
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=802682&r1=802681&r2=802682&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Mon Aug 10 07:57:43 2009
@@ -384,7 +384,7 @@
// Check if deployment descriptor is there
File ddFile = new File( getWorkDirectory(), APPLICATION_XML_URI );
- if ( !ddFile.exists() && !version.equals(VERSION_5 ) )
+ if ( !ddFile.exists() && (! (version.equals( VERSION_5 ) ||
version.equals( VERSION_6 ))))
{
throw new MojoExecutionException(
"Deployment descriptor: " + ddFile.getAbsolutePath() + " does
not exist." );
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=802682&r1=802681&r2=802682&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 Aug 10 07:57:43 2009
@@ -91,7 +91,8 @@
else
{
// Check version
- if ( !version.equals( VERSION_1_3 ) && !version.equals(
VERSION_1_4 ) && !version.equals( VERSION_5 ) )
+ if ( !version.equals( VERSION_1_3 ) && !version.equals(
VERSION_1_4 ) &&
+ !version.equals( VERSION_5 ) && !version.equals( VERSION_6 ) )
{
throw new MojoExecutionException( "Invalid version[" + version
+ "]" );
}
