svn commit: r743076 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Author: dennisl
Date: Tue Feb 10 19:43:08 2009
New Revision: 743076
URL: http://svn.apache.org/viewvc?rev=743076view=rev
Log:
[MSITE-384] site:stage-deploy fails on Windows for projects with 3 levels of
modules
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=743076r1=743075r2=743076view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Tue Feb 10 19:43:08 2009
@@ -238,6 +238,9 @@
// Find the relative path between the parent and child
distribution URLs, if any
relative = / + siteTool.getRelativePath(
currentProject.getDistributionManagement().getSite().getUrl(),
topLevelProject.getDistributionManagement().getSite().getUrl() );
+// SiteTool.getRelativePath() uses File.separatorChar, so we need
to convert '\' to '/' in order for the URL
+// to be valid for Windows users
+relative = relative.replace( '\\', '/' );
if ( topLevelURL == null )
{
svn commit: r743086 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
Author: dennisl Date: Tue Feb 10 20:27:07 2009 New Revision: 743086 URL: http://svn.apache.org/viewvc?rev=743086view=rev Log: [MSITE-238] multi project default URL is wrong o Documented the current behavior better. Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt?rev=743086r1=743085r2=743086view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt Tue Feb 10 20:27:07 2009 @@ -49,6 +49,12 @@ By default, the resulting site will be in the target/site/ directory. + Note: If you have a multi module project, then the links between the + parent and child modules will not work when you use 'mvn site' or + 'mvn site:site'. If you want to use those links, you should use + 'mvn site:stage' instead. You read more about that goal further down on + this page in the section called 'Staging a Site'. + * Deploying a Site To be able to deploy the site, you must first specify where the site will be
svn commit: r743319 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Author: dennisl
Date: Wed Feb 11 13:06:59 2009
New Revision: 743319
URL: http://svn.apache.org/viewvc?rev=743319view=rev
Log:
[MWAR-183] filteringDeploymentDescriptors should honor the encoding specified
in web.xml
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=743319r1=743318r2=743319view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Wed Feb 11 13:06:59 2009
@@ -31,6 +31,7 @@
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
/**
* Handles the project own resources, that is:
@@ -220,9 +221,8 @@
}
if ( context.isFilteringDeploymentDescriptors() )
{
-// TODO: web.xml encoding can be different from UTF-8
context.getMavenFileFilter().copyFile( webXml, new File(
webinfDir, web.xml ), true,
-
context.getFilterWrappers(), UTF-8 );
+
context.getFilterWrappers(), getEncoding( webXml ) );
}
else
{
@@ -238,9 +238,8 @@
// if exists we can filter it
if ( defaultWebXml.exists()
context.isFilteringDeploymentDescriptors() )
{
-// TODO: web.xml encoding can be different from UTF-8
context.getMavenFileFilter().copyFile( defaultWebXml, new
File( webinfDir, web.xml ), true,
-
context.getFilterWrappers(), UTF-8 );
+
context.getFilterWrappers(), getEncoding( defaultWebXml ) );
context.getWebappStructure().getFullStructure().add(
WEB_INF_PATH + /web.xml );
}
}
@@ -250,9 +249,9 @@
String xmlFileName = containerConfigXML.getName();
if ( context.isFilteringDeploymentDescriptors() )
{
-// TODO: XML config file encoding can be different from
UTF-8
context.getMavenFileFilter().copyFile( containerConfigXML,
new File( metainfDir, xmlFileName ),
- true,
context.getFilterWrappers(), UTF-8 );
+ true,
context.getFilterWrappers(),
+ getEncoding(
containerConfigXML ) );
}
else
{
@@ -272,6 +271,19 @@
}
}
+/**
+ * Get the encoding from an XML-file.
+ *
+ * @param webXml the XML-file
+ * @return The encoding of the XML-file, or UTF-8 if it's not specified in
the file
+ * @throws IOException if an error occurred while reading the file
+ */
+private String getEncoding( File webXml )
+throws IOException
+{
+XmlStreamReader xmlReader = new XmlStreamReader( webXml );
+return xmlReader.getEncoding();
+}
/**
* Copies webapp webResources from the specified directory.
svn commit: r743348 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/util/WarUtils.java test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
Author: dennisl
Date: Wed Feb 11 14:40:19 2009
New Revision: 743348
URL: http://svn.apache.org/viewvc?rev=743348view=rev
Log:
[MWAR-160] Strange behaviour of
org.apache.maven.plugin.war.util.WarUtils.dependencyEquals(Dependency,
Dependency)
o Fixed two logical errors and added tests to verify them.
Added:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
(with props)
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java?rev=743348r1=743347r2=743348view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
Wed Feb 11 14:40:19 2009
@@ -113,7 +113,7 @@
{
return false;
}
-if ( !!StringUtils.equals( first.getArtifactId(),
second.getArtifactId() ) )
+if ( !StringUtils.equals( first.getArtifactId(),
second.getArtifactId() ) )
{
return false;
}
@@ -127,7 +127,7 @@
{
return false;
}
-if ( !!StringUtils.equals( first.getGroupId(), second.getGroupId() ) )
+if ( !StringUtils.equals( first.getGroupId(), second.getGroupId() ) )
{
return false;
}
Added:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java?rev=743348view=auto
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
(added)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
Wed Feb 11 14:40:19 2009
@@ -0,0 +1,65 @@
+package org.apache.maven.plugin.war.util;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+import org.apache.maven.model.Dependency;
+
+/**
+ * Test the WarUtils.
+ *
+ * @author Dennis Lundberg
+ * @version $Id$
+ */
+public class WarUtilsTest
+extends TestCase
+{
+/**
+ * Test for MWAR-160.
+ */
+public void testDependencyEquals()
+{
+Dependency firstDependency = new Dependency();
+firstDependency.setGroupId( 1 );
+firstDependency.setArtifactId( a );
+Dependency secondDependency = new Dependency();
+secondDependency.setGroupId( 2 );
+secondDependency.setArtifactId( b );
+Dependency thirdDependency = new Dependency();
+thirdDependency.setGroupId( 1 );
+thirdDependency.setArtifactId( c );
+Dependency fourthDependency = new Dependency();
+fourthDependency.setGroupId( 4 );
+fourthDependency.setArtifactId( a );
+
+assertFalse( dependencies 1:a and 2:b should not be equal,
WarUtils.dependencyEquals( firstDependency,
+
secondDependency ) );
+assertFalse( dependencies 1:a and 1:c should not be equal,
WarUtils.dependencyEquals( firstDependency,
+
thirdDependency ) );
+assertFalse( dependencies 1:a and 4:a should not be equal,
WarUtils.dependencyEquals( firstDependency,
+
fourthDependency ) );
+assertFalse( dependencies 2:b and 1:c should not be equal,
WarUtils.dependencyEquals( secondDependency
svn commit: r743374 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: AbstractWarMojo.java packaging/ClassesPackagingTask.java packaging/WarPackagingContext.java
Author: dennisl
Date: Wed Feb 11 16:28:01 2009
New Revision: 743374
URL: http://svn.apache.org/viewvc?rev=743374view=rev
Log:
[MWAR-163] The outputFilenameMapping does not apply to the artifact of the
current project
Submitted by: Michael McCallum
Reviewed by: Dennis Lundberg
o Needed to catch an exception, that wasn't handled by the patch
o Reformated the code to our style
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java
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=743374r1=743373r2=743374view=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
Wed Feb 11 16:28:01 2009
@@ -28,6 +28,7 @@
import java.util.List;
import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
@@ -175,6 +176,13 @@
private boolean useCache = true;
/**
+ * @component role=org.apache.maven.artifact.factory.ArtifactFactory
+ * @required
+ * @readonly
+ */
+private ArtifactFactory artifactFactory;
+
+/**
* To look up Archiver/UnArchiver implementations
*
* @component role=org.codehaus.plexus.archiver.manager.ArchiverManager
@@ -274,22 +282,22 @@
* @since 2.1-alpha-2
*/
private boolean filteringDeploymentDescriptors = false;
-
+
/**
- * To escape interpolated value with windows path
+ * To escape interpolated value with windows path
* c:\foo\bar will be replaced with c:\\foo\\bar
* @parameter expression=${maven.war.escapedBackslashesInFilePath}
default-value=false
* @since 2.1-alpha-2
- */
+ */
private boolean escapedBackslashesInFilePath = false;
-
+
/**
- * Expression preceded with the String won't be interpolated
+ * Expression preceded with the String won't be interpolated
* \${foo} will be replaced with ${foo}
* @parameter expression=${maven.war.escapeString}
* @since 2.1-beta-1
- */
-protected String escapeString;
+ */
+protected String escapeString;
/**
* The archive configuration to use.
@@ -428,11 +436,11 @@
{
MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution();
mavenResourcesExecution.setEscapeString( escapeString );
-
+
defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers(
project, filters,
escapedBackslashesInFilePath,
this.session, mavenResourcesExecution );
-
+
}
catch ( MavenFilteringException e )
{
@@ -443,7 +451,8 @@
final WarPackagingContext context = new DefaultWarPackagingContext(
webappDirectory, cache, overlayManager,
defaultFilterWrappers,
getNonFilteredFileExtensions(),
-
filteringDeploymentDescriptors );
+
filteringDeploymentDescriptors,
+
this.artifactFactory);
final Iterator it = packagingTasks.iterator();
while ( it.hasNext() )
{
@@ -523,6 +532,7 @@
implements WarPackagingContext
{
+private final ArtifactFactory artifactFactory;
private final WebappStructure webappStructure;
@@ -538,12 +548,14 @@
public DefaultWarPackagingContext( File webappDirectory, final
WebappStructure webappStructure,
final OverlayManager
overlayManager, List filterWrappers,
- List nonFilteredFileExtensions,
boolean filteringDeploymentDescriptors )
+ List nonFilteredFileExtensions,
boolean
svn commit: r743577 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl
Date: Thu Feb 12 00:01:07 2009
New Revision: 743577
URL: http://svn.apache.org/viewvc?rev=743577view=rev
Log:
o Restore parameter expressions that were removed in r742375 - we need both
default-value and expression.
o Add more parameter expressions.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
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=743577r1=743576r2=743577view=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
Thu Feb 12 00:01:07 2009
@@ -68,7 +68,7 @@
/**
* Directory that resources are copied to during the build.
*
- * @parameter default-value=${project.build.outputDirectory}
+ * @parameter default-value=${project.build.outputDirectory}
expression=${outputDirectory}
* @required
*/
private String outputDirectory;
@@ -76,7 +76,7 @@
/**
* The name of the EJB file to generate.
*
- * @parameter default-value=${project.build.finalName}
+ * @parameter default-value=${project.build.finalName}
expression=${jarName}
* @required
*/
private String jarName;
@@ -85,14 +85,14 @@
* Classifier to add to the artifact generated. If given, the artifact will
* be an attachment instead.
*
- * @parameter
+ * @parameter expression=${ejb.classifier}
*/
private String classifier;
/**
* Whether the EJB client jar should be generated or not.
*
- * @parameter default-value=false
+ * @parameter default-value=false expression=${ejb.generateClient}
*/
private boolean generateClient;
svn commit: r743716 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/WarMojo.java site/fml/faq.fml test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Author: dennisl
Date: Thu Feb 12 13:02:55 2009
New Revision: 743716
URL: http://svn.apache.org/viewvc?rev=743716view=rev
Log:
[MWAR-80] Classifier in jar file name is removed once assembled into war file
o Documented the current behavior better.
o Added a test case to verify that the classifier of a dependency is not lost
in translation.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=743716r1=743715r2=743716view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Thu Feb 12 13:02:55 2009
@@ -64,7 +64,8 @@
private String warName;
/**
- * Classifier to add to the artifact generated. If given, the artifact
will be an attachment instead.
+ * Classifier to add to the generated WAR. If given, the artifact will be
an attachment instead.
+ * The classifier will not be applied to the jar file of the project -
only to the war file.
*
* @parameter
*/
@@ -187,7 +188,7 @@
getLog().debug(
Excluding + Arrays.asList( getPackagingExcludes() ) + for the
generated webapp archive. );
-
+
warArchiver.addDirectory( getWebappDirectory(), new String[]{**},
getPackagingExcludes() );
final File webXmlFile = new File( getWebappDirectory(),
WEB-INF/web.xml );
Modified: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml?rev=743716r1=743715r2=743716view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml Thu Feb 12
13:02:55 2009
@@ -39,9 +39,9 @@
/answer
/faq
faq id=classifieruse
- questionHow does the classifier affect artifacts in my war
project?/question
+ questionHow does the classifier of dependency artifacts affect my war
project?/question
answer
- pWhen used, the copy of the artifact in your project will have the
classifier appended to its
+ pWhen used, the copy of the dependency artifact in your project will
have the classifier appended to its
filename. This can be used to differentiate duplicate artifacts./p
/answer
/faq
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=743716r1=743715r2=743716view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Thu Feb 12 13:02:55 2009
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.war.AbstractWarMojo;
import org.apache.maven.plugin.war.stub.AbstractArtifactStub;
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -69,6 +70,18 @@
}
+public void testMappingWithClassifier()
+throws MojoExecutionException, InterpolationException
+{
+TestArtifactStub jar = new TestArtifactStub();
+jar.setGroupId( org.apache.sample );
+jar.setArtifactId( maven-test-lib );
+jar.setVersion( 1.0 );
+jar.setClassifier( classifier );
+assertEquals( maven-test-lib-1.0-classifier.jar,
+ MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+}
+
// A very dumb stub used to test the mappings
class TestArtifactStub
svn commit: r743744 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: AbstractWarMojo.java WarMojo.java
Author: dennisl
Date: Thu Feb 12 13:59:23 2009
New Revision: 743744
URL: http://svn.apache.org/viewvc?rev=743744view=rev
Log:
o Add and correct @since tags.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
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=743744r1=743743r2=743744view=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
Thu Feb 12 13:59:23 2009
@@ -85,6 +85,7 @@
* and the classes directory will then be excluded from the webapp.
*
* @parameter expression=${archiveClasses} default-value=false
+ * @since 2.0.1
*/
private boolean archiveClasses;
@@ -153,7 +154,7 @@
* set (default) the file is copied with its standard name.
*
* @parameter
- * @since 2.0.3
+ * @since 2.1-alpha-1
*/
private String outputFileNameMapping;
@@ -162,7 +163,7 @@
*
* @parameter
expression=${project.build.directory}/war/work/webapp-cache.xml
* @required
- * @since 2.1
+ * @since 2.1-alpha-1
*/
private File cacheFile;
@@ -171,7 +172,7 @@
* accross multiple runs.
*
* @parameter expression=${useCache} default-value=true
- * @since 2.1
+ * @since 2.1-alpha-1
*/
private boolean useCache = true;
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=743744r1=743743r2=743744view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Thu Feb 12 13:59:23 2009
@@ -77,6 +77,7 @@
* case.
*
* @parameter alias=packagingExcludes
+ * @since 2.1-alpha-2
*/
private String packagingExcludes;
@@ -105,6 +106,7 @@
* if you want you war built without a codeweb.xml/code file.
*
* @parameter expression=${failOnMissingWebXml} default-value=true
+ * @since 2.1-alpha-2
*/
private boolean failOnMissingWebXml = true;
@@ -113,6 +115,7 @@
* project.
*
* @parameter default-value=false
+ * @since 2.1-alpha-2
*/
private boolean attachClasses = false;
@@ -120,6 +123,7 @@
* The classifier to use for the attached classes artifact.
*
* @parameter default-value=classes
+ * @since 2.1-alpha-2
*/
private String classesClassifier = classes;
svn commit: r743750 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Author: dennisl
Date: Thu Feb 12 14:07:31 2009
New Revision: 743750
URL: http://svn.apache.org/viewvc?rev=743750view=rev
Log:
o Move static final variables to the start of the file.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
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=743750r1=743749r2=743750view=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
Thu Feb 12 14:07:31 2009
@@ -55,12 +55,24 @@
import org.codehaus.plexus.util.StringUtils;
/**
- * Contains commons jobs for war mojos
+ * Contains commons jobs for war mojos.
+ *
* @version $Id$
*/
public abstract class AbstractWarMojo
extends AbstractMojo
{
+public static final String DEFAULT_FILE_NAME_MAPPING =
@{artifact...@-@{versi...@.@{extension}@;
+
+public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
+@{artifact...@-@{versi...@-@{classifi...@.@{extension}@;
+
+private static final String[] EMPTY_STRING_ARRAY = {};
+
+private static final String META_INF = META-INF;
+
+private static final String WEB_INF = WEB-INF;
+
/**
* The maven project.
*
@@ -205,15 +217,6 @@
*/
private MavenResourcesFiltering mavenResourcesFiltering;
-private static final String WEB_INF = WEB-INF;
-
-private static final String META_INF = META-INF;
-
-public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
-@{artifact...@-@{versi...@-@{classifi...@.@{extension}@;
-
-public static final String DEFAULT_FILE_NAME_MAPPING =
@{artifact...@-@{versi...@.@{extension}@;
-
/**
* The comma separated list of tokens to include when copying content
* of the warSourceDirectory. Default is '**'.
@@ -308,8 +311,6 @@
*/
private MavenArchiveConfiguration archive = new
MavenArchiveConfiguration();
-private static final String[] EMPTY_STRING_ARRAY = {};
-
private final WebappStructureSerializer webappStructureSerialier = new
WebappStructureSerializer();
/**
svn commit: r743751 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: WarExplodedMojo.java WarInPlaceMojo.java
Author: dennisl Date: Thu Feb 12 14:07:54 2009 New Revision: 743751 URL: http://svn.apache.org/viewvc?rev=743751view=rev Log: o Adjust Javadoc. Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java?rev=743751r1=743750r2=743751view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java Thu Feb 12 14:07:54 2009 @@ -23,7 +23,7 @@ import org.apache.maven.plugin.MojoFailureException; /** - * Generate the exploded webapp + * Generate the exploded webapp. * * @goal exploded * @phase package Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java?rev=743751r1=743750r2=743751view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java Thu Feb 12 14:07:54 2009 @@ -23,7 +23,7 @@ import org.apache.maven.plugin.MojoFailureException; /** - * Generates webapp in the source directory + * Generate the webapp in the source directory. * * @goal inplace * @requiresDependencyResolution runtime
svn commit: r744705 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/WarMojo.java site/apt/examples/skinny-wars.apt
Author: dennisl
Date: Sun Feb 15 17:40:31 2009
New Revision: 744705
URL: http://svn.apache.org/viewvc?rev=744705view=rev
Log:
[MWAR-182] warSourceIncludes no longer works
o Add a new parameter packagingIncludes
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=744705r1=744704r2=744705view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Sun Feb 15 17:40:31 2009
@@ -82,6 +82,16 @@
private String packagingExcludes;
/**
+ * The comma separated list of tokens to include in the WAR before
+ * packaging. By default everything is included. This option may be used
+ * to implement the skinny war use case.
+ *
+ * @parameter alias=packagingIncludes
+ * @since 2.1-beta-1
+ */
+private String packagingIncludes;
+
+/**
* The War archiver.
*
* @component role=org.codehaus.plexus.archiver.Archiver roleHint=war
@@ -191,9 +201,11 @@
archiver.setOutputFile( warFile );
getLog().debug(
-Excluding + Arrays.asList( getPackagingExcludes() ) + for the
generated webapp archive. );
+Excluding + Arrays.asList( getPackagingExcludes() ) + from
the generated webapp archive. );
+getLog().debug(
+Including + Arrays.asList( getPackagingIncludes() ) + in the
generated webapp archive. );
-warArchiver.addDirectory( getWebappDirectory(), new String[]{**},
getPackagingExcludes() );
+warArchiver.addDirectory( getWebappDirectory(),
getPackagingIncludes(), getPackagingExcludes() );
final File webXmlFile = new File( getWebappDirectory(),
WEB-INF/web.xml );
if ( webXmlFile.exists() )
@@ -292,7 +304,6 @@
{
return StringUtils.split( packagingExcludes, , );
}
-
}
public void setPackagingExcludes( String packagingExcludes )
@@ -300,6 +311,23 @@
this.packagingExcludes = packagingExcludes;
}
+public String[] getPackagingIncludes()
+{
+if ( StringUtils.isEmpty( packagingIncludes ) )
+{
+return new String[]{**};
+}
+else
+{
+return StringUtils.split( packagingIncludes, , );
+}
+}
+
+public void setPackagingIncludes( String packagingIncludes )
+{
+this.packagingIncludes = packagingIncludes;
+}
+
public String getOutputDirectory()
{
return outputDirectory;
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=744705r1=744704r2=744705view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Sun Feb 15 17:40:31 2009
@@ -46,8 +46,9 @@
plugins
plugin
artifactIdmaven-war-plugin/artifactId
+version2.1-alpha-2/version
configuration
- !-- In version 2.x, this was incorrectly named warSourceExcludes --
+ !-- In version 2.1-alpha-1, this was incorrectly named
warSourceExcludes --
packagingExcludesWEB-INF/lib/*.jar/packagingExcludes
archive
manifest
@@ -63,6 +64,38 @@
/project
+-+
+ Here's another variant of the above example, but this time we use
+ \packagingIncludes\ to select a few JARs to be included in the WAR.
+ This is useful when there is a need to package a small, but non-empty, subset
+ of JARs into the WAR. When making an EAR of skinny WARs, one wants to package
+ all of the JARs into the EAR. Sometimes a list of JARs must be packaged into
+ the WAR though in order for it to work properly, like tag libraries.
+
++-+
+project
+ ...
+ build
+plugins
+ plugin
+artifactIdmaven-war-plugin/artifactId
+version2.1-beta-1/version
+configuration
+ !-- Use this to include a selection of jars that will be included
in the WAR --
+
packagingIncludesWEB-INF/lib/my-tag-library.jar,WEB-INF/web.xml/packagingIncludes
+ archive
+manifest
+ addClasspathtrue/addClasspath
+ classpathPrefixlib//classpathPrefix
+/manifest
+ /archive
svn commit: r745193 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Author: dennisl Date: Tue Feb 17 19:01:13 2009 New Revision: 745193 URL: http://svn.apache.org/viewvc?rev=745193view=rev Log: [MWAR-182] warSourceIncludes no longer works o Improve documentation, as suggested by Bryan Loofbourrow Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=745193r1=745192r2=745193view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt Tue Feb 17 19:01:13 2009 @@ -81,7 +81,7 @@ version2.1-beta-1/version configuration !-- Use this to include a selection of jars that will be included in the WAR -- - packagingIncludesWEB-INF/lib/my-tag-library.jar,WEB-INF/web.xml/packagingIncludes + packagingIncludesWEB-INF/lib/my-tag-library.jar,**/*.xml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,**/*.jsp/packagingIncludes archive manifest addClasspathtrue/addClasspath
svn commit: r745194 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Author: dennisl
Date: Tue Feb 17 19:11:43 2009
New Revision: 745194
URL: http://svn.apache.org/viewvc?rev=745194view=rev
Log:
o Add a link to the user wiki that deals with 'the Skinny Wars problem'.
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=745194r1=745193r2=745194view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Tue Feb 17 19:11:43 2009
@@ -155,3 +155,9 @@
|-- war1-1.0.0.war
`-- war2-1.0.0.war
+-+
+
+
+* Alternatives
+
+ Our users have submitted alternatives to the above recipe on
+
{{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the
Wiki}}.
\ No newline at end of file
svn commit: r745304 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/site/apt/examples/war-manifest-guide.apt
Author: dennisl
Date: Wed Feb 18 00:02:24 2009
New Revision: 745304
URL: http://svn.apache.org/viewvc?rev=745304view=rev
Log:
[MWAR-185] Upgrade to Maven Archiver 2.4
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=745304r1=745303r2=745304view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Feb 18 00:02:24 2009
@@ -34,16 +34,16 @@
nameMaven WAR Plugin/name
descriptionBuilds a Web Application Archive (WAR) file from the project
output and its dependencies./description
-
+
prerequisites
maven2.0.6/maven
/prerequisites
-
+
scm
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url
- /scm
+ /scm
issueManagement
systemJIRA/system
urlhttp://jira.codehaus.org/browse/MWAR/url
@@ -63,7 +63,7 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-archiver/artifactId
- version2.3/version
+ version2.4/version
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
@@ -94,7 +94,7 @@
artifactIdplexus-component-api/artifactId
/exclusion
/exclusions
-/dependency
+/dependency
dependency
groupIdcom.thoughtworks.xstream/groupId
@@ -106,14 +106,14 @@
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version1.5.5/version
-/dependency
-
+/dependency
+
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
- version1.0-beta-2/version
+ version1.0-beta-2/version
/dependency
-
+
dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt?rev=745304r1=745303r2=745304view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
Wed Feb 18 00:02:24 2009
@@ -31,6 +31,7 @@
The manifest can be customized by configuring the war plugin's archiver. For
full information on the different
configuration options available check the documentation for
{{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}}.
+ This version of Maven WAR Plugin uses Maven Archiver 2.4.
++
project
svn commit: r745983 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: dennisl
Date: Thu Feb 19 20:11:58 2009
New Revision: 745983
URL: http://svn.apache.org/viewvc?rev=745983view=rev
Log:
o Put back the list item Deploy the current website that was removed by
mistake
o Fix links to https://repository.apache.org
o Adjust list item numbering
o Fix minor typos
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=745983r1=745982r2=745983view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Thu Feb 19
20:11:58 2009
@@ -112,7 +112,7 @@
https://repository.apache.org/content/groups/snapshots/org/apache/maven/plugins/maven-XXX-plugin/Y.Z-SNAPSHOT/
+-+
- [[4]] Prepare the release
+ [[3]] Prepare the release
+-+
mvn release:clean
@@ -121,7 +121,7 @@
Note: Preparing the release will create the new tag in SVN, automatically
checking in on your behalf.
- [[5]] Stage the release for a vote
+ [[4]] Stage the release for a vote
+-+
mvn release:perform
@@ -129,23 +129,23 @@
The release will automatically be inserted into a temporary staging
repository for you. See the Nexus
{{{http://www.sonatype.com/books/nexus-book/reference/staging.html} staging
documentation}} for full details.
- [[6]] Close the staging repository
+ [[5]] Close the staging repository
- Login to {{{https://repository.apache.org}}} using your Apache credentials.
Click on Staging Repositories. Then click on Maven in the list of profiles.
In the panel below you should see an open repository that is linked to your
username and ip. Right click on this repository and select Finish. This will
close the repository from future deployments and make it available for others
to view. If you are staging multiple releases together, skip this step until
you have staged everything.
+ Login to {{https://repository.apache.org}} using your Apache credentials.
Click on Staging Repositories. Then click on Maven in the list of profiles.
In the panel below you should see an open repository that is linked to your
username and ip. Right click on this repository and select Finish. This will
close the repository from future deployments and make it available for others
to view. If you are staging multiple releases together, skip this step until
you have staged everything.
See the image below for details.
[../../images/Close_Repo.png] Closing the repository
- [[7]] Verify the Staged artifacts
+ [[6]] Verify the Staged artifacts
- Still logged in to {{{https://repository.apache.org}}}, click on Browse
Repositories. Next select the drop down and choose Nexus Managed
Repositories. You will see a list of existing stage repositories. Find yours
and then browse the contents to ensure the artifacts are as you expect them.
Pay particular attention to the existence of .asc (signature) files. If the you
don't like the content of the repository, go back to the Staging Repositories
screen, right click your repository and choose Drop. You can then rollback
your release and repeat the process.
+ Still logged in to {{https://repository.apache.org}}, click on Browse
Repositories. Next select the drop down and choose Nexus Managed
Repositories. You will see a list of existing stage repositories. Find yours
and then browse the contents to ensure the artifacts are as you expect them.
Pay particular attention to the existence of .asc (signature) files. If the you
don't like the content of the repository, go back to the Staging Repositories
screen, right click your repository and choose Drop. You can then rollback
your release and repeat the process.
- Note the repository url, you will need this in your vote email.
+ Note the repository URL, you will need this in your vote email.
[../../images/Validate_Artifacts.png] Validating the artifacts
- [[8]] Stage the latest documentation
+ [[7]] Stage the latest documentation
The plugin parent POM is configured to stage the documentation in a
versioned directory
such as /plugins/maven-XXX-plugin-Y.Z.
@@ -181,7 +181,7 @@
find . -type f -exec chmod 664 {} \;
+--+
- [[9]] Propose a vote on the dev list with the closed issues, the issues left,
+ [[8]] Propose a vote on the dev list with the closed issues, the issues left,
the staging repository and the staging site. For instance:
+-+
@@ -219,7 +219,7 @@
To get the list of issues left in JIRA, browse to the plugin's JIRA page, and
from the Project Summary
on the right, use the link for Open issues.
- [[10]] Check the vote results
+ [[9]] Check the vote results
Copied from {{{http://www.apache.org/foundation/voting.html}Votes on Package
Releases}}.
@@ -253,18 +253,27
svn commit: r746283 - /maven/doxia/site/src/site/site.xml
Author: dennisl Date: Fri Feb 20 16:19:25 2009 New Revision: 746283 URL: http://svn.apache.org/viewvc?rev=746283view=rev Log: o Make the link to the Developer docs for Doxia versioned. Modified: maven/doxia/site/src/site/site.xml Modified: maven/doxia/site/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/src/site/site.xml?rev=746283r1=746282r2=746283view=diff == --- maven/doxia/site/src/site/site.xml (original) +++ maven/doxia/site/src/site/site.xml Fri Feb 20 16:19:25 2009 @@ -57,7 +57,7 @@ /menu menu name=Developer docs - item name=Doxia href=doxia/index.html/ + item name=Doxia 1.0.x href=doxia-1.0.x/index.html/ item name=Doxia Sitetools href=doxia-sitetools/index.html/ item name=Doxia Tools href=doxia-tools/index.html/ /menu
svn commit: r746294 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Fri Feb 20 17:03:46 2009 New Revision: 746294 URL: http://svn.apache.org/viewvc?rev=746294view=rev Log: o Use released version of Doxia. Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=746294r1=746293r2=746294view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Feb 20 17:03:46 2009 @@ -157,7 +157,7 @@ /issueManagement properties -doxiaVersion1.0-SNAPSHOT/doxiaVersion +doxiaVersion1.0/doxiaVersion doxiaSitetoolsVersion1.0-SNAPSHOT/doxiaSitetoolsVersion wagonVersion1.0-beta-4/wagonVersion /properties
svn commit: r746375 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
Author: dennisl
Date: Fri Feb 20 21:46:07 2009
New Revision: 746375
URL: http://svn.apache.org/viewvc?rev=746375view=rev
Log:
o Use released version of Doxia.
o Lock down version of modello-maven-plugin.
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml?rev=746375r1=746374r2=746375view=diff
==
--- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
(original)
+++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml Fri Feb
20 21:46:07 2009
@@ -111,7 +111,7 @@
properties
projectVersion${project.version}/projectVersion
-doxiaVersion1.0-SNAPSHOT/doxiaVersion
+doxiaVersion1.0/doxiaVersion
/properties
dependencyManagement
@@ -195,6 +195,11 @@
/configuration
/plugin
plugin
+ groupIdorg.codehaus.modello/groupId
+ artifactIdmodello-maven-plugin/artifactId
+ version1.0/version
+/plugin
+plugin
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-maven-plugin/artifactId
version1.3.5/version
svn commit: r746381 - /maven/components/branches/maven-2.0.x/pom.xml
Author: dennisl Date: Fri Feb 20 21:56:58 2009 New Revision: 746381 URL: http://svn.apache.org/viewvc?rev=746381view=rev Log: [MNG-4046] Update to Doxia 1.0 Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=746381r1=746380r2=746381view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Fri Feb 20 21:56:58 2009 @@ -376,7 +376,7 @@ dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-sink-api/artifactId -version1.0-alpha-11/version +version1.0/version /dependency !-- Plexus -- dependency
svn commit: r747539 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Tue Feb 24 20:50:03 2009 New Revision: 747539 URL: http://svn.apache.org/viewvc?rev=747539view=rev Log: o Sync versions of Maven core dependencies with the Maven version specified in prerequisites Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=747539r1=747538r2=747539view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Tue Feb 24 20:50:03 2009 @@ -53,22 +53,22 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-model/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-artifact/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r747546 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Tue Feb 24 21:09:22 2009 New Revision: 747546 URL: http://svn.apache.org/viewvc?rev=747546view=rev Log: O Next version will be 2.1. Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=747546r1=747545r2=747546view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Tue Feb 24 21:09:22 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-source-plugin/artifactId - version2.0.5-SNAPSHOT/version + version2.1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Source Plugin/name
svn commit: r747562 - in /maven/plugins/trunk/maven-source-plugin/src: main/java/org/apache/maven/plugin/source/ test/java/org/apache/maven/plugin/source/ test/java/org/apache/maven/plugin/source/stub
Author: dennisl
Date: Tue Feb 24 21:57:09 2009
New Revision: 747562
URL: http://svn.apache.org/viewvc?rev=747562view=rev
Log:
[MSOURCES-39] Add an includePom option to the sources:jar goal
Submitted by: Moritz Havelock
Reviewed by: Dennis Lundberg
o Applied patch with modifications
o Added a test case
Added:
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java
(with props)
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/pom.xml
(with props)
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/java/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/java/foo/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/java/foo/project009/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/java/foo/project009/App.java
(with props)
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/resources/
maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-009/src/main/resources/default-configuration.properties
(with props)
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=747562r1=747561r2=747562view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Tue Feb 24 21:57:09 2009
@@ -74,6 +74,14 @@
protected boolean excludeResources;
/**
+ * Specifies whether or not to include the POM file in the sources-jar.
+ *
+ * @parameter expression=${source.includePom} default-value=false
+ * @since 2.1
+ */
+protected boolean includePom;
+
+/**
* Used for attaching the source jar to the project.
*
* @component
@@ -207,6 +215,18 @@
protected void archiveProjectContent( MavenProject p, Archiver archiver )
throws MojoExecutionException
{
+if ( includePom )
+{
+try
+{
+archiver.addFile( p.getFile(), p.getFile().getName() );
+}
+catch ( ArchiverException e )
+{
+throw new MojoExecutionException( Error adding POM file to
target jar file., e );
+}
+}
+
for ( Iterator i = getSources( p ).iterator(); i.hasNext(); )
{
String s = (String) i.next();
Modified:
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java?rev=747562r1=747561r2=747562view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java
Tue Feb 24 21:57:09 2009
@@ -27,7 +27,6 @@
public class SourceJarMojoTest
extends AbstractSourcePluginTestCase
{
-
protected String getGoal()
{
return jar;
@@ -40,7 +39,6 @@
foo/project001/App.java, foo/project001/, foo/,
META-INF/MANIFEST.MF, META-INF/} );
}
-
public void testExcludes()
throws Exception
{
@@ -50,7 +48,6 @@
} );
}
-
public void testNoSources()
throws Exception
{
@@ -70,5 +67,10 @@
} );
}
-
+public void testIncludePom()
+throws Exception
+{
+doTestProjectWithSourceArchive( project-009, new
String[]{default-configuration.properties, pom.xml,
+foo/project009/App.java, foo/project009/, foo/,
META-INF/MANIFEST.MF, META-INF/} );
+}
}
Added:
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java
URL:
http://svn.apache.org/viewvc/maven
svn commit: r747570 - /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Author: dennisl
Date: Tue Feb 24 22:05:10 2009
New Revision: 747570
URL: http://svn.apache.org/viewvc?rev=747570view=rev
Log:
[MSOURCES-34] Allow the artifact type to be changed
Submitted by: Marvin Froeder
Reviewed by: Dennis Lundberg
o The patch didn't apply anymore, but the changes were easy to make by hand
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=747570r1=747569r2=747570view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Tue Feb 24 22:05:10 2009
@@ -143,14 +143,14 @@
* @return the compile or test sources
*/
protected abstract List getSources( MavenProject p )
- throws MojoExecutionException;
+throws MojoExecutionException;
/**
* @param p not null
* @return the compile or test resources
*/
protected abstract List getResources( MavenProject p )
- throws MojoExecutionException;
+throws MojoExecutionException;
protected void packageSources( MavenProject p )
throws MojoExecutionException
@@ -187,7 +187,7 @@
archiveProjectContent( subProject, archiver );
}
-File outputFile = new File( outputDirectory, finalName + - +
getClassifier() + .jar );
+File outputFile = new File( outputDirectory, finalName + - +
getClassifier() + getExtension() );
try
{
archiver.setDestFile( outputFile );
@@ -204,7 +204,7 @@
if ( attach )
{
-projectHelper.attachArtifact( project, java-source,
getClassifier(), outputFile );
+projectHelper.attachArtifact( project, getType(), getClassifier(),
outputFile );
}
else
{
@@ -343,6 +343,11 @@
}
}
+protected String getExtension()
+{
+return .jar;
+}
+
protected MavenProject getProject( MavenProject p )
{
if ( p.getExecutionProject() != null )
@@ -352,4 +357,9 @@
return p;
}
+
+protected String getType()
+{
+return java-source;
+}
}
svn commit: r747942 - /maven/plugins/trunk/maven-ejb-plugin/
Author: dennisl Date: Wed Feb 25 22:25:07 2009 New Revision: 747942 URL: http://svn.apache.org/viewvc?rev=747942view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-ejb-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:logregex = MEJB-\d+ Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747944 - /maven/plugins/trunk/maven-site-plugin/
Author: dennisl Date: Wed Feb 25 22:30:10 2009 New Revision: 747944 URL: http://svn.apache.org/viewvc?rev=747944view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-site-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:logregex = MSITE-\d+ Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747945 - /maven/plugins/trunk/maven-war-plugin/
Author: dennisl Date: Wed Feb 25 22:31:52 2009 New Revision: 747945 URL: http://svn.apache.org/viewvc?rev=747945view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-war-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:logregex = MWAR-\d+ Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747948 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: dennisl Date: Wed Feb 25 22:56:32 2009 New Revision: 747948 URL: http://svn.apache.org/viewvc?rev=747948view=rev Log: o Sync versions of Maven core dependencies with the Maven version specified in prerequisites Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=747948r1=747947r2=747948view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Feb 25 22:56:32 2009 @@ -53,12 +53,12 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0/version + version2.0.4/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0/version + version2.0.4/version /dependency dependency groupIdorg.apache.maven/groupId
svn commit: r747950 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: dennisl Date: Wed Feb 25 23:02:41 2009 New Revision: 747950 URL: http://svn.apache.org/viewvc?rev=747950view=rev Log: [MEJB-35] Upgrade to Maven Archiver 2.4 Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=747950r1=747949r2=747950view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Feb 25 23:02:41 2009 @@ -63,7 +63,13 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId - version2.2/version + version2.4/version + exclusions +exclusion + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-component-api/artifactId +/exclusion + /exclusions /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r747953 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl Date: Wed Feb 25 23:05:08 2009 New Revision: 747953 URL: http://svn.apache.org/viewvc?rev=747953view=rev Log: [MEJB-35] Upgrade to Maven Archiver 2.4 Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java 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=747953r1=747952r2=747953view=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 Wed Feb 25 23:05:08 2009 @@ -176,7 +176,7 @@ /** * The archive configuration to use. * See a href=http://maven.apache.org/shared/maven-archiver/index.html;Maven Archiver Reference/a. - * This version of the EJB Plugin uses Maven Archiver 2.2. + * This version of the EJB Plugin uses Maven Archiver 2.4. * * @parameter */
svn commit: r747966 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: dennisl
Date: Wed Feb 25 23:32:52 2009
New Revision: 747966
URL: http://svn.apache.org/viewvc?rev=747966view=rev
Log:
[MEJB-32] Add set classifier to client classifier
Submitted by: David Siefert
Reviewed by: Dennis Lundberg
o Patch applied with modifications (code style)
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
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=747966r1=747965r2=747966view=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
Wed Feb 25 23:32:52 2009
@@ -260,7 +260,13 @@
if ( generateClient )
{
-getLog().info( Building EJB client + jarName + -client );
+String clientJarName = jarName;
+if ( classifier != null )
+{
+clientJarName += - + classifier;
+}
+
+getLog().info( Building EJB client + clientJarName + -client
);
String[] excludes = DEFAULT_EXCLUDES;
String[] includes = DEFAULT_INCLUDES;
@@ -275,7 +281,7 @@
excludes = (String[]) clientExcludes.toArray(
EMPTY_STRING_ARRAY );
}
-File clientJarFile = new File( basedir, jarName + -client.jar );
+File clientJarFile = new File( basedir, clientJarName +
-client.jar );
MavenArchiver clientArchiver = new MavenArchiver();
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=747966r1=747965r2=747966view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Wed Feb 25 23:32:52 2009
@@ -530,20 +530,22 @@
protected void assertJarCreation( final MavenProject project, boolean
ejbJarCreated, boolean ejbClientJarCreated,
- String classifer )
+ String classifier )
{
String checkedJarFile;
-if ( classifer == null )
+String checkedClientJarFile;
+
+if ( classifier == null )
{
checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + .jar;
+checkedClientJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + -client.jar;
}
else
{
-checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifer + .jar;
+checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifier + .jar;
+checkedClientJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifier + -client.jar;
}
-final String checkedClientJarFile = project.getBuild().getDirectory()
+ / + DEFAULT_JAR_NAME + -client.jar;
-
assertEquals( Invalid value for ejb-jar creation, ejbJarCreated,
FileUtils.fileExists( checkedJarFile ) );
assertEquals( Invalid value for ejb-jar client creation,
ejbClientJarCreated,
FileUtils.fileExists( checkedClientJarFile ) );
svn commit: r747974 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: dennisl
Date: Thu Feb 26 00:13:18 2009
New Revision: 747974
URL: http://svn.apache.org/viewvc?rev=747974view=rev
Log:
[MEJB-13] Add support for configuring exclusion filter for main ejb jar
Submitted by: Fredrik Vraalsen
Reviewed by: Dennis Lundberg
o The patch was old and couldn't be applied to trunk, so I made the changes
manually
o Add a test case
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
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=747974r1=747973r2=747974view=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
Thu Feb 26 00:13:18 2009
@@ -45,16 +45,18 @@
public class EjbMojo
extends AbstractMojo
{
+private static final String EJB_JAR_XML = META-INF/ejb-jar.xml;
+
// TODO: will null work instead?
private static final String[] DEFAULT_INCLUDES = new String[]{**/**};
-private static final String[] DEFAULT_EXCLUDES =
+private static final String[] DEFAULT_EXCLUDES = new String[]{EJB_JAR_XML,
**/package.html};
+
+private static final String[] DEFAULT_CLIENT_EXCLUDES =
new String[]{**/*Bean.class, **/*CMP.class, **/*Session.class,
**/package.html};
private static final String[] EMPTY_STRING_ARRAY = new String[0];
-private static final String EJB_JAR_XML = META-INF/ejb-jar.xml;
-
/**
* The directory for the generated EJB.
*
@@ -128,6 +130,20 @@
private List clientIncludes;
/**
+ * The files and directories to exclude from the main EJB jar. Usage:
+ *
+ * pre
+ * lt;excludesgt;
+ * lt;excludegt;**#47;*Ejb.classlt;#47;excludegt;
+ * lt;excludegt;**#47;*Bean.classlt;#47;excludegt;
+ * lt;#47;excludesgt;
+ * /pre
+ * br/Default exclusions: META-INF#47;ejb-jar.xml, **#47;package.html
+ * @parameter
+ */
+private List excludes;
+
+/**
* The Maven project.
*
* @parameter expression=${project}
@@ -220,8 +236,13 @@
try
{
-archiver.getArchiver().addDirectory( new File( outputDirectory ),
DEFAULT_INCLUDES,
- new String[]{EJB_JAR_XML,
**/package.html} );
+String[] mainJarExcludes = DEFAULT_EXCLUDES;
+
+if ( excludes != null !excludes.isEmpty() ) {
+mainJarExcludes = (String[]) excludes.toArray(
EMPTY_STRING_ARRAY );
+}
+
+archiver.getArchiver().addDirectory( new File( outputDirectory ),
DEFAULT_INCLUDES, mainJarExcludes );
if ( deploymentDescriptor.exists() )
{
@@ -268,7 +289,7 @@
getLog().info( Building EJB client + clientJarName + -client
);
-String[] excludes = DEFAULT_EXCLUDES;
+String[] excludes = DEFAULT_CLIENT_EXCLUDES;
String[] includes = DEFAULT_INCLUDES;
if ( clientIncludes != null !clientIncludes.isEmpty() )
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=747974r1=747973r2=747974view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Thu Feb 26 00:13:18 2009
@@ -239,7 +239,7 @@
inclusions.add( **/*Include.class );
final MavenProjectResourcesStub project = createTestProject(
client-includes );
-final EjbMojo mojo = lookupMojoWithSettings( project, inclusions, new
LinkedList() );
+final EjbMojo mojo = lookupMojoWithSettings( project, inclusions, new
LinkedList(), null );
// put this on the target output dir
project.addFile( META-INF/ejb-jar.xml,
MavenProjectResourcesStub.OUTPUT_FILE );
@@ -277,7 +277,7 @@
exclusions.add( **/*Exclude.class );
final MavenProjectResourcesStub project = createTestProject(
client-excludes );
-final EjbMojo mojo = lookupMojoWithSettings( project, new
LinkedList(), exclusions );
+final EjbMojo mojo = lookupMojoWithSettings( project, new
LinkedList(), exclusions, null );
// put this on the target output dir
project.addFile( META-INF
svn commit: r749011 - /maven/doxia/site/src/site/site.xml
Author: dennisl Date: Sun Mar 1 12:22:53 2009 New Revision: 749011 URL: http://svn.apache.org/viewvc?rev=749011view=rev Log: o Make the link to the Developer docs for Doxia Sitetools versioned. Modified: maven/doxia/site/src/site/site.xml Modified: maven/doxia/site/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/src/site/site.xml?rev=749011r1=749010r2=749011view=diff == --- maven/doxia/site/src/site/site.xml (original) +++ maven/doxia/site/src/site/site.xml Sun Mar 1 12:22:53 2009 @@ -58,7 +58,7 @@ menu name=Developer docs item name=Doxia 1.0.x href=doxia-1.0.x/index.html/ - item name=Doxia Sitetools href=doxia-sitetools/index.html/ + item name=Doxia Sitetools 1.0.x href=doxia-sitetools-1.0.x/index.html/ item name=Doxia Tools href=doxia-tools/index.html/ /menu
svn commit: r749022 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 12:57:45 2009 New Revision: 749022 URL: http://svn.apache.org/viewvc?rev=749022view=rev Log: [MSHARED-90] Upgrade to Doxia Sitetools 1.0 Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749022r1=749021r2=749022view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 12:57:45 2009 @@ -51,7 +51,7 @@ /issueManagement properties -doxiaSitetoolsVersion1.0-SNAPSHOT/doxiaSitetoolsVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion mavenVersion2.0.6/mavenVersion /properties
svn commit: r749028 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 13:07:39 2009 New Revision: 749028 URL: http://svn.apache.org/viewvc?rev=749028view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749028r1=749027r2=749028view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 13:07:39 2009 @@ -30,7 +30,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.2/version + version1.0.3-SNAPSHOT/version nameMaven Doxia Integration Tools/name descriptionA collection of tools to help the integration of Doxia in Maven plugins./description @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-doxia-tools-1.0.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools//url /scm issueManagement
svn commit: r749026 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 13:06:48 2009 New Revision: 749026 URL: http://svn.apache.org/viewvc?rev=749026view=rev Log: [maven-release-plugin] prepare release maven-doxia-tools-1.0.2 Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749026r1=749025r2=749026view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 13:06:48 2009 @@ -30,7 +30,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.2-SNAPSHOT/version + version1.0.2/version nameMaven Doxia Integration Tools/name descriptionA collection of tools to help the integration of Doxia in Maven plugins./description @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-doxia-tools-1.0.2/url /scm issueManagement
svn commit: r749024 - /maven/shared/trunk/
Author: dennisl Date: Sun Mar 1 13:00:54 2009 New Revision: 749024 URL: http://svn.apache.org/viewvc?rev=749024view=rev Log: o Add SVN properties for bugtraq Modified: maven/shared/trunk/ (props changed) Propchange: maven/shared/trunk/ -- bugtraq:logregex = MSHARED-\d+ Propchange: maven/shared/trunk/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/shared/trunk/ -- bugtraq:warnifnoissue = false
svn commit: r749027 - in /maven/shared/tags/maven-doxia-tools-1.0.2: ./ pom.xml
Author: dennisl Date: Sun Mar 1 13:07:19 2009 New Revision: 749027 URL: http://svn.apache.org/viewvc?rev=749027view=rev Log: [maven-release-plugin] copy for tag maven-doxia-tools-1.0.2 Added: maven/shared/tags/maven-doxia-tools-1.0.2/ - copied from r749023, maven/shared/trunk/maven-doxia-tools/ maven/shared/tags/maven-doxia-tools-1.0.2/pom.xml - copied unchanged from r749026, maven/shared/trunk/maven-doxia-tools/pom.xml
svn commit: r749035 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sun Mar 1 14:06:04 2009 New Revision: 749035 URL: http://svn.apache.org/viewvc?rev=749035view=rev Log: [MSITE-101] schedule and release doxia 1.0 o Update to released version of Doxia Sitetools Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=749035r1=749034r2=749035view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 1 14:06:04 2009 @@ -158,7 +158,7 @@ properties doxiaVersion1.0/doxiaVersion -doxiaSitetoolsVersion1.0-SNAPSHOT/doxiaSitetoolsVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion wagonVersion1.0-beta-4/wagonVersion /properties
svn commit: r749038 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl
Date: Sun Mar 1 14:19:11 2009
New Revision: 749038
URL: http://svn.apache.org/viewvc?rev=749038view=rev
Log:
o Add a mavenVersion property to hold the version for Maven core dependencies
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=749038r1=749037r2=749038view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 1 14:19:11 2009
@@ -159,6 +159,7 @@
properties
doxiaVersion1.0/doxiaVersion
doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion
+mavenVersion2.0.6/mavenVersion
wagonVersion1.0-beta-4/wagonVersion
/properties
@@ -167,37 +168,37 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact-manager/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
!-- Doxia --
svn commit: r749053 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Author: dennisl
Date: Sun Mar 1 16:23:33 2009
New Revision: 749053
URL: http://svn.apache.org/viewvc?rev=749053view=rev
Log:
[MSITE-320] Reference documentation
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=749053r1=749052r2=749053view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Sun Mar 1 16:23:33 2009
@@ -40,6 +40,12 @@
navigation.xml file has been replaced by the site descriptor in Maven
2.
The format is nearly the same, so you can probably reuse most of your old
file.
+ There is also an
+
{{{http://maven.apache.org/doxia/doxia-sitetools-1.0.x/doxia-decoration-model/decoration.html}XML
Schema Reference for the site descriptor}}
+ available.
+
+ The XML Schema for the site descriptor is published at
{{http://maven.apache.org/xsd/decoration-1.0.0.xsd}}.
+
* Title
The title of each generated page will be a combination of the site title
svn commit: r750141 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Wed Mar 4 20:27:45 2009
New Revision: 750141
URL: http://svn.apache.org/viewvc?rev=750141view=rev
Log:
o Release maven-doxia-tools 1.0.2.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=750141r1=750140r2=750141view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Wed Mar 4 20:27:45 2009
@@ -3,7 +3,7 @@
-
Dennis Lundberg
-
- 2009-01-05
+ 2009-03-04
-
Shared Components
@@ -20,7 +20,7 @@
*+--+---+++
| {{{/shared/maven-dependency-tree/} maven-dependency-tree}} |
1.2 | 2008-09-02| Maven Dependency Tree constructs a tree
model of a Maven project's dependencies. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}}
*+--+---+++
-| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| 2008-06-14| Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
+| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.2| 2009-03-04| Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+---+++
| {{{/shared/maven-filtering/} maven-filtering}} |
1.0-beta-1 | 2008-08-06| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
*+--+---+++
svn commit: r750150 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Wed Mar 4 20:45:20 2009 New Revision: 750150 URL: http://svn.apache.org/viewvc?rev=750150view=rev Log: [MSITE-388] Update to maven-doxia-tools 1.0.2 Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=750150r1=750149r2=750150view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Wed Mar 4 20:45:20 2009 @@ -248,7 +248,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.2-SNAPSHOT/version + version1.0.2/version /dependency !-- Wagon --
svn commit: r750186 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Author: dennisl
Date: Wed Mar 4 22:04:11 2009
New Revision: 750186
URL: http://svn.apache.org/viewvc?rev=750186view=rev
Log:
o Fix IT because of r738305.
o Improve error messages.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=750186r1=750185r2=750186view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Wed Mar
4 22:04:11 2009
@@ -27,50 +27,52 @@
File target = new File( basedir, target );
if ( !target.exists() || !target.isDirectory() )
{
-System.err.println( Target file is missing or not a directory. );
+System.err.println( Target directory ' + target + ' is missing or
not a directory. );
return false;
}
File stagingDirectory = new File ( target, staging );
if ( !stagingDirectory.exists() || !stagingDirectory.isDirectory() )
{
-System.err.println( Staging directory is missing or not a directory.
);
+System.err.println( Staging directory ' + stagingDirectory + ' is
missing or not a directory. );
return false;
}
-File parentDirectory = new File ( stagingDirectory,
localhost/tmp/www.example.com/parent );
+String tmpDir = System.getProperty( java.io.tmpdir );
+String strippedTmpDir = tmpDir.replaceAll( [\\:\\?\\*], );
+
+File parentDirectory = new File ( stagingDirectory, localhost/ +
strippedTmpDir + /www.example.com/parent );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
-System.err.println( Staging directory for parent is missing or not a
directory. );
+System.err.println( Staging directory for parent ' + parentDirectory
+ ' is missing or not a directory. );
return false;
}
-File childDirectory = new File ( stagingDirectory,
localhost/tmp/www.example.com/parent/child );
+File childDirectory = new File ( stagingDirectory, localhost/ +
strippedTmpDir + /www.example.com/parent/child );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
-System.err.println( Staging directory for child is missing or not a
directory. );
+System.err.println( Staging directory for child ' + childDirectory +
' is missing or not a directory. );
return false;
}
-String tmpDir = System.getProperty( java.io.tmpdir );
File stageDeployDirectory = new File ( tmpDir + /www.example.com/parent
);
if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory()
)
{
-System.err.println( Stage deploy directory is missing or not a
directory. );
+System.err.println( Stage deploy directory ' + stageDeployDirectory
+ ' is missing or not a directory. );
return false;
}
File validChildStageDeployDirectory = new File ( stageDeployDirectory,
staging/child );
if ( !validChildStageDeployDirectory.exists() ||
!validChildStageDeployDirectory.isDirectory() )
{
-System.err.println( Valid stage deploy directory for child is missing
or not a directory. );
+System.err.println( Valid stage deploy directory for child ' +
validChildStageDeployDirectory + ' is missing or not a directory. );
return false;
}
File invalidChildStageDeployDirectory = new File ( stageDeployDirectory,
child/staging );
if ( invalidChildStageDeployDirectory.exists()
invalidChildStageDeployDirectory.isDirectory() )
{
-System.err.println( Invalid stage deploy directory for child is
present. );
+System.err.println( Invalid stage deploy directory for child ' +
invalidChildStageDeployDirectory + ' is present. );
return false;
}
}
svn commit: r750197 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: dennisl Date: Wed Mar 4 22:34:38 2009 New Revision: 750197 URL: http://svn.apache.org/viewvc?rev=750197view=rev Log: [MEJB-35] Upgrade to Maven Archiver 2.4 o Maven Archiver 2.4 requires a newer version of plexus-utils. Add plexus-utils as a direct dependency and bump Maven prerequisite and dependencies to 2.0.6 to be able to use it. o This should fix the CI errors on Ubuntu. Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=750197r1=750196r2=750197view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Mar 4 22:34:38 2009 @@ -36,7 +36,7 @@ descriptionGenerates a J2EE Enterprise JavaBean (EJB) file as well as the associated client JAR./description prerequisites -maven2.0.4/maven +maven2.0.6/maven /prerequisites scm @@ -53,12 +53,12 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0.4/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0.4/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId @@ -72,6 +72,11 @@ /exclusions /dependency dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId + version1.5.8/version +/dependency +dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-plugin-testing-harness/artifactId version1.1/version
svn commit: r750206 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl
Date: Wed Mar 4 22:42:24 2009
New Revision: 750206
URL: http://svn.apache.org/viewvc?rev=750206view=rev
Log:
[MEJB-32] Add set classifier to client classifier
o Make sure the classifier is applied to the attached client
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
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=750206r1=750205r2=750206view=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
Wed Mar 4 22:42:24 2009
@@ -340,7 +340,14 @@
}
// TODO: shouldn't need classifer
-projectHelper.attachArtifact( project, ejb-client, client,
clientJarFile );
+if ( classifier != null )
+{
+projectHelper.attachArtifact( project, ejb-client,
classifier + -client, clientJarFile );
+}
+else
+{
+projectHelper.attachArtifact( project, ejb-client, client,
clientJarFile );
+}
}
}
svn commit: r751418 - in /maven/plugins/trunk/maven-site-plugin/src: main/java/org/apache/maven/plugins/site/ site/apt/
Author: dennisl Date: Sun Mar 8 13:27:17 2009 New Revision: 751418 URL: http://svn.apache.org/viewvc?rev=751418view=rev Log: o Sync and improve the documentation of goals. Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=751418r1=751417r2=751418view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Sun Mar 8 13:27:17 2009 @@ -59,7 +59,7 @@ /** * Deploys the generated site using codescp/code or codefile/code - * protocol to the site specified in the + * protocol to the site URL specified in the * codelt;distributionManagementgt;/code section of the POM. * p * For codescp/code protocol, the website files are packaged into zip archive, Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=751418r1=751417r2=751418view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Sun Mar 8 13:27:17 2009 @@ -39,7 +39,7 @@ import java.util.Map; /** - * Adds the site descriptor to the list of files to be installed/deployed. + * Adds the site descriptor (codesite.xml/code) to the list of files to be installed/deployed. * * @author a href=mailto:br...@apache.org;Brett Porter/a * @version $Id$ Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java?rev=751418r1=751417r2=751418view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java Sun Mar 8 13:27:17 2009 @@ -29,7 +29,7 @@ import java.io.IOException; /** - * Bundles the site output into a jar so that it can be deployed to a repository. + * Bundles the site output into a JAR so that it can be deployed to a repository. * * @author a href=mailto:mbeer...@yahoo.com;Matthew Beermann/a * @version $Id$ Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=751418r1=751417r2=751418view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Sun Mar 8 13:27:17 2009 @@ -45,9 +45,9 @@ import java.util.List; /** - * Deploys the generated site to a staging or mock directory on the site + * Deploys the generated site to a staging or mock directory to the site URL * specified in the codelt;distributionManagementgt;/code section of the - * POM. It also supports codescp/code and codefile/code protocols for + * POM. It supports codescp/code and codefile/code protocols for * deployment. * * @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site
svn commit: r751423 - in /maven/plugins/trunk/maven-site-plugin/src/site: ./ apt/ apt/examples/ fml/ xdoc/
Author: dennisl
Date: Sun Mar 8 13:54:54 2009
New Revision: 751423
URL: http://svn.apache.org/viewvc?rev=751423view=rev
Log:
o Improve the documentation.
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creatingskins.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/moduleexcludes.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/site-deploy-to-sourceforge.net.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/templatefile.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-site-plugin/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt?rev=751423r1=751422r2=751423view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt
Sun Mar 8 13:54:54 2009
@@ -3,7 +3,7 @@
--
Dennis Lundberg
--
- 2008-03-23
+ 2009-03-08
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,7 @@
current state of the project. These reports take the form of plugins, just
like those used to build the project.
- There are many standard reports that are available by gleaning information
+ There are many standard reports that are available by extracting information
from the POM. Currently these are provided by default:
* Continous Integration
@@ -52,10 +52,10 @@
[]
- To find out more please refer to the
+ To find out more please see to the
{{{http://maven.apache.org/plugins/maven-project-info-reports-plugin/}Project
Info Reports Plugin}}.
- To add these reports to your site, you must add the plugin to a special
+ To add these reports to your site, you must add the plugin to the
\reporting\ element in the POM. The following example shows how to
configure the standard Project Info Reports that display information from the
POM in a friendly format:
@@ -68,7 +68,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-project-info-reports-plugin/artifactId
-version2.0.1/version
+version2.1.1/version
/plugin
/plugins
/reporting
@@ -78,7 +78,7 @@
If you have included the appropriate \menu ref=reports/\ tag in
your
{{{sitedescriptor.html}site descriptor}}, then when you regenerate the site
- those items will appear in the menu.
+ those items will appear in a menu called Project Reports.
Note: Many report plugins provide a parameter called
outputDirectory
or similar to specify the destination for their report outputs. This
parameter
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt?rev=751423r1=751422r2=751423view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt
Sun Mar 8 13:54:54 2009
@@ -3,7 +3,7 @@
--
Dennis Lundberg
--
- 2008-03-23
+ 2009-03-08
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
Creating Content
Now it's time to create some content for your site. In Maven 2, the site
- content is separated by format, as there are several formats supported.
+ content is structured by format, as there are several formats supported.
Here's an example of a directory structure for a site:
@@ -40,19 +40,19 @@
+- apt/
| +- index.apt
|
- +- xdoc/
- | +- other.xml
- |
+- fml/
| +- general.fml
| +- faq.fml
|
+ +- xdoc/
+ | +- other.xml
+ |
+- site.xml
You notice the $\{basedir\}/src/site directory which contains a site
descriptor along with various directories corresponding to the supported
- document formatss. Let's take a look at examples of the various document
+ document
svn commit: r751425 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sun Mar 8 13:59:20 2009 New Revision: 751425 URL: http://svn.apache.org/viewvc?rev=751425view=rev Log: [maven-release-plugin] prepare release maven-site-plugin-2.0 Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=751425r1=751424r2=751425view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 8 13:59:20 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-site-plugin/artifactId - version2.0-SNAPSHOT/version + version2.0/version packagingmaven-plugin/packaging nameMaven Site Plugin/name @@ -147,9 +147,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.0/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-site-plugin-2.0/url /scm issueManagement systemJIRA/system
svn commit: r751426 - in /maven/plugins/tags/maven-site-plugin-2.0: ./ src/main/java/org/apache/maven/plugins/site/ src/site/ src/site/apt/ src/site/apt/examples/ src/site/fml/ src/site/xdoc/
Author: dennisl Date: Sun Mar 8 14:00:04 2009 New Revision: 751426 URL: http://svn.apache.org/viewvc?rev=751426view=rev Log: [maven-release-plugin] copy for tag maven-site-plugin-2.0 Added: maven/plugins/tags/maven-site-plugin-2.0/ - copied from r751392, maven/plugins/trunk/maven-site-plugin/ maven/plugins/tags/maven-site-plugin-2.0/pom.xml - copied unchanged from r751425, maven/plugins/trunk/maven-site-plugin/pom.xml maven/plugins/tags/maven-site-plugin-2.0/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java - copied unchanged from r751418, maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java maven/plugins/tags/maven-site-plugin-2.0/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java - copied unchanged from r751418, maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java maven/plugins/tags/maven-site-plugin-2.0/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java - copied unchanged from r751418, maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java maven/plugins/tags/maven-site-plugin-2.0/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java - copied unchanged from r751418, maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java maven/plugins/tags/maven-site-plugin-2.0/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java - copied unchanged from r751418, maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/configuring-reports.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/configuring-reports.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/creating-content.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/creatingskins.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creatingskins.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/moduleexcludes.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/moduleexcludes.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/site-deploy-to-sourceforge.net.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/site-deploy-to-sourceforge.net.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/sitedescriptor.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/siterun.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/examples/templatefile.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/templatefile.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/index.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/apt/usage.apt - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt maven/plugins/tags/maven-site-plugin-2.0/src/site/fml/faq.fml - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml maven/plugins/tags/maven-site-plugin-2.0/src/site/site.xml - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/site.xml maven/plugins/tags/maven-site-plugin-2.0/src/site/xdoc/i18n.xml - copied unchanged from r751423, maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml
svn commit: r751427 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sun Mar 8 14:00:47 2009 New Revision: 751427 URL: http://svn.apache.org/viewvc?rev=751427view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=751427r1=751426r2=751427view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 8 14:00:47 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-site-plugin/artifactId - version2.0/version + version2.0.1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Site Plugin/name @@ -147,9 +147,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.0/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-site-plugin-2.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin//url /scm issueManagement systemJIRA/system
svn commit: r751466 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/WarExplodedMojo.java main/java/org/apache/maven/plugin/war/WarManifestMojo.java main/java/org/
Author: dennisl
Date: Sun Mar 8 16:34:06 2009
New Revision: 751466
URL: http://svn.apache.org/viewvc?rev=751466view=rev
Log:
o Sync and improve the documentation of goals.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java?rev=751466r1=751465r2=751466view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
Sun Mar 8 16:34:06 2009
@@ -23,7 +23,7 @@
import org.apache.maven.plugin.MojoFailureException;
/**
- * Generate the exploded webapp.
+ * Create an exploded webapp in a specified directory.
*
* @goal exploded
* @phase package
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java?rev=751466r1=751465r2=751466view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
Sun Mar 8 16:34:06 2009
@@ -33,7 +33,8 @@
import java.io.PrintWriter;
/**
- * Generate a manifest for this WAR.
+ * Generate a manifest for this webapp. The manifest file is created in the
+ * codewarSourceDirectory/code.
*
* @author Mike Perham
* @version $Id$
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=751466r1=751465r2=751466view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Sun Mar 8 16:34:06 2009
@@ -36,7 +36,7 @@
import java.util.Arrays;
/**
- * Build a war/webapp.
+ * Build a WAR file.
*
* @author a href=eveni...@apache.orgEmmanuel Venisse/a
* @version $Id$
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt?rev=751466r1=751465r2=751466view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt Sun Mar 8
16:34:06 2009
@@ -3,9 +3,9 @@
--
Pete Marvin King
--
- 2008-08-03
+ 2009-03-08
--
-
+
~~ 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
@@ -28,19 +28,23 @@
Maven WAR Plugin
- The war plugin is responsible for collecting all artifact dependencies,
classes
+ The WAR Plugin is responsible for collecting all artifact dependencies,
classes
and resources of the web application and packaging them into a web
application archive.
-
+
* Goals Overview
- * {{{war-mojo.html}war:war}} is the default goal invoked during the package
phase for projects with a package type of war.
-
+ * {{{war-mojo.html}war:war}} is the default goal invoked during the
package phase for projects with a packaging
+ type of war. It builds a WAR file.
+
* {{{exploded-mojo.html}war:exploded}} is generally used to speed up testing
during the developement phase by creating
- an exploded war in a specified directory.
-
- * {{{inplace-mojo.html}war:inplace}} another variation of the war:explode
where the war is instead generated in the web source directory
- which is src/main/webapp by default.
-
+ an exploded webapp in a specified directory.
+
+ * {{{inplace-mojo.html}war:inplace}} another variation of war:explode
where the webapp is instead generated in the
+ web source directory, which is src/main/webapp by default.
+
+ * {{{manifest-mojo.html}war:manifest}} generates a manifest for this webapp
svn commit: r751806 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: AbstractWarMojo.java packaging/ClassesPackagingTask.java
Author: dennisl
Date: Mon Mar 9 19:44:08 2009
New Revision: 751806
URL: http://svn.apache.org/viewvc?rev=751806view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
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=751806r1=751805r2=751806view=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
Mon Mar 9 19:44:08 2009
@@ -440,8 +440,8 @@
mavenResourcesExecution.setEscapeString( escapeString );
defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers(
project, filters,
-
escapedBackslashesInFilePath,
-
this.session, mavenResourcesExecution );
+
escapedBackslashesInFilePath,
+
this.session, mavenResourcesExecution );
}
catch ( MavenFilteringException e )
@@ -454,7 +454,7 @@
defaultFilterWrappers,
getNonFilteredFileExtensions(),
filteringDeploymentDescriptors,
-
this.artifactFactory);
+
this.artifactFactory );
final Iterator it = packagingTasks.iterator();
while ( it.hasNext() )
{
@@ -671,7 +671,8 @@
return filteringDeploymentDescriptors;
}
-public ArtifactFactory getArtifactFactory() {
+public ArtifactFactory getArtifactFactory()
+{
return this.artifactFactory;
}
@@ -868,11 +869,13 @@
this.nonFilteredFileExtensions = nonFilteredFileExtensions;
}
-public ArtifactFactory getArtifactFactory() {
+public ArtifactFactory getArtifactFactory()
+{
return this.artifactFactory;
}
-public void setArtifactFactory(ArtifactFactory artifactFactory) {
+public void setArtifactFactory( ArtifactFactory artifactFactory )
+{
this.artifactFactory = artifactFactory;
}
}
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java?rev=751806r1=751805r2=751806view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
Mon Mar 9 19:44:08 2009
@@ -93,8 +93,8 @@
catch ( InterpolationException e )
{
throw new MojoExecutionException(
-Could not get the final name of the artifact[ +
artifact.getGroupId() + : +
-artifact.getArtifactId() + : + artifact.getVersion() +
], e );
+Could not get the final name of the artifact[ +
artifact.getGroupId() + : + artifact.getArtifactId()
++ : + artifact.getVersion() + ], e );
}
final String targetFilename = LIB_PATH + archiveName;
svn commit: r751809 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Mon Mar 9 19:49:17 2009
New Revision: 751809
URL: http://svn.apache.org/viewvc?rev=751809view=rev
Log:
o Add the release of maven-filtering 1.0-beta-2.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=751809r1=751808r2=751809view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Mon Mar 9 19:49:17 2009
@@ -3,7 +3,7 @@
-
Dennis Lundberg
-
- 2009-03-04
+ 2009-03-09
-
Shared Components
@@ -22,7 +22,7 @@
*+--+---+++
| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.2| 2009-03-04| Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+---+++
-| {{{/shared/maven-filtering/} maven-filtering}} |
1.0-beta-1 | 2008-08-06| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
+| {{{/shared/maven-filtering/} maven-filtering}} |
1.0-beta-2 | 2008-10-08| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
*+--+---+++
| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.10 | 2008-08-27| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
*+--+---+++
svn commit: r751815 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl
Date: Mon Mar 9 19:54:57 2009
New Revision: 751815
URL: http://svn.apache.org/viewvc?rev=751815view=rev
Log:
o Use a property to define Maven core dependencies.
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=751815r1=751814r2=751815view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Mar 9 19:54:57 2009
@@ -49,16 +49,20 @@
urlhttp://jira.codehaus.org/browse/MWAR/url
/issueManagement
+ properties
+mavenVersion2.0.6/mavenVersion
+ /properties
+
dependencies
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
svn commit: r752476 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Wed Mar 11 15:36:58 2009
New Revision: 752476
URL: http://svn.apache.org/viewvc?rev=752476view=rev
Log:
o Release maven-site-plugin 2.0.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=752476r1=752475r2=752476view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Mar 11 15:36:58 2009
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-
- 2009-03-03
+ 2009-03-11
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -62,7 +62,7 @@
*---+--++--+++
| {{{/plugins/maven-resources-plugin/} resources}}| 2.3 |
2008-10-17 | Copy the resources to the output directory for including in the
JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRESOURCES}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-site-plugin/} site}} | 2.0-beta-7 |
2008-07-02 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
+| {{{/plugins/maven-site-plugin/} site}} | 2.0 |
2009-03-11 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*---+--++--+++
| {{{/plugins/maven-surefire-plugin/} surefire}} | 2.4.3|
2008-05-14 | Run the Junit tests in an isolated classloader. |
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*---+--++--+++
svn commit: r753047 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Thu Mar 12 22:58:11 2009 New Revision: 753047 URL: http://svn.apache.org/viewvc?rev=753047view=rev Log: [maven-release-plugin] prepare release maven-war-plugin-2.1-beta-1 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=753047r1=753046r2=753047view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu Mar 12 22:58:11 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-1-SNAPSHOT/version + version2.1-beta-1/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-beta-1/url /scm issueManagement systemJIRA/system
svn commit: r753048 - in /maven/plugins/tags/maven-war-plugin-2.1-beta-1: ./ pom.xml
Author: dennisl Date: Thu Mar 12 22:58:27 2009 New Revision: 753048 URL: http://svn.apache.org/viewvc?rev=753048view=rev Log: [maven-release-plugin] copy for tag maven-war-plugin-2.1-beta-1 Added: maven/plugins/tags/maven-war-plugin-2.1-beta-1/ - copied from r753044, maven/plugins/trunk/maven-war-plugin/ maven/plugins/tags/maven-war-plugin-2.1-beta-1/pom.xml - copied unchanged from r753047, maven/plugins/trunk/maven-war-plugin/pom.xml
svn commit: r753049 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Thu Mar 12 22:59:28 2009 New Revision: 753049 URL: http://svn.apache.org/viewvc?rev=753049view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=753049r1=753048r2=753049view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu Mar 12 22:59:28 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-1/version + version2.1-beta-2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-beta-1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url /scm issueManagement systemJIRA/system
svn commit: r753294 - in /maven/plugins/trunk/maven-install-plugin/src: main/java/org/apache/maven/plugin/install/ site/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl
Date: Fri Mar 13 15:13:09 2009
New Revision: 753294
URL: http://svn.apache.org/viewvc?rev=753294view=rev
Log:
o Improve documentation.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/update-release-info.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-install-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-install-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=753294r1=753293r2=753294view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Fri Mar 13 15:13:09 2009
@@ -46,7 +46,7 @@
import java.util.Map;
/**
- * Installs a file in local repository.
+ * Installs a file in the local repository.
*
* @author a href=mailto:br...@apache.org;Brett Porter/a
* @version $Id$
@@ -59,44 +59,44 @@
{
/**
- * GroupId of the artifact to be installed. Retrieved from POM file if
specified.
- *
+ * GroupId of the artifact to be installed. Retrieved from POM file if one
is specified.
+ *
* @parameter expression=${groupId}
*/
protected String groupId;
/**
- * ArtifactId of the artifact to be installed. Retrieved from POM file if
specified.
- *
+ * ArtifactId of the artifact to be installed. Retrieved from POM file if
one is specified.
+ *
* @parameter expression=${artifactId}
*/
protected String artifactId;
/**
- * Version of the artifact to be installed. Retrieved from POM file if
specified
- *
+ * Version of the artifact to be installed. Retrieved from POM file if one
is specified.
+ *
* @parameter expression=${version}
*/
protected String version;
/**
- * Packaging type of the artifact to be installed. Retrieved from POM file
if specified
- *
+ * Packaging type of the artifact to be installed. Retrieved from POM file
if one is specified.
+ *
* @parameter expression=${packaging}
*/
protected String packaging;
/**
* Classifier type of the artifact to be installed. For example, sources
or javadoc. Defaults to none which
- * means this is the project's main JAR.
- *
+ * means this is the project's main artifact.
+ *
* @parameter expression=${classifier}
*/
protected String classifier;
/**
- * The file to be installed to the local repository.
- *
+ * The file to be installed in the local repository.
+ *
* @parameter expression=${file}
* @required
*/
@@ -104,7 +104,7 @@
/**
* The bundled API docs for the artifact.
- *
+ *
* @parameter expression=${javadoc}
* @since 2.3
*/
@@ -112,7 +112,7 @@
/**
* The bundled sources for the artifact.
- *
+ *
* @parameter expression=${sources}
* @since 2.3
*/
@@ -121,7 +121,7 @@
/**
* Location of an existing POM file to be installed alongside the main
artifact, given by the {...@link #file}
* parameter.
- *
+ *
* @parameter expression=${pomFile}
*/
private File pomFile;
@@ -129,37 +129,38 @@
/**
* Generate a minimal POM for the artifact if none is supplied via the
parameter {...@link #pomFile}. Defaults to
* codetrue/code if there is no existing POM in the local repository
yet.
- *
+ *
* @parameter expression=${generatePom}
*/
private Boolean generatePom;
/**
- * The type of remote repository layout to install to. Try ilegacy/i
for a Maven 1.x-style repository layout.
- *
+ * The type of remote repository layout to install to. Try
codelegacy/code for a Maven 1.x-style repository
+ * layout.
+ *
* @parameter expression=${repositoryLayout} default-value=default
svn commit: r754670 - /maven/plugins/tags/maven-war-plugin-2.1-beta-1/
Author: dennisl Date: Sun Mar 15 14:35:13 2009 New Revision: 754670 URL: http://svn.apache.org/viewvc?rev=754670view=rev Log: Remove tag, because the vote was canceled. Removed: maven/plugins/tags/maven-war-plugin-2.1-beta-1/
svn commit: r754671 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Sun Mar 15 14:39:58 2009 New Revision: 754671 URL: http://svn.apache.org/viewvc?rev=754671view=rev Log: o Revert the release. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754671r1=754670r2=754671view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 15 14:39:58 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-2-SNAPSHOT/version + version2.1-beta-1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name
svn commit: r754672 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Sun Mar 15 14:42:03 2009 New Revision: 754672 URL: http://svn.apache.org/viewvc?rev=754672view=rev Log: [MWAR-184] FATAL ERROR - XPP3 pull parser library not present. Specify another driver. o Upgrade XStream to version 1.3.1 as recommended by Jörn Schaible. Hopefully it solves this issue. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754672r1=754671r2=754672view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 15 14:42:03 2009 @@ -103,7 +103,7 @@ dependency groupIdcom.thoughtworks.xstream/groupId artifactIdxstream/artifactId - version1.2.2/version + version1.3.1/version /dependency dependency
svn commit: r754679 - /maven/plugins/trunk/maven-install-plugin/
Author: dennisl Date: Sun Mar 15 15:38:48 2009 New Revision: 754679 URL: http://svn.apache.org/viewvc?rev=754679view=rev Log: o Add SVN properties for bugtraq. Modified: maven/plugins/trunk/maven-install-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:logregex = MINSTALL-\d+ Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r754680 - in /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install: AbstractInstallMojo.java InstallFileMojo.java
Author: dennisl
Date: Sun Mar 15 15:52:53 2009
New Revision: 754680
URL: http://svn.apache.org/viewvc?rev=754680view=rev
Log:
o Add @since tags to parameters.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java?rev=754680r1=754679r2=754680view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
Sun Mar 15 15:52:53 2009
@@ -66,19 +66,20 @@
* Flag whether to create checksums (MD5, SHA-1) or not.
*
* @parameter expression=${createChecksum} default-value=false
+ * @since 2.2
*/
protected boolean createChecksum;
/**
* Digester for MD5.
- *
+ *
* @component role-hint=md5
*/
protected Digester md5Digester;
/**
* Digester for SHA-1.
- *
+ *
* @component role-hint=sha1
*/
protected Digester sha1Digester;
@@ -86,7 +87,7 @@
/**
* Gets the path of the specified artifact within the local repository.
Note that the returned path need not exist
* (yet).
- *
+ *
* @param artifact The artifact whose local repo path should be
determined, must not be codenull/code.
* @return The absolute path to the artifact when installed, never
codenull/code.
*/
@@ -99,7 +100,7 @@
/**
* Gets the path of the specified artifact metadata within the local
repository. Note that the returned path need
* not exist (yet).
- *
+ *
* @param metadata The artifact metadata whose local repo path should be
determined, must not be codenull/code.
* @return The absolute path to the artifact metadata when installed,
never codenull/code.
*/
@@ -116,7 +117,7 @@
* codeProjectArtifactMetadata/code did not install the original POM
file (cf. MNG-2820). While the plugin
* currently requires Maven 2.0.6, we continue to hash the installed POM
for robustness with regard to future
* changes like re-introducing some kind of POM filtering.
- *
+ *
* @param artifact The artifact for which to create checksums, must not be
codenull/code.
* @throws MojoExecutionException If the checksums could not be installed.
*/
@@ -145,7 +146,7 @@
/**
* Installs the checksums for the specified file (if it exists).
- *
+ *
* @param installedFile The path to the already installed file in the
local repo for which to generate checksums,
*must not be codenull/code.
* @throws MojoExecutionException If the checksums could not be installed.
@@ -163,7 +164,7 @@
/**
* Installs a checksum for the specified file.
- *
+ *
* @param originalFile The path to the file from which the checksum is
generated, must not be codenull/code.
* @param installedFile The base path from which the path to the checksum
files is derived by appending the given
*file extension, must not be codenull/code.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=754680r1=754679r2=754680view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Sun Mar 15 15:52:53 2009
@@ -91,6 +91,7 @@
* means this is the project's main artifact.
*
* @parameter expression=${classifier}
+ * @since 2.2
*/
protected String classifier;
@@ -123,6 +124,7 @@
* parameter.
*
* @parameter expression=${pomFile}
+ * @since 2.1
*/
private File pomFile;
@@ -131,6 +133,7 @@
* codetrue/code if there is no existing POM in the local repository
yet.
*
* @parameter expression=${generatePom}
+ * @since 2.1
*/
private Boolean generatePom;
@@ -140,6 +143,7 @@
*
* @parameter expression=${repositoryLayout} default-value=default
* @required
+ * @since 2.2
*/
private String
svn commit: r754687 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: dennisl
Date: Sun Mar 15 16:35:31 2009
New Revision: 754687
URL: http://svn.apache.org/viewvc?rev=754687view=rev
Log:
o Use a property to define the Maven core version.
Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml
Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=754687r1=754686r2=754687view=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Mar 15 16:35:31 2009
@@ -37,7 +37,7 @@
inceptionYear2004/inceptionYear
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -50,31 +50,35 @@
urlhttp://jira.codehaus.org/browse/MINSTALL/url
/issueManagement
+ properties
+mavenVersion2.0.6/mavenVersion
+ /properties
+
dependencies
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact-manager/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.plugin-testing/groupId
svn commit: r754690 - in /maven/plugins/trunk/maven-install-plugin/src/site/apt: examples/installing-checksums.apt usage.apt
Author: dennisl Date: Sun Mar 15 16:45:52 2009 New Revision: 754690 URL: http://svn.apache.org/viewvc?rev=754690view=rev Log: o Improve documentation. Use goal instead of mojo. Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt?rev=754690r1=754689r2=754690view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt Sun Mar 15 16:45:52 2009 @@ -33,7 +33,7 @@ functions and are used to check the integrity of the associated file. This can be activated by setting the createChecksum parameter to true. - In the install:install mojo. + In the install:install goal. +---+ mvn install -DcreateChecksum=true Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt?rev=754690r1=754689r2=754690view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt Sun Mar 15 16:45:52 2009 @@ -28,7 +28,7 @@ Usage -* The install:install Mojo +* The install:install goal In most cases, install:install goal doesn't need any configuration, it needs the project's POM and the artifact file to be installed during the @@ -38,12 +38,12 @@ mvn install +---+ -* The install:install-file Mojo +* The install:install-file goal - The install:install-file mojo is used primarily for installing artifacts to + The install:install-file goal is used primarily for installing artifacts to the local repository which were not built by Maven. The project's development team - may or may not provide a POM for the artifact. Here's a complete example of the - install-file mojo: + may or may not provide a POM for the artifact. Here's a list of some of the available parameters for the + install-file goal: +---+ mvn install:install-file -Dfile=your-artifact-1.0.jar \ @@ -65,7 +65,7 @@ groupId can be considered if the groupId is not specified further for the current project or on the command line. - * the classifier parameter can be used to install secondary artifacts for a project, + * the optional classifier parameter can be used to install secondary artifacts for a project, like a javadoc or sources JAR. If a classifier is not given, Maven assumes the file is the main artifact for the project.
svn propchange: r754672 - svn:log
Author: dennisl Revision: 754672 Modified property: svn:log Modified: svn:log at Mon Mar 16 15:28:11 2009 -- --- svn:log (original) +++ svn:log Mon Mar 16 15:28:11 2009 @@ -1,3 +1,3 @@ -[MWAR-184] FATAL ERROR - XPP3 pull parser library not present. Specify another driver. +[MWAR-186] Upgrade to XStream 1.3.1 -o Upgrade XStream to version 1.3.1 as recommended by Jörn Schaible. Hopefully it solves this issue. +o Upgrade XStream to version 1.3.1 as recommended by Jörn Schaible.
svn commit: r754915 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Mon Mar 16 15:46:27 2009 New Revision: 754915 URL: http://svn.apache.org/viewvc?rev=754915view=rev Log: [maven-release-plugin] prepare release maven-war-plugin-2.1-beta-1 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754915r1=754914r2=754915view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Mar 16 15:46:27 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-1-SNAPSHOT/version + version2.1-beta-1/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-beta-1/url /scm issueManagement systemJIRA/system
svn commit: r754916 - in /maven/plugins/tags/maven-war-plugin-2.1-beta-1: ./ pom.xml
Author: dennisl Date: Mon Mar 16 15:47:01 2009 New Revision: 754916 URL: http://svn.apache.org/viewvc?rev=754916view=rev Log: [maven-release-plugin] copy for tag maven-war-plugin-2.1-beta-1 Added: maven/plugins/tags/maven-war-plugin-2.1-beta-1/ - copied from r754669, maven/plugins/trunk/maven-war-plugin/ maven/plugins/tags/maven-war-plugin-2.1-beta-1/pom.xml - copied unchanged from r754915, maven/plugins/trunk/maven-war-plugin/pom.xml
svn commit: r754917 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Mon Mar 16 15:47:12 2009 New Revision: 754917 URL: http://svn.apache.org/viewvc?rev=754917view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754917r1=754916r2=754917view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Mar 16 15:47:12 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-1/version + version2.1-beta-2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-beta-1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url /scm issueManagement systemJIRA/system
svn commit: r757189 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Sun Mar 22 14:08:26 2009
New Revision: 757189
URL: http://svn.apache.org/viewvc?rev=757189view=rev
Log:
o Release maven-war-plugin 2.1-beta-1.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=757189r1=757188r2=757189view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sun Mar 22 14:08:26 2009
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-
- 2009-03-11
+ 2009-03-22
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -78,7 +78,7 @@
*---+--++--+++
| {{{/plugins/maven-rar-plugin/} rar}}| 2.2 |
2007-02-28 | Build a RAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-rar-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MRAR}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-war-plugin/} war}}| 2.1-alpha-2 |
2008-08-14 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
+| {{{/plugins/maven-war-plugin/} war}}| 2.1-beta-1 |
2009-03-22 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
*---+--++--+++
| {{{/plugins/maven-shade-plugin/} shade}}| 1.2 |
2008-10-17 | Build an Uber-JAR from the current project, including
dependencies. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSHADE}JIRA}}
*---+--++--+++
svn commit: r757196 - in /maven/plugins/trunk/maven-install-plugin/src/site/apt/examples: custom-pom-installation.apt specific-local-repo.apt
Author: dennisl Date: Sun Mar 22 15:07:45 2009 New Revision: 757196 URL: http://svn.apache.org/viewvc?rev=757196view=rev Log: o Simplify examples. Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt?rev=757196r1=757195r2=757196view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt Sun Mar 22 15:07:45 2009 @@ -3,7 +3,7 @@ -- Allan Ramirez -- - 2009-03-13 + 2009-03-22 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -33,6 +33,5 @@ to the path of the custom POM. +---+ -mvn install:install-file -Dfile=path-to-your-artifact-jar \ - -DpomFile=path-to-pom +mvn install:install-file -Dfile=path-to-your-artifact-jar -DpomFile=path-to-pom +---+ Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt?rev=757196r1=757195r2=757196view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt Sun Mar 22 15:07:45 2009 @@ -3,7 +3,7 @@ -- Vincent Siveton -- - 2009-03-13 + 2009-03-22 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -39,6 +39,5 @@ -DartifactId=your-artifactId \ -Dversion=version \ -Dpackaging=jar \ - -DpomFile=path-to-pom \ - -DlocalRepositoryPath=path-to-specific-local-repo \ + -DlocalRepositoryPath=path-to-specific-local-repo +---+
svn commit: r757199 - in /maven/plugins/trunk/maven-install-plugin/src/site: apt/examples/installing-secondary-artifacts.apt apt/index.apt apt/usage.apt site.xml
Author: dennisl
Date: Sun Mar 22 15:16:34 2009
New Revision: 757199
URL: http://svn.apache.org/viewvc?rev=757199view=rev
Log:
o Add an example on how to install secondary artifacts.
Added:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
(with props)
Modified:
maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-install-plugin/src/site/site.xml
Added:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt?rev=757199view=auto
==
---
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
Sun Mar 22 15:16:34 2009
@@ -0,0 +1,49 @@
+ --
+ Installing Secondary Artifacts
+ --
+ Dennis Lundberg
+ --
+ 2009-03-22
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Installing Secondary Artifacts
+
+ Sometimes you need to install secondary artifacts after the main artifact has
+ been installed in your local repository. To install a secondary artifact you
+ need to use the classifier parameter to classify the secondary
artifact.
+
+ Let us assume that you want to install the sources for an old artifact, like
+ commons-logging-1.0.3. The
+
{{{http://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.3/}central
repository}}
+ only has the main artifact and a -javadoc artifact for that version.
+ Package up the sources into a JAR file on your local disk and then run the
+ following command:
+
++---+
+mvn install:install-file -Dfile=path-to-commons-logging-sources.jar \
+ -DgroupId=commons-logging \
+ -DartifactId=commons-logging \
+ -Dversion=1.0.3 \
+ -Dpackaging=jar \
+ -Dclassifier=sources
++---+
Propchange:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt
--
svn:keywords = Date Revision Author Id
Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt?rev=757199r1=757198r2=757199view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt Sun Mar 22
15:16:34 2009
@@ -88,4 +88,6 @@
* {{{examples/specific-local-repo.html}Installing an Artifact to a Specific
Local Repository Path}}
+ * {{{examples/installing-secondary-artifacts.html}Installing Secondary
Artifacts}}
+
[]
Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt?rev=757199r1=757198r2=757199view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt Sun Mar 22
15:16:34 2009
@@ -65,7 +65,8 @@
groupId can be considered if the groupId is not specified further for the
current project or on the command line.
- * the optional classifier parameter can be used to install secondary
artifacts for a project
svn commit: r757200 - /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Author: dennisl
Date: Sun Mar 22 15:18:54 2009
New Revision: 757200
URL: http://svn.apache.org/viewvc?rev=757200view=rev
Log:
o Fix an error reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=757200r1=757199r2=757200view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Sun Mar 22 15:18:54 2009
@@ -158,7 +158,7 @@
/**
* The path for a specific local repository directory. If not specified
the local repository path configured in the
* Maven settings will be used.
- *
+ *
* @parameter expression=${localRepositoryPath}
* @since 2.2
*/
@@ -166,7 +166,7 @@
/**
* The component used to validate the user-supplied artifact coordinates.
- *
+ *
* @component
*/
private ModelValidator modelValidator;
@@ -188,7 +188,8 @@
getLog().debug( Layout: + layout.getClass() );
localRepository =
-new DefaultArtifactRepository( localRepository.getId(),
localRepositoryPath.toURL().toString(), layout );
+new DefaultArtifactRepository( localRepository.getId(),
localRepositoryPath.toURL().toString(),
+ layout );
}
catch ( MalformedURLException e )
{
@@ -363,7 +364,7 @@
/**
* Validates the user-supplied artifact information.
- *
+ *
* @throws MojoExecutionException If any artifact coordinate is invalid.
*/
private void validateArtifactInformation()
@@ -382,7 +383,7 @@
/**
* Generates a minimal model from the user-supplied artifact information.
- *
+ *
* @return The generated model, never codenull/code.
*/
private Model generateModel()
svn commit: r757201 - in /maven/plugins/trunk/maven-install-plugin/src/site/apt: examples/generic-pom-generation.apt examples/installing-checksums.apt index.apt
Author: dennisl
Date: Sun Mar 22 15:23:21 2009
New Revision: 757201
URL: http://svn.apache.org/viewvc?rev=757201view=rev
Log:
o Adjust case.
Modified:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt
maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt
Modified:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt?rev=757201r1=757200r2=757201view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt
Sun Mar 22 15:23:21 2009
@@ -3,7 +3,7 @@
--
Allan Ramirez
--
- 2009-03-13
+ 2009-03-22
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
There are times when you do not have a POM for a 3rd party artifact.
For instance, when installing a proprietary or commercial JAR into a
repository.
- The install plugin can create a generic POM in this case which
+ The Install Plugin can create a generic POM in this case which
contains the minimal set of POM elements required by Maven, such as groupId,
artifactId, version, packaging. You tell Maven to generate a POM by setting
the
generatePom parameter to true.
Modified:
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt?rev=757201r1=757200r2=757201view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt
Sun Mar 22 15:23:21 2009
@@ -3,7 +3,7 @@
--
Allan Ramirez
--
- 2009-03-13
+ 2009-03-22
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@
Creating artifact checksums
- The install plugin can create integrity checksums (MD5, SHA-1)
+ The Install Plugin can create integrity checksums (MD5, SHA-1)
for the artifacts during installation. Checksums are cryptographic hash
functions and are used to check the integrity of the associated file. This
can be
activated by setting the createChecksum parameter to true.
Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt?rev=757201r1=757200r2=757201view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt Sun Mar 22
15:23:21 2009
@@ -3,7 +3,7 @@
--
Allan Ramirez
--
- 2009-03-13
+ 2009-03-22
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +40,7 @@
* Goals Overview
- The install plugin has 3 goals:
+ The Install Plugin has 3 goals:
* {{{install-mojo.html}install:install}} is used to automatically install the
project's main artifact (the JAR, WAR or EAR), its POM and any attached
artifacts
svn commit: r757247 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: dennisl Date: Sun Mar 22 20:01:38 2009 New Revision: 757247 URL: http://svn.apache.org/viewvc?rev=757247view=rev Log: [maven-release-plugin] prepare release maven-install-plugin-2.3 Modified: maven/plugins/trunk/maven-install-plugin/pom.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=757247r1=757246r2=757247view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Mar 22 20:01:38 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-install-plugin/artifactId - version2.3-SNAPSHOT/version + version2.3/version packagingmaven-plugin/packaging nameMaven Install Plugin/name @@ -41,9 +41,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-install-plugin-2.3/url /scm issueManagement systemjira/system
svn commit: r757248 - in /maven/plugins/tags/maven-install-plugin-2.3: ./ src/main/java/org/apache/maven/plugin/install/ src/site/ src/site/apt/ src/site/apt/examples/
Author: dennisl Date: Sun Mar 22 20:02:16 2009 New Revision: 757248 URL: http://svn.apache.org/viewvc?rev=757248view=rev Log: [maven-release-plugin] copy for tag maven-install-plugin-2.3 Added: maven/plugins/tags/maven-install-plugin-2.3/ - copied from r757191, maven/plugins/trunk/maven-install-plugin/ maven/plugins/tags/maven-install-plugin-2.3/pom.xml - copied unchanged from r757247, maven/plugins/trunk/maven-install-plugin/pom.xml maven/plugins/tags/maven-install-plugin-2.3/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java - copied unchanged from r757200, maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/examples/custom-pom-installation.apt - copied unchanged from r757196, maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/custom-pom-installation.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/examples/generic-pom-generation.apt - copied unchanged from r757245, maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/generic-pom-generation.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/examples/installing-checksums.apt - copied unchanged from r757245, maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/examples/installing-secondary-artifacts.apt - copied unchanged from r757199, maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-secondary-artifacts.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/examples/specific-local-repo.apt - copied unchanged from r757196, maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/specific-local-repo.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/index.apt - copied unchanged from r757245, maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/apt/usage.apt - copied unchanged from r757199, maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt maven/plugins/tags/maven-install-plugin-2.3/src/site/site.xml - copied unchanged from r757199, maven/plugins/trunk/maven-install-plugin/src/site/site.xml
svn commit: r757249 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: dennisl Date: Sun Mar 22 20:05:12 2009 New Revision: 757249 URL: http://svn.apache.org/viewvc?rev=757249view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-install-plugin/pom.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=757249r1=757248r2=757249view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Mar 22 20:05:12 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-install-plugin/artifactId - version2.3/version + version2.4-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Install Plugin/name @@ -41,9 +41,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-install-plugin-2.3/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin//url /scm issueManagement systemjira/system
svn commit: r757252 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: dennisl
Date: Sun Mar 22 20:18:21 2009
New Revision: 757252
URL: http://svn.apache.org/viewvc?rev=757252view=rev
Log:
o Correct the name of the Staging repository from Maven to org.apache.maven.
o Add line breaks to long lines.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=757252r1=757251r2=757252view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sun Mar 22
20:18:21 2009
@@ -3,7 +3,7 @@
-
Jason van Zyl
-
- 2009-02-23
+ 2009-03-22
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -58,8 +58,8 @@
/settings
+-+
- Everything that you need to release has been configured in the POM all Maven
projects inherit from. The release plugin configuration
- being used is the following:
+ Everything that you need to release has been configured in the POM all Maven
projects inherit from. The release plugin
+ configuration being used is the following:
%{snippet|id=release-plugin-configuration|url=http://svn.apache.org/repos/asf/maven/pom/trunk/maven/pom.xml}
@@ -119,7 +119,8 @@
+-+
Note: Be sure that the generated artifacts respect the
- {{{http://www.apache.org/dev/release.html#distribute-raw-artifact}Apache
release rules}}: NOTICE and LICENSE files should be present in
+ {{{http://www.apache.org/dev/release.html#distribute-raw-artifact}Apache
release rules}}: NOTICE and LICENSE files
+ should be present in
the META-INF directory within the jar. For -sources artifacts, be sure
that your POM does not use the
maven-source-plugin:2.0.3 which is broken. The recommended version at this
time is 2.0.4.
@@ -144,19 +145,28 @@
mvn release:perform
+-+
- The release will automatically be inserted into a temporary staging
repository for you. See the Nexus
{{{http://www.sonatype.com/books/nexus-book/reference/staging.html} staging
documentation}} for full details.
-
+ The release will automatically be inserted into a temporary staging
repository for you. See the Nexus
+ {{{http://www.sonatype.com/books/nexus-book/reference/staging.html} staging
documentation}} for full details.
+
[[5]] Close the staging repository
- Login to {{https://repository.apache.org}} using your Apache credentials.
Click on Staging Repositories. Then click on Maven in the list of profiles.
In the panel below you should see an open repository that is linked to your
username and ip. Right click on this repository and select Finish. This will
close the repository from future deployments and make it available for others
to view. If you are staging multiple releases together, skip this step until
you have staged everything.
+ Login to {{https://repository.apache.org}} using your Apache credentials.
Click on Staging Repositories. Then click
+ on org.apache.maven in the list of repositories. In the panel below you
should see an open repository that is linked
+ to your username and ip. Right click on this repository and select Finish.
This will close the repository from future
+ deployments and make it available for others to view. If you are staging
multiple releases together, skip this step
+ until you have staged everything.
See the image below for details.
-
+
[../../images/Close_Repo.png] Closing the repository
[[6]] Verify the Staged artifacts
- Still logged in to {{https://repository.apache.org}}, click on Browse
Repositories. Next select the drop down and choose Nexus Managed
Repositories. You will see a list of existing stage repositories. Find yours
and then browse the contents to ensure the artifacts are as you expect them.
Pay particular attention to the existence of .asc (signature) files. If the you
don't like the content of the repository, go back to the Staging Repositories
screen, right click your repository and choose Drop. You can then rollback
your release and repeat the process.
+ Still logged in to {{https://repository.apache.org}}, click on Browse
Repositories. Next select the drop down and
+ choose Nexus Managed Repositories. You will see a list of existing stage
repositories. Find yours and then browse the
+ contents to ensure the artifacts are as you expect them. Pay particular
attention to the existence of .asc (signature)
+ files. If the you don't like the content of the repository, go back to the
Staging Repositories screen, right click
+ your repository and choose Drop. You can then rollback your release and
repeat the process.
Note the repository URL, you will need this in your vote email.
@@ -268,24 +278,29 @@
I will promote the artifacts to the central repo.
+-+
- If the vote is unsuccessful, the process
svn commit: r757261 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: dennisl
Date: Sun Mar 22 21:55:10 2009
New Revision: 757261
URL: http://svn.apache.org/viewvc?rev=757261view=rev
Log:
o Clarify how to change file and folder permissions.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=757261r1=757260r2=757261view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sun Mar 22
21:55:10 2009
@@ -200,7 +200,9 @@
scp -r
target/staging/people.apache.org/www/maven.apache.org/plugins/maven-XXX-plugin
your_apache_usern...@people.apache.org:/www/maven.apache.org/plugins/maven-XXX-plugin-Y.Z
+--+
- [[b]] Verify/change folder permissions to 0775 and files permissions to
0664 i.e.:
+ [[b]] Verify/change folder permissions to 0775 and files permissions to
0664. Log on to people.apache.org and
+ change to the directory above the staging directory. That would be
/www/maven.apache.org/plugins for a plugin.
+ Then run these commands:
+--+
find . -type d -exec chmod a+rx {} \;
svn commit: r757267 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Author: dennisl
Date: Sun Mar 22 22:25:53 2009
New Revision: 757267
URL: http://svn.apache.org/viewvc?rev=757267view=rev
Log:
[MSITE-394] Deploying a staging site doesn't set the same permissions as when
deploying a site
o Copy code from the site:deploy mojo so that permissions are set in the same
way.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=757267r1=757266r2=757267view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Sun Mar 22 22:25:53 2009
@@ -25,6 +25,8 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.CommandExecutionException;
+import org.apache.maven.wagon.CommandExecutor;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
@@ -156,6 +158,14 @@
}
wagon.putDirectory( new File( stagingDirectory, getStructure(
project, false ) ), . );
+
+// TODO: current wagon uses zip which will use the umask on remote
host instead of honouring our settings
+// Force group writeable
+if ( wagon instanceof CommandExecutor )
+{
+CommandExecutor exec = (CommandExecutor) wagon;
+exec.executeCommand( chmod -Rf g+w,a+rX +
repository.getBasedir() );
+}
}
catch ( ResourceDoesNotExistException e )
{
@@ -177,6 +187,10 @@
{
throw new MojoExecutionException( Error uploading site, e );
}
+catch ( CommandExecutionException e )
+{
+throw new MojoExecutionException( Error uploading site, e );
+}
finally
{
try
svn commit: r757763 - /maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
Author: dennisl
Date: Tue Mar 24 12:34:31 2009
New Revision: 757763
URL: http://svn.apache.org/viewvc?rev=757763view=rev
Log:
o Fix broken link.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt?rev=757763r1=757762r2=757763view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt Tue Mar 24
12:34:31 2009
@@ -46,7 +46,7 @@
* {{{jira-report-mojo.html}changes:jira-report}} create a report from issues
downloaded from JIRA.
- * {{{changes-validate-mojo.html.html}changes:changes-validate}} validate the
changes.xml file.
+ * {{{changes-validate-mojo.html}changes:changes-validate}} validate the
changes.xml file.
[]
svn commit: r757777 - in /maven/plugins/trunk/maven-changes-plugin/src/main: java/org/apache/maven/plugin/changes/ChangesReportGenerator.java resources/changes-report.properties resources/changes-repo
Author: dennisl
Date: Tue Mar 24 13:09:48 2009
New Revision: 75
URL: http://svn.apache.org/viewvc?rev=75view=rev
Log:
[MCHANGES-156] An empty table is shown for a release which doesn't have any
action in it
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=75r1=757776r2=75view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Tue Mar 24 13:09:48 2009
@@ -176,70 +176,81 @@
private void constructActions( Sink sink, List actionList, ResourceBundle
bundle )
{
-sink.table();
-
-sink.tableRow();
-
-sinkHeader( sink, bundle.getString( report.changes.label.type ) );
-
-sinkHeader( sink, bundle.getString( report.changes.label.changes ) );
+if( actionList.isEmpty() )
+{
+sink.paragraph();
-sinkHeader( sink, bundle.getString( report.changes.label.by ) );
+sink.text( bundle.getString(report.changes.text.no.changes) );
-if ( this.isAddActionDate() )
-{
-sinkHeader( sink, bundle.getString( report.changes.label.date )
);
+sink.paragraph_();
}
-sink.tableRow_();
-
-for ( int idx = 0; idx actionList.size(); idx++ )
+else
{
-Action action = (Action) actionList.get( idx );
+sink.table();
sink.tableRow();
-sinkShowTypeIcon( sink, action.getType() );
+sinkHeader( sink, bundle.getString( report.changes.label.type )
);
-sink.tableCell();
+sinkHeader( sink, bundle.getString( report.changes.label.changes
) );
-sink.rawText( action.getAction() );
+sinkHeader( sink, bundle.getString( report.changes.label.by ) );
+
+if ( this.isAddActionDate() )
+{
+sinkHeader( sink, bundle.getString(
report.changes.label.date ) );
+}
+sink.tableRow_();
-// no null check needed classes from modello return a new ArrayList
-if ( StringUtils.isNotEmpty( action.getIssue() ) || (
!action.getFixedIssues().isEmpty() ) )
+for ( int idx = 0; idx actionList.size(); idx++ )
{
-sink.text( + bundle.getString( report.changes.text.fixes
) + );
+Action action = (Action) actionList.get( idx );
+
+sink.tableRow();
-String system = action.getSystem();
-system = StringUtils.isEmpty( system ) ?
DEFAULT_ISSUE_SYSTEM_KEY : system;
-if ( !canGenerateIssueLinks( system ) )
+sinkShowTypeIcon( sink, action.getType() );
+
+sink.tableCell();
+
+sink.rawText( action.getAction() );
+
+// no null check needed classes from modello return a new
ArrayList
+if ( StringUtils.isNotEmpty( action.getIssue() ) || (
!action.getFixedIssues().isEmpty() ) )
{
-constructIssueText( action.getIssue(), sink,
action.getFixedIssues() );
+sink.text( + bundle.getString(
report.changes.text.fixes ) + );
+
+String system = action.getSystem();
+system = StringUtils.isEmpty( system ) ?
DEFAULT_ISSUE_SYSTEM_KEY : system;
+if ( !canGenerateIssueLinks( system ) )
+{
+constructIssueText( action.getIssue(), sink,
action.getFixedIssues() );
+}
+else
+{
+constructIssueLink( action.getIssue(), system, sink,
action.getFixedIssues() );
+}
+sink.text( . );
}
-else
+
+if ( StringUtils.isNotEmpty( action.getDueTo() ) || (
!action.getDueTos().isEmpty() ) )
{
-constructIssueLink( action.getIssue(), system, sink,
action.getFixedIssues() );
+constructDueTo( sink, action, bundle, action.getDueTos() );
}
-sink.text
svn commit: r757781 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl Date: Tue Mar 24 13:16:39 2009 New Revision: 757781 URL: http://svn.apache.org/viewvc?rev=757781view=rev Log: [MCHANGES-157] Update to Doxia 1.0 Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=757781r1=757780r2=757781view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Mar 24 13:16:39 2009 @@ -73,8 +73,8 @@ /issueManagement properties -doxiaVersion1.0-alpha-11/doxiaVersion -doxiaSitetoolsVersion1.0-alpha-11/doxiaSitetoolsVersion +doxiaVersion1.0/doxiaVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion /properties dependencies @@ -250,7 +250,6 @@ /dependency !-- trac dependencies -- - dependency groupIdorg.apache.xmlrpc/groupId artifactIdxmlrpc-client/artifactId
svn commit: r757784 - /maven/plugins/trunk/maven-changes-plugin/
Author: dennisl Date: Tue Mar 24 13:18:57 2009 New Revision: 757784 URL: http://svn.apache.org/viewvc?rev=757784view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-changes-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:logregex = MCHANGES-\d+ Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r757802 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl
Date: Tue Mar 24 13:49:31 2009
New Revision: 757802
URL: http://svn.apache.org/viewvc?rev=757802view=rev
Log:
o Use a property to specify the version of Maven core dependencies.
o Sync the version with the prerequisites.
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=757802r1=757801r2=757802view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Mar 24 13:49:31 2009
@@ -59,7 +59,7 @@
/contributors
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -75,6 +75,7 @@
properties
doxiaVersion1.0/doxiaVersion
doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion
+mavenVersion2.0.6/mavenVersion
/properties
dependencies
@@ -82,28 +83,30 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
+
+!-- shared --
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-impl/artifactId
svn commit: r758457 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Wed Mar 25 22:52:33 2009
New Revision: 758457
URL: http://svn.apache.org/viewvc?rev=758457view=rev
Log:
o Release maven-install-plugin 2.3.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=758457r1=758456r2=758457view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Mar 25 22:52:33 2009
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-
- 2009-03-22
+ 2009-03-25
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -58,7 +58,7 @@
*---+--++--+++
| {{{/plugins/maven-deploy-plugin/} deploy}} | 2.4 |
2008-08-06 | Deploy the built artifact to the remote repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-install-plugin/} install}}| 2.2 |
2007-05-17 | Install the built artifact into the local repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
+| {{{/plugins/maven-install-plugin/} install}}| 2.3 |
2009-03-25 | Install the built artifact into the local repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*---+--++--+++
| {{{/plugins/maven-resources-plugin/} resources}}| 2.3 |
2008-10-17 | Copy the resources to the output directory for including in the
JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRESOURCES}JIRA}}
*---+--++--+++
svn commit: r762080 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Sun Apr 5 13:22:49 2009 New Revision: 762080 URL: http://svn.apache.org/viewvc?rev=762080view=rev Log: o Use version 2.4 of maven-archiver. Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=762080r1=762079r2=762080view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Sun Apr 5 13:22:49 2009 @@ -73,7 +73,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId - version2.3/version + version2.4/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r762643 - in /maven/plugins/trunk/maven-ejb-plugin/src/site: apt/examples/ejb-client-dependency.apt apt/examples/generating-ejb-client.apt apt/index.apt fml/faq.fml
Author: dennisl
Date: Tue Apr 7 07:44:31 2009
New Revision: 762643
URL: http://svn.apache.org/viewvc?rev=762643view=rev
Log:
o Minor site improvements.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt?rev=762643r1=762642r2=762643view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
Tue Apr 7 07:44:31 2009
@@ -3,7 +3,7 @@
--
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
Using the ejb-client as a dependency
The EJB Plugin is capable of generating another artifact aside from the
primary one which is EJB. To choose the EJB client
- as the dependency just specify the type as ejb-client.
+ as the dependency just specify the type as ejb-client.
* Normal way of adding an EJB dependency
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt?rev=762643r1=762642r2=762643view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
Tue Apr 7 07:44:31 2009
@@ -5,7 +5,7 @@
snic...@apache.org
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -32,9 +32,9 @@
Generating an EJB client
Normally a thick-client application would only need the stubs and utility
classes of the EJB project.
- The EJB Plugin is capable of generating an EJB jar for client use.
+ The EJB Plugin is capable of generating an EJB JAR for client use.
- To generate the ejb-client jar, you need to set generateClient to
true in the plugin's configuration:
+ To generate the ejb-client JAR, you need to set generateClient to
true in the plugin's configuration:
++
[...]
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt?rev=762643r1=762642r2=762643view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt Tue Apr 7
07:44:31 2009
@@ -5,7 +5,7 @@
snic...@apache.org
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -35,7 +35,7 @@
* Goals Overview
- {{{ejb-mojo.html}ejb:ejb}} - used by Maven for projects with ejb package
type.
+ {{{ejb-mojo.html}ejb:ejb}} - used by Maven for projects with ejb
package type.
* Usage
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml?rev=762643r1=762642r2=762643view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml Tue Apr 7
07:44:31 2009
@@ -22,7 +22,7 @@
faqs id=FAQ title=Frequently Asked Questions
part id=General
faq id=How can I specify a Class-Path: entry in the manifest of an EJB
jar?
- questionHow can I specify a Class-Path: entry in the manifest of an
EJB jar?/question
+ questionHow can I specify a Class-Path: entry in the manifest of an
EJB JAR?/question
answer
p
You just have to configure it:
@@ -56,7 +56,7 @@
questionHow does the classifier affect artifacts in my EJB
project?/question
answer
pWhen used, the copy of the artifact in your project will have the
classifier appended to its
- filename. This can be used to differentiate duplicate artifacts./p
+ filename. This can be used to differentiate multiple artifacts./p
/answer
/faq
/part
svn commit: r772778 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt
Author: dennisl Date: Thu May 7 21:23:42 2009 New Revision: 772778 URL: http://svn.apache.org/viewvc?rev=772778view=rev Log: o Fix typos. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt?rev=772778r1=772777r2=772778view=diff == --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt Thu May 7 21:23:42 2009 @@ -5,7 +5,7 @@ Herve Boutemy Paul Gier -- - 2009-05-06 + 2009-05-07 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -133,11 +133,11 @@ Filtering Dependencies by Scope - There are two options available for filtering pom dependencies by scope, the useScope - attribute, and the scopes atribute. One or the other of these attributes should be used + There are two options available for filtering POM dependencies by scope, the useScope + attribute, and the scopes attribute. One or the other of these attributes should be used but not both. - The useScopes follows the maven conventions for scoping behaviour. This means attribute + The useScopes follows the Maven conventions for scoping behaviour. This means the attribute can be set to one of three possible scopes: compile, runtime, or test. These scopes will behave as follows.
svn commit: r782260 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Sat Jun 6 13:36:49 2009
New Revision: 782260
URL: http://svn.apache.org/viewvc?rev=782260view=rev
Log:
o Update Assembly Plugin release date.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=782260r1=782259r2=782260view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Jun 6 13:36:49 2009
@@ -114,23 +114,23 @@
*---+--++--+++
| {{{/plugins/maven-archetype-plugin/} archetype}}| 2.0-alpha-4 |
2008-09-26 | Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-assembly-plugin/} assembly}} | 2.2-beta-4 |
2009-01-05 | Build an assembly (distribution) of sources and/or binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
+| {{{/plugins/maven-assembly-plugin/} assembly}} | 2.2-beta-4 |
2009-06-05 | Build an assembly (distribution) of sources and/or binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*---+--++--+++
| {{{/plugins/maven-dependency-plugin/} dependency}} | 2.1 |
2009-01-10 | Dependency manipulation (copy, unpack) and analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-enforcer-plugin/} enforcer}} | 1.0-beta-1 |
2009-02-25 | Environmental constraint checking (Maven Version, JDK etc), User
Custom Rule Execution. |
{{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}}
+| {{{/plugins/maven-enforcer-plugin/} enforcer}} | 1.0-beta-1 |
2009-02-25 | Environmental constraint checking (Maven Version, JDK etc), User
Custom Rule Execution. |
{{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}}
*---+--++--+++
| {{{/plugins/maven-gpg-plugin/} gpg}}| 1.0-alpha-4 |
2007-09-28 | Create signatures for the artifacts and poms. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-gpg-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MGPG}JIRA}}
*---+--++--+++
| {{{/plugins/maven-help-plugin/} help}} | 2.1 |
2008-09-04 | Get information about the working environment for the project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-help-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPH}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-invoker-plugin/} invoker}}| 1.3|
2008-08-09 | Run a set of Maven projects and verify the output. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINVOKER}JIRA}}
+| {{{/plugins/maven-invoker-plugin/} invoker}}| 1.3 |
2008-08-09 | Run a set of Maven projects and verify the output. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINVOKER}JIRA}}
*---+--++--+++
| {{{/plugins/maven-one-plugin/} one}}| 1.2 |
2007-09-12 | A plugin for interacting with legacy Maven 1.x repositories and
builds. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one
svn commit: r695248 - /maven/plugins/trunk/maven-docck-plugin/pom.xml
Author: dennisl Date: Sun Sep 14 09:14:19 2008 New Revision: 695248 URL: http://svn.apache.org/viewvc?rev=695248view=rev Log: o No more beta. Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=695248r1=695247r2=695248view=diff == --- maven/plugins/trunk/maven-docck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-docck-plugin/pom.xml Sun Sep 14 09:14:19 2008 @@ -27,7 +27,7 @@ /parent artifactIdmaven-docck-plugin/artifactId - version1.0-beta-3-SNAPSHOT/version + version1.0-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Documentation Checker Plugin/name
svn commit: r695249 - in /maven/plugins/trunk/maven-docck-plugin/src: main/java/org/apache/maven/plugin/docck/reports/ site/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl Date: Sun Sep 14 09:15:59 2008 New Revision: 695249 URL: http://svn.apache.org/viewvc?rev=695249view=rev Log: o Set subversion keywords. Modified: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/AbstractDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/ErrorDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/InfoDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/WarningDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/index.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/site.xml (props changed) Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/AbstractDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/ErrorDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/InfoDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/WarningDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/index.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/site.xml -- svn:keywords = Date Id
svn commit: r695250 - in /maven/plugins/trunk/maven-docck-plugin/src/site/apt: examples/file-output.apt usage.apt
Author: dennisl Date: Sun Sep 14 09:19:53 2008 New Revision: 695250 URL: http://svn.apache.org/viewvc?rev=695250view=rev Log: o Promote best practices by specifying the version in POM examples. Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt?rev=695250r1=695249r2=695250view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt Sun Sep 14 09:19:53 2008 @@ -41,6 +41,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-docck-plugin/artifactId +version1.0/version executions execution configuration Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt?rev=695250r1=695249r2=695250view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt Sun Sep 14 09:19:53 2008 @@ -46,6 +46,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-docck-plugin/artifactId +version1.0/version executions execution goals
svn commit: r697354 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Author: dennisl
Date: Sat Sep 20 04:41:11 2008
New Revision: 697354
URL: http://svn.apache.org/viewvc?rev=697354view=rev
Log:
o Use the non-deprecated API for getting the wagon.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=697354r1=697353r2=697354view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Sat Sep 20 04:41:11 2008
@@ -119,7 +119,7 @@
Wagon wagon;
try
{
-wagon = wagonManager.getWagon( repository.getProtocol() );
+wagon = wagonManager.getWagon( repository );
SiteDeployMojo.configureWagon( wagon, STAGING_SERVER_ID, settings,
container, getLog() );
}
catch ( UnsupportedProtocolException e )
svn commit: r697355 - /maven/plugins/trunk/pom.xml
Author: dennisl Date: Sat Sep 20 04:47:19 2008 New Revision: 697355 URL: http://svn.apache.org/viewvc?rev=697355view=rev Log: o Lock down the version of maven-enforcer-plugin to 1.0-beta-4. Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=697355r1=697354r2=697355view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Sat Sep 20 04:47:19 2008 @@ -169,6 +169,11 @@ plugins plugin groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-enforcer-plugin/artifactId + version1.0-beta-4/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.4.3/version /plugin
svn commit: r697486 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Sun Sep 21 05:36:37 2008 New Revision: 697486 URL: http://svn.apache.org/viewvc?rev=697486view=rev Log: o Comment out the modules to be able to release the shared parent. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=697486r1=697485r2=697486view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 21 05:36:37 2008 @@ -111,6 +111,7 @@ /mailingList /mailingLists +!-- modules modulefile-management/module modulemaven-ant/module @@ -134,11 +135,14 @@ modulemaven-shared-monitor/module modulemaven-verifier/module modulemaven-web-ui-tests/module +-- !-- Uses jdk 1.5 modulemaven-shared-model/module -- +!-- /modules +-- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
svn commit: r697490 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Sun Sep 21 05:39:12 2008 New Revision: 697490 URL: http://svn.apache.org/viewvc?rev=697490view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=697490r1=697489r2=697490view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 21 05:39:12 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId - version10/version + version11-SNAPSHOT/version packagingpom/packaging nameMaven Shared Components/name @@ -145,9 +145,9 @@ -- scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-10/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-10/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-10/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk//url /scm issueManagement systemjira/system
svn commit: r697489 - in /maven/shared/tags/maven-shared-components-10: ./ pom.xml
Author: dennisl Date: Sun Sep 21 05:39:00 2008 New Revision: 697489 URL: http://svn.apache.org/viewvc?rev=697489view=rev Log: [maven-release-plugin] copy for tag maven-shared-components-10 Added: maven/shared/tags/maven-shared-components-10/ - copied from r697482, maven/shared/trunk/ maven/shared/tags/maven-shared-components-10/pom.xml - copied unchanged from r697488, maven/shared/trunk/pom.xml
svn commit: r697497 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Sun Sep 21 05:47:13 2008 New Revision: 697497 URL: http://svn.apache.org/viewvc?rev=697497view=rev Log: o Restore modules after the release of the shared parent. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=697497r1=697496r2=697497view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 21 05:47:13 2008 @@ -111,7 +111,6 @@ /mailingList /mailingLists -!-- modules modulefile-management/module modulemaven-ant/module @@ -135,14 +134,11 @@ modulemaven-shared-monitor/module modulemaven-verifier/module modulemaven-web-ui-tests/module --- !-- Uses jdk 1.5 modulemaven-shared-model/module -- -!-- /modules --- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
