maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snic...@apache.org
Subject svn commit: r1088330 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/ site/ site/apt/ site/apt/examples/ site/fml/ test/java/org/apache/maven/plugin/ear/it/ test/resources/m2repo/eartest/app-client-sample-one/ test...
Date Sun, 03 Apr 2011 16:46:31 GMT
Author: snicoll
Date: Sun Apr  3 16:46:31 2011
New Revision: 1088330

URL: http://svn.apache.org/viewvc?rev=1088330&view=rev
Log:
MEAR-137: integration tests and documentation update for the app-client support

Added:
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/using-app-client.apt.vm
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.jar
  (with props)
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.pom
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml
      - copied, changed from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/pom.xml
      - copied, changed from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/pom.xml
      - copied, changed from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml
Modified:
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AppClientModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
    maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
    maven/plugins/trunk/maven-ear-plugin/src/site/site.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AppClientModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AppClientModule.java?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AppClientModule.java
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AppClientModule.java
Sun Apr  3 16:46:31 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.ear;
  */
 
 import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.util.xml.XMLWriter;
 
 /**
  * The {@link EarModule} implementation for an application client module.
@@ -27,18 +28,28 @@ import org.apache.maven.artifact.Artifac
  * @author Stephane Nicoll
  */
 public class AppClientModule
-    extends JarModule
+    extends AbstractEarModule
 {
 
     public AppClientModule()
     {
-        super();
     }
 
+    public AppClientModule( Artifact a )
+    {
+        super( a );
+    }
 
-    public AppClientModule( Artifact a, String defaultLibBundleDir )
+    public void appendModule( XMLWriter writer, String version, Boolean generateId )
     {
-        super( a, defaultLibBundleDir, Boolean.TRUE );
+        startModuleElement( writer, generateId );
+        writer.startElement( JAVA_MODULE );
+        writer.writeText( getUri() );
+        writer.endElement();
+
+        writeAltDeploymentDescriptor( writer, version );
+
+        writer.endElement();
     }
 
     public String getType()
@@ -46,3 +57,4 @@ public class AppClientModule
         return "app-client";
     }
 }
+

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Sun Apr  3 16:46:31 2011
@@ -105,7 +105,7 @@ public final class EarModuleFactory
         }
         else if ( "app-client".equals( artifactType ) )
         {
-            return new AppClientModule( artifact, defaultLibBundleDir );
+            return new AppClientModule( artifact );
         }
         else if ( "rar".equals( artifactType ) )
         {

Added: maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/using-app-client.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/using-app-client.apt.vm?rev=1088330&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/using-app-client.apt.vm (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/using-app-client.apt.vm Sun
Apr  3 16:46:31 2011
@@ -0,0 +1,54 @@
+  ------
+  Using app client
+  ------
+  Stephane Nicoll
+  <snicoll@apache.org>
+  ------
+  April 3, 2011
+
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ Licensed under the Apache License, Version 2.0 (the "License");
+~~ you may not use this file except in compliance with the License.
+~~ You may obtain a copy of the License at
+~~
+~~      http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Using JavaEE application clients
+
+  JavaEE application clients are handled by the maven-acr-plugin with the 'app-client' packaging
type. Since this
+  packaging is new to Maven, you have to enable the extensions of the acr plugin for Maven
to discover it. This
+  sample below describes what needs to be added to your project for a 'app-client-sample'
application client. By
+  default the ear plugin adds any application client to the generated application.xml just
like it does for other
+  JavaEE packaging types.
+
++--------
+  <dependencies>
+    <dependency>
+      <groupId>com.foo</groupId>
+      <artifactId>app-client-sample</artifactId>
+      <version>1.0</version>
+      <type>app-client</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-acr-plugin</artifactId>
+        <version>1.0</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
++---------

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt Sun Apr  3 16:46:31 2011
@@ -52,6 +52,8 @@ Maven EAR Plugin
 
   * har
 
+  * app-client
+
   []
 
   For available configuration options for these artifacts, please see the
@@ -121,4 +123,6 @@ Maven EAR Plugin
 
   * {{{./examples/generating-modules-id.html} Generating modules id}}
 
-   []
+  * {{{./examples/using-app-client.html} Using JavaEE application clients}}
+
+  []

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm Sun Apr  3 16:46:31 2011
@@ -48,6 +48,8 @@ EAR Modules
 
   * {{{#harModule}harModule}}
 
+  * {{{#appClientModule}appClientModule}}
+
   []
 
   If the artifact you want to configure is not listed above, you can create your
@@ -401,6 +403,42 @@ EAR Modules
   * <<unpack>> - set to true to unpack this artifact into the ear archive according
   to its uri. Default is false.
 
+* {appClientModule} Properties
+
+  The following configuration options are available for AppClientModule:
+
+  * <<groupId>> - sets the groupId of the application client artifact you want
to
+  configure.
+
+  * <<artifactId>> - sets the artifactId of the applicant client artifact you
want to
+  configure.
+
+  * <<classifier>> - sets the classifier of the application client  artifact
you want to
+  configure if multiple application client artifacts matches the groupId/artifact.  Use
+  the mainArtifactId ('none' by default) to define the main artifact (e.g.
+  the artifact without a classifier)
+
+  * <<bundleDir>> - sets the location of this artifact inside the ear archive.
+  If not set, this artifact will be packaged in the root of the archive.
+
+  * <<bundleFileName>> - sets the new name of this artifact inside the ear
+  archive. If not set, the artifact's filename in the repository is used.
+
+  * <<excluded>> - set to true to exclude this artifact from being packaged into
+  the ear archive. Default is false.
+
+  * <<uri>> - sets the uri path of this artifact within the ear archive.
+  Automatically determined when not set.
+
+  * <<unpack>> - set to true to unpack this artifact into the ear archive according
+  to its uri. Default is false.
+
+  * <<altDeploymentDescriptor>> - sets the alternative deployment descriptor
for
+  this module.
+
+  * <<moduleId>> - sets the id of the module in the generated application.xml.
+
+
 * Adding {Custom Artifact Types}
 
   If you need to map a custom artifact type to one of those types, use the

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=1088330&r1=1088329&r2=1088330&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 Sun Apr  3 16:46:31 2011
@@ -172,3 +172,6 @@ EAR Plugin Tests
 
   * project-071: builds an EAR with application-name and initialize-in-order tags for unsupported
version
 
+  * project-072: builds an EAR with an application client module (app-client)
+
+  * project-073: builds an EAR with an application client module (app-client) and a default
bundle directory for _java_ modules

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml Sun Apr  3 16:46:31 2011
@@ -58,6 +58,19 @@ under the License.
        </p>
      </answer>
    </faq>
+   <faq id="when-should-one-use-the-modules">
+     <question>When should one use the modules configuration?</question>
+     <answer>
+       <p>
+         By default, the EAR plugin generates sensitive defaults for all the JavaEE dependencies
it found in the
+         current project. The <em>modules</em> configuration is useful if you
need to customize something such as the
+         bundle location, context root, etc.
+       </p>
+       <p>
+         Adding a module entry with only the groupId and artifactIf of a dependency is therefore
useless.
+       </p>
+     </answer>
+   </faq>
  </part>
 </faqs>
 

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/site.xml?rev=1088330&r1=1088329&r2=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/site.xml Sun Apr  3 16:46:31 2011
@@ -48,6 +48,7 @@ under the License.
       <item name="Generating jboss-app.xml" href="examples/generating-jboss-app.html"/>
       <item name="Customize file name mapping" href="examples/customize-file-name-mapping.html"/>
       <item name="Generating modules ID" href="examples/generating-modules-id.html"/>
+      <item name="Using JavaEE application clients" href="examples/using-app-client.html"/>
     </menu>
   </body>
 </project>

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=1088330&r1=1088329&r2=1088330&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
Sun Apr  3 16:46:31 2011
@@ -753,4 +753,24 @@ public class EarMojoIT
         doTestProject( "project-071", new String[]{ "ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar"
} );
     }
 
+    /**
+     * Builds an EAR with an application client module (app-client).
+     */
+    public void testProject072()
+        throws Exception
+    {
+        doTestProject( "project-072", new String[]{ "ejb-sample-one-1.0.jar", "app-client-sample-one-1.0.jar"
} );
+    }
+
+    /**
+     * Builds an EAR with an application client module (app-client) and a default bundle
directory for
+     * _java_ modules.
+     */
+    public void testProject073()
+        throws Exception
+    {
+        doTestProject( "project-073", new String[]{ "ejb-sample-one-1.0.jar", "app-client-sample-one-1.0.jar",
+            "APP-INF/lib/jar-sample-one-1.0.jar", "APP-INF/lib/jar-sample-two-1.0.jar" }
);
+    }
+
 }

Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.jar?rev=1088330&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.pom?rev=1088330&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.pom
(added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2repo/eartest/app-client-sample-one/1.0/app-client-sample-one-1.0.pom
Sun Apr  3 16:46:31 2011
@@ -0,0 +1,39 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>eartest</groupId>
+  <artifactId>app-client-sample-one</artifactId>
+  <packaging>app-client</packaging>
+  <version>1.0</version>
+  <distributionManagement>
+    <status>verified</status>
+  </distributionManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-acr-plugin</artifactId>
+        <version>1.0</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Copied: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml
(from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml&r1=1088325&r2=1088330&rev=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml
Sun Apr  3 16:46:31 2011
@@ -17,12 +17,12 @@ 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">
-  <description>The purpose of this application is to test the ApplicationXmlMojo execution
with
-            custom settings.</description>
-  <display-name>Sample test application #008</display-name>
+  <display-name>maven-ear-plugin-test-project-072</display-name>
   <module>
     <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
+  <module>
+    <java>app-client-sample-one-1.0.jar</java>
+  </module>
 </application>
\ No newline at end of file

Copied: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/pom.xml
(from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/pom.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/pom.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/pom.xml&r1=1088325&r2=1088330&rev=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/pom.xml Sun
Apr  3 16:46:31 2011
@@ -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-001</artifactId>
+  <artifactId>maven-ear-plugin-test-project-072</artifactId>
   <version>99.0</version>
   <name>Maven</name>
   <packaging>ear</packaging>
@@ -33,6 +33,12 @@ under the License.
       <version>1.0</version>
       <type>ejb</type>
     </dependency>
+    <dependency>
+      <groupId>eartest</groupId>
+      <artifactId>app-client-sample-one</artifactId>
+      <version>1.0</version>
+      <type>app-client</type>
+    </dependency>
   </dependencies>  
   <build>
     <plugins>
@@ -40,6 +46,15 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-ear-plugin</artifactId>
         <version>@project.version@</version>
+        <configuration>
+          <version>5</version>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-acr-plugin</artifactId>
+        <version>1.0</version>
+        <extensions>true</extensions>
       </plugin>
     </plugins>
   </build>

Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml?rev=1088330&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml
(added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml
Sun Apr  3 16:46:31 2011
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+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_6.xsd"
version="6">
+  <display-name>maven-ear-plugin-test-project-073</display-name>
+  <module>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
+  </module>
+  <module>
+    <java>app-client-sample-one-1.0.jar</java>
+  </module>
+  <library-directory>APP-INF/lib</library-directory>
+</application>

Copied: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/pom.xml
(from r1088325, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/pom.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/pom.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml&r1=1088325&r2=1088330&rev=1088330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/pom.xml Sun
Apr  3 16:46:31 2011
@@ -19,10 +19,10 @@ under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         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-003</artifactId>
+  <artifactId>maven-ear-plugin-test-project-073</artifactId>
   <version>99.0</version>
   <name>Maven</name>
   <packaging>ear</packaging>
@@ -35,6 +35,12 @@ under the License.
     </dependency>
     <dependency>
       <groupId>eartest</groupId>
+      <artifactId>app-client-sample-one</artifactId>
+      <version>1.0</version>
+      <type>app-client</type>
+    </dependency>
+    <dependency>
+      <groupId>eartest</groupId>
       <artifactId>jar-sample-one</artifactId>
       <version>1.0</version>
     </dependency>
@@ -51,9 +57,16 @@ under the License.
         <artifactId>maven-ear-plugin</artifactId>
         <version>@project.version@</version>
         <configuration>
+          <version>6</version>
           <defaultJavaBundleDir>APP-INF/lib</defaultJavaBundleDir>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-acr-plugin</artifactId>
+        <version>1.0</version>
+        <extensions>true</extensions>
+      </plugin>
     </plugins>
   </build>
 </project>



Mime
View raw message