Author: snicoll
Date: Sat Dec 11 11:02:39 2010
New Revision: 1044633
URL: http://svn.apache.org/viewvc?rev=1044633&view=rev
Log:
MEAR-134: fix for no library directory with JavaEE, based on patch provided by
Michael Brackx
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml
- copied, changed from r1044620,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/expected-META-INF/application.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/pom.xml
- copied, changed from r1044620,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/pom.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-063/expected-META-INF/application.xml
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=1044633&r1=1044632&r2=1044633&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
Sat Dec 11 11:02:39 2010
@@ -103,7 +103,8 @@ final class ApplicationXmlWriter
securityRole.appendSecurityRole( writer );
}
- if ( GenerateApplicationXmlMojo.VERSION_5.equals( version ) )
+ if ( GenerateApplicationXmlMojo.VERSION_5.equals( version ) ||
+ GenerateApplicationXmlMojo.VERSION_6.equals( version ) )
{
writeLibraryDirectory( context.getLibraryDirectory(), writer );
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt?rev=1044633&r1=1044632&r2=1044633&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Sat Dec 11
11:02:39 2010
@@ -166,5 +166,5 @@ EAR Plugin Tests
* project-068: builds an EAR with the no-version file name mapping
+ * project-069: builds an EAR with a custom library-directory and JavaEE 6
-
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=1044633&r1=1044632&r2=1044633&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Sat Dec 11 11:02:39 2010
@@ -726,4 +726,13 @@ public class EarMojoIT
doTestProject( "project-068", new String[]{ "ejb-sample-one.jar",
"ejb-sample-two.jar" } );
}
+ /**
+ * Builds an EAR with a custom library-directory and JavaEE 6.
+ */
+ public void testProject069()
+ throws Exception
+ {
+ doTestProject( "project-069", new String[]{ "ejb-sample-one-1.0.jar",
"myLibs/jar-sample-one-1.0.jar" } );
+ }
+
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-063/expected-META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-063/expected-META-INF/application.xml?rev=1044633&r1=1044632&r2=1044633&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-063/expected-META-INF/application.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-063/expected-META-INF/application.xml
Sat Dec 11 11:02:39 2010
@@ -20,4 +20,5 @@ under the License.
<application xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/application_6.xsd"; version="6">
<display-name>maven-ear-plugin-test-project-063</display-name>
+ <library-directory>lib</library-directory>
</application>
Copied:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml
(from r1044620,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/expected-META-INF/application.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/expected-META-INF/application.xml&r1=1044620&r2=1044633&rev=1044633&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/expected-META-INF/application.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml
Sat Dec 11 11:02:39 2010
@@ -17,11 +17,10 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-<application xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/application_5.xsd"; version="5">
- <display-name>maven-ear-plugin-test-project-044</display-name>
+<application xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/application_6.xsd"; version="6">
+ <display-name>maven-ear-plugin-test-project-069</display-name>
<module>
<ejb>ejb-sample-one-1.0.jar</ejb>
</module>
<library-directory>myLibs</library-directory>
-</application>
\ No newline at end of file
+</application>
Copied:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/pom.xml
(from r1044620,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/pom.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/pom.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/pom.xml&r1=1044620&r2=1044633&rev=1044633&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/pom.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/pom.xml
Sat Dec 11 11:02:39 2010
@@ -22,7 +22,7 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>ear</groupId>
- <artifactId>maven-ear-plugin-test-project-044</artifactId>
+ <artifactId>maven-ear-plugin-test-project-069</artifactId>
<version>99.0</version>
<name>Maven</name>
<packaging>ear</packaging>
@@ -46,7 +46,7 @@ under the License.
<artifactId>maven-ear-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <version>5</version>
+ <version>6</version>
<defaultLibBundleDir>myLibs</defaultLibBundleDir>
</configuration>
</plugin>
