You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/05/25 13:16:10 UTC
svn commit: r659960 - in /maven/plugins/trunk:
maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/
maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/
maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/
maven-rar-plugin/src/main...
Author: vsiveton
Date: Sun May 25 04:16:10 2008
New Revision: 659960
URL: http://svn.apache.org/viewvc?rev=659960&view=rev
Log:
o added reference to MavenArchiveConfiguration's site in javadoc
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
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=659960&r1=659959&r2=659960&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 Sun May 25 04:16:10 2008
@@ -141,7 +141,8 @@
private JarArchiver jarArchiver;
/**
- * The maven archiver to use.
+ * The archive configuration to use.
+ * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
*
* @parameter
*/
@@ -456,13 +457,13 @@
// Extract the module
unArchiver.extract();
}
-
+
/**
* Returns the {@link JarArchiver} implementation used
* to package the EAR file.
- * <p/>
+ * <p/>
* By default the archiver is obtained from the Plexus container.
- *
+ *
* @return the archiver
*/
protected JarArchiver getJarArchiver()
Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=659960&r1=659959&r2=659960&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Sun May 25 04:16:10 2008
@@ -182,7 +182,8 @@
private MavenProjectHelper projectHelper;
/**
- * The maven archiver to use.
+ * The archive configuration to use.
+ * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
*
* @parameter
*/
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=659960&r1=659959&r2=659960&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java Sun May 25 04:16:10 2008
@@ -92,10 +92,7 @@
/**
* The archive configuration to use.
- *
- * See <a
- * href="http://maven.apache.org/shared/maven-archiver/index.html">the
- * documentation for Maven Archiver</a>.
+ * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
*
* @parameter
*/
Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=659960&r1=659959&r2=659960&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Sun May 25 04:16:10 2008
@@ -124,7 +124,8 @@
private JarArchiver jarArchiver;
/**
- * The maven archiver to use.
+ * The archive configuration to use.
+ * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
*
* @parameter
*/
@@ -168,7 +169,7 @@
for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
{
Artifact artifact = (Artifact) iter.next();
-
+
ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
if ( !artifact.isOptional() && filter.include( artifact ) )
{
@@ -252,7 +253,7 @@
archiver.getArchiver().addDirectory( getBuildDir() );
archiver.createArchive( project, archive );
-
+
project.getArtifact().setFile( rarFile );
}
catch ( Exception e )
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=659960&r1=659959&r2=659960&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun May 25 04:16:10 2008
@@ -92,7 +92,7 @@
/**
* The Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib.
- *
+ *
* @component role="org.codehaus.plexus.archiver.Archiver" role-hint="jar"
* @required
*/
@@ -124,7 +124,7 @@
/**
* Filters (property files) to include during the interpolation of the pom.xml.
- * @parameter
+ * @parameter
*/
private List filters;
@@ -176,7 +176,7 @@
* @since 2.1
*/
private boolean useCache = true;
-
+
/**
* To look up Archiver/UnArchiver implementations
*
@@ -184,19 +184,19 @@
* @required
*/
private ArchiverManager archiverManager;
-
+
/**
- *
+ *
* @component role="org.apache.maven.shared.filtering.MavenFileFilter" role-hint="default"
* @required
*/
- private MavenFileFilter mavenFileFilter;
-
+ private MavenFileFilter mavenFileFilter;
+
/**
- *
+ *
* @component role="org.apache.maven.shared.filtering.MavenResourcesFiltering" role-hint="default"
* @required
- */
+ */
private MavenResourcesFiltering mavenResourcesFiltering;
private static final String WEB_INF = "WEB-INF";
@@ -252,35 +252,35 @@
* @since 2.1
*/
private List overlays = new ArrayList();
-
+
/**
* A list of file extensions to not filtering.
* <b>will be used for webResources and overlay filtering</b>
- *
- * @parameter
+ *
+ * @parameter
* @since 2.1-alpha-2
*/
private List nonFilteredFileExtensions;
-
+
/**
* @parameter expression="${session}"
* @readonly
* @required
* @since 2.1-alpha-2
*/
- private MavenSession session;
-
- /**
- * To filtering deployment descriptors <b>disabled by default</b>
- *
- * @parameter expression="${maven.war.filteringDeploymentDescriptors}" default-value="false"
- * @since 2.1-alpha-2
- */
- private boolean filteringDeploymentDescriptors = false;
-
+ private MavenSession session;
+
+ /**
+ * To filtering deployment descriptors <b>disabled by default</b>
+ *
+ * @parameter expression="${maven.war.filteringDeploymentDescriptors}" default-value="false"
+ * @since 2.1-alpha-2
+ */
+ private boolean filteringDeploymentDescriptors = false;
/**
- * The maven archive configuration to use.
+ * The archive configuration to use.
+ * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
*
* @parameter
*/
@@ -431,7 +431,7 @@
getLog().error( "fail to build filering wrappers " + e.getMessage() );
throw new MojoExecutionException( e.getMessage(), e );
}
-
+
final WarPackagingContext context = new DefaultWarPackagingContext( webappDirectory, cache, overlayManager,
filterWrappers,
getNonFilteredFileExtensions(),
@@ -521,11 +521,11 @@
private final File webappDirectory;
private final OverlayManager overlayManager;
-
+
private final List filterWrappers;
-
+
private List nonFilteredFileExtensions;
-
+
private boolean filteringDeploymentDescriptors;
public DefaultWarPackagingContext( File webappDirectory, final WebappStructure webappStructure,
@@ -648,7 +648,7 @@
{
return filteringDeploymentDescriptors;
}
-
+
}
public MavenProject getProject()