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/08/14 12:57:47 UTC

svn commit: r431323 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/main/java/org/apache/maven/plugin/ear/ src/site/ src/site/apt/ src/site/apt/examples/

Author: snicoll
Date: Mon Aug 14 03:57:46 2006
New Revision: 431323

URL: http://svn.apache.org/viewvc?rev=431323&view=rev
Log:
MEAR-33: Added the ability to unpack artifacts in the generated EAR.

Added:
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt   (with props)
Modified:
    maven/plugins/trunk/maven-ear-plugin/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.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/Ejb3Module.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/HarModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ParModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/SarModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WsrModule.java
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt
    maven/plugins/trunk/maven-ear-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Mon Aug 14 03:57:46 2006
@@ -20,22 +20,27 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0</version>
+      <version>2.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-archiver</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <artifactId>maven-archiver</artifactId>
+      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.4</version>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-6</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java Mon Aug 14 03:57:46 2006
@@ -50,6 +50,8 @@
 
     protected Boolean excluded = Boolean.FALSE;
 
+    protected Boolean unpack = Boolean.FALSE;
+
     /**
      * Empty constructor to be used when the module
      * is built based on the configuration.
@@ -104,13 +106,6 @@
         }
     }
 
-    /**
-     * Returns the type associated to the module.
-     *
-     * @return the artifact's type of the module
-     */
-    protected abstract String getType();
-
     public Artifact getArtifact()
     {
         return artifact;
@@ -190,6 +185,11 @@
     public boolean isExcluded()
     {
         return excluded.booleanValue();
+    }
+
+    public boolean shouldUnpack()
+    {
+        return unpack.booleanValue();
     }
 
     public String toString()

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java Mon Aug 14 03:57:46 2006
@@ -50,11 +50,26 @@
     public String getUri();
 
     /**
+     * Returns the type associated to the module.
+     *
+     * @return the artifact's type of the module
+     */
+    public String getType();
+
+    /**
      * Specify whether this module should be excluded or not.
      *
      * @return true if this module should be skipped, false otherwise
      */
     public boolean isExcluded();
+
+    /**
+     * Specify whether this module should be unpacked in the
+     * EAR archive or not.
+     *
+     * @return true if this module should be bundled unpacked, false otherwise
+     */
+    public boolean shouldUnpack();
 
     /**
      * Appends the <tt>XML</tt> representation of this module.

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=431323&r1=431322&r2=431323&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 14 03:57:46 2006
@@ -20,7 +20,11 @@
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -101,6 +105,14 @@
     private String finalName;
 
     /**
+     * The comma separated list of artifact's type(s) to unpack
+     * by default.
+     *
+     * @parameter
+     */
+    private String unpackTypes;
+
+    /**
      * The directory to get the resources from.
      *
      * @parameter expression="${project.build.outputDirectory}"
@@ -124,6 +136,12 @@
      */
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
+    /**
+     * The archive manager.
+     *
+     * @component
+     */
+    private ArchiverManager archiverManager;
 
     public void execute()
         throws MojoExecutionException, MojoFailureException
@@ -131,30 +149,64 @@
         // Initializes ear modules
         super.execute();
 
+        // Initializes unpack types
+        List unpackTypesList = new ArrayList();
+        if ( unpackTypes != null )
+        {
+            unpackTypesList = Arrays.asList( unpackTypes.split( "," ) );
+            final Iterator it = unpackTypesList.iterator();
+            while ( it.hasNext() )
+            {
+                String type = (String) it.next();
+                if ( !EarModuleFactory.standardArtifactTypes.contains( type ) )
+                {
+                    throw new MojoExecutionException( "Invalid type["+type+"] supported types are "+ EarModuleFactory.standardArtifactTypes);
+                }
+            }
+            getLog().debug( "Initialized unpack types "+ unpackTypesList);
+        }
+
+
         // Copy modules
         try
         {
             for ( Iterator iter = getModules().iterator(); iter.hasNext(); )
             {
                 EarModule module = (EarModule) iter.next();
-                getLog().info( "Copying artifact[" + module + "] to[" + module.getUri() + "]" );
-                File destinationFile = buildDestinationFile( getWorkDirectory(), module.getUri() );
-
-                File sourceFile = module.getArtifact().getFile();
-
+                final File sourceFile = module.getArtifact().getFile();
+                final File destinationFile = buildDestinationFile( getWorkDirectory(), module.getUri() );
                 if ( !sourceFile.isFile() )
                 {
                     throw new MojoExecutionException( "Cannot copy a directory: " + sourceFile.getAbsolutePath() +
                         "; Did you package/install " + module.getArtifact() + "?" );
                 }
 
-                FileUtils.copyFile( module.getArtifact().getFile(), destinationFile );
+                if ( unpackTypesList.contains( module.getType()) || module.shouldUnpack() )
+                {
+                    getLog().info( "Copying artifact[" + module + "] to[" + module.getUri() + "] (unpacked)" );
+                    // Make sure that the destination is a directory to avoid plexus nasty stuff :)
+                    destinationFile.mkdirs();
+                    unpack( sourceFile, destinationFile );
+                }
+                else
+                {
+                    getLog().info( "Copying artifact[" + module + "] to[" + module.getUri() + "]" );
+                    FileUtils.copyFile( module.getArtifact().getFile(), destinationFile );
+                }
             }
         }
         catch ( IOException e )
         {
             throw new MojoExecutionException( "Error copying EAR modules", e );
         }
+        catch ( ArchiverException e )
+        {
+            throw new MojoExecutionException( "Error unpacking EAR modules", e );
+        }
+        catch ( NoSuchArchiverException e )
+        {
+            throw new MojoExecutionException( "No Archiver found for EAR modules", e );
+        }
 
         // Copy source files
         try
@@ -317,4 +369,23 @@
 
         return scanner.getIncludedFiles();
     }
+
+    /**
+     * Unpacks the module into the EAR structure.
+     *
+     * @param source  File to be unpacked.
+     * @param destDir Location where to put the unpacked files.
+     */
+    public void unpack( File source, File destDir )
+        throws NoSuchArchiverException, IOException, ArchiverException
+    {
+        UnArchiver unArchiver = archiverManager.getUnArchiver( source );
+        unArchiver.setSourceFile( source );
+        unArchiver.setDestDirectory( destDir );
+
+        // Extract the module
+        unArchiver.extract();
+    }
+
+
 }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java Mon Aug 14 03:57:46 2006
@@ -38,7 +38,7 @@
         super( a );
     }
 
-    protected String getType()
+    public String getType()
     {
         return "ejb3";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java Mon Aug 14 03:57:46 2006
@@ -37,7 +37,7 @@
         super( a, null );
     }
 
-    protected String getType()
+    public String getType()
     {
         return "ejb-client";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java Mon Aug 14 03:57:46 2006
@@ -48,7 +48,7 @@
         writer.endElement();
     }
 
-    protected String getType()
+    public String getType()
     {
         return "ejb";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/HarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/HarModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/HarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/HarModule.java Mon Aug 14 03:57:46 2006
@@ -55,7 +55,7 @@
         writer.endElement();
     }
 
-    protected String getType()
+    public String getType()
     {
         return "har";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java Mon Aug 14 03:57:46 2006
@@ -72,7 +72,7 @@
         setJavaBundleDir( EarExecutionContext.getInstance().getDefaultJavaBundleDir() );
     }
 
-    protected String getType()
+    public String getType()
     {
         return "jar";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ParModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ParModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ParModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ParModule.java Mon Aug 14 03:57:46 2006
@@ -39,7 +39,7 @@
         super( a );
     }
 
-    protected String getType()
+    public String getType()
     {
         return "par";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java Mon Aug 14 03:57:46 2006
@@ -48,7 +48,7 @@
         writer.endElement();
     }
 
-    protected String getType()
+    public String getType()
     {
         return "rar";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/SarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/SarModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/SarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/SarModule.java Mon Aug 14 03:57:46 2006
@@ -63,7 +63,7 @@
         writer.endElement();
     }
 
-    protected String getType()
+    public String getType()
     {
         return "sar";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java Mon Aug 14 03:57:46 2006
@@ -91,7 +91,7 @@
         return contextRoot;
     }
 
-    protected String getType()
+    public String getType()
     {
         return "war";
     }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WsrModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WsrModule.java?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WsrModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WsrModule.java Mon Aug 14 03:57:46 2006
@@ -37,7 +37,7 @@
         super( a );
     }
 
-    protected String getType()
+    public String getType()
     {
         return "wsr";
     }

Added: maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt?rev=431323&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt Mon Aug 14 03:57:46 2006
@@ -0,0 +1,72 @@
+  ------
+  Unpacking A Module
+  ------
+  Stephane Nicoll
+  <sn...@apache.org>
+  ------
+  Augustus 14, 2006
+
+~~ 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/guides/mini/guide-apt-format.html
+
+
+Unpacking A Module
+
+  If you need to unpack artifacts in the generted EAR, you can configure it in
+  two ways:
+
+  * Specify the unpack attribute on the required artifact(s)
+
+  * Specify the comma separated list of types to unpack by default
+
+  Note that artifacts are unpacked according to their respective URI.
+
++--------
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-ear-plugin</artifactId>
+        <configuration>
+          <modules>
+            <javaModule>
+              <groupId>artifactGroupId</groupId>
+              <artifactId>artifactId</artifactId>
+              <unpack>true</unpack>
+            </javaModule>
+          </modules>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
++---------
+
+
++--------
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-ear-plugin</artifactId>
+        <configuration>
+          <unpackTypes>rar,war,ejb</unpackTypes>
+          [...]
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
++---------

Propchange: maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/unpacking-a-module.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

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=431323&r1=431322&r2=431323&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 Mon Aug 14 03:57:46 2006
@@ -89,6 +89,8 @@
 
   * {{{examples/excluding-a-module.html}Excluding A Module}}
 
+  * {{{examples/unpacking-a-module.html}Unpacking A Module}}
+
   * {{{examples/including-a-third-party-library-in-application-xml.html}
   Including A Third Party Library In application.xml}}
 

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt Mon Aug 14 03:57:46 2006
@@ -100,6 +100,9 @@
   * <<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.
+
 
 * {ejbClientModule} Properties
 
@@ -123,6 +126,9 @@
   * <<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.
+
 
 * {ejbModule} Properties
 
@@ -146,6 +152,9 @@
   * <<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.
+
 
 * {javaModule} Properties
 
@@ -169,6 +178,9 @@
   * <<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.
+
   * <<includeInApplicationXml>> - set to true to if you want to generate an entry
   of this module in <<<application.xml>>>. Default is false.
 
@@ -195,6 +207,9 @@
   * <<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.
+
 
 * {rarModule} Properties
 
@@ -218,6 +233,9 @@
   * <<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.
+
 
 * {sarModule} Properties
 
@@ -241,6 +259,9 @@
   * <<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.
+
 
 * {webModule} Properties
 
@@ -264,6 +285,9 @@
   * <<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.
+
   * <<contextRoot>> - sets the context root of this web artifact.
 
 
@@ -289,6 +313,9 @@
   * <<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.
+
 
 * {harModule} Properties
 
@@ -311,6 +338,9 @@
 
   * <<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.
 
 * Adding {Custom Artifact Types}
 

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt?rev=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt Mon Aug 14 03:57:46 2006
@@ -81,6 +81,8 @@
 
    * <<excluded>>: excludes the artifact from the generated ear.
 
+   * <<unpack>>: unpack the artifact in the generated ear.
+
   The context root of a Web module might be customized using the contextRoot
   parameter.
 
@@ -93,6 +95,9 @@
   libraries.
 
   The security settings might be specified under the security parameter.
+
+  The artifact's types that should be unpacked by default can be specified
+  using the unpackTypes parameter
 
   For more information on EAR modules, please see the
   {{{modules.html}modules configuration}} page.

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=431323&r1=431322&r2=431323&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/site.xml Mon Aug 14 03:57:46 2006
@@ -44,8 +44,10 @@
       <item name="Customizing A Module Location" href="examples/customizing-module-location.html"/>
       <item name="Customizing A Module URI" href="examples/customizing-module-uri.html"/>
       <item name="Excluding A Module" href="examples/excluding-a-module.html"/>
+      <item name="Unpacking A Module" href="examples/unpacking-a-module.html"/>
       <item name="Including A Third Party Library In application.xml" href="examples/including-a-third-party-library-in-application-xml.html"/>
       <item name="Specifying Security Roles For The Generated application.xml" href="examples/specifying-security-roles-for-the-generated-application-xml.html"/>
+      <item name="Generating jboss-app.xml" href="examples/generating-jboss-app.html"/>
     </menu>
 
     ${reports}