svn commit: r417352 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/AbstractWarMojo.java test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java test/resou
Author: brett
Date: Mon Jun 26 23:13:10 2006
New Revision: 417352
URL: http://svn.apache.org/viewvc?rev=417352view=rev
Log:
[MWAR-47] correctly handle timestamps when unpacking files from WAR
Added:
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple-updated.war
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.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=417352r1=417351r2=417352view=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 Jun 26 23:13:10 2006
@@ -16,19 +16,19 @@
* limitations under the License.
*/
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -417,9 +417,7 @@
* @param filterProperties
* @throws java.io.IOException if an error occured while copying
webResources
*/
-public void copyResources( Resource resource,
- File webappDirectory,
- Properties filterProperties )
+public void copyResources( Resource resource, File webappDirectory,
Properties filterProperties )
throws IOException
{
if ( !resource.getDirectory().equals( webappDirectory.getPath() ) )
@@ -458,8 +456,7 @@
* @param webappDirectory the target directory
* @throws java.io.IOException if an error occured while copying
webResources
*/
-public void copyResources( File sourceDirectory,
- File webappDirectory )
+public void copyResources( File sourceDirectory, File webappDirectory )
throws IOException
{
if ( !sourceDirectory.equals( webappDirectory ) )
@@ -518,8 +515,7 @@
* @param webappDirectory
* @throws java.io.IOException if an error occured while building the
webapp
*/
-public void buildWebapp( MavenProject project,
- File webappDirectory )
+public void buildWebapp( MavenProject project, File webappDirectory )
throws MojoExecutionException, IOException
{
getLog().info( Assembling webapp + project.getArtifactId() + in
+ webappDirectory );
@@ -689,8 +685,7 @@
* @param file File to be unpacked.
* @param location Location where to put the unpacked files.
*/
-private void unpack( File file,
- File location )
+private void unpack( File file, File location )
throws MojoExecutionException, NoSuchArchiverException
{
String archiveExt = FileUtils.getExtension( file.getAbsolutePath()
).toLowerCase();
@@ -700,6 +695,7 @@
UnArchiver unArchiver = archiverManager.getUnArchiver( archiveExt
);
unArchiver.setSourceFile( file );
unArchiver.setDestDirectory( location );
+unArchiver.setOverwrite( true );
unArchiver.extract();
}
catch ( IOException e )
@@ -719,8 +715,7 @@
* @param srcDirDirectory containing unpacked dependent war contents
* @param targetDir Directory to overlay srcDir into
*/
-private void copyDependentWarContents( File srcDir,
- File targetDir )
+private void copyDependentWarContents( File srcDir, File targetDir )
throws MojoExecutionException
{
DirectoryScanner scanner = new DirectoryScanner();
@@ -744,19 +739,14 @@
{
File targetFile = new File( targetDir, files[j] );
-//
svn commit: r417357 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Author: brett
Date: Mon Jun 26 23:46:27 2006
New Revision: 417357
URL: http://svn.apache.org/viewvc?rev=417357view=rev
Log:
[MWAR-35] use canonical file to avoid long paths causing problems on Windows
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=417357r1=417356r2=417357view=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 Jun 26 23:46:27 2006
@@ -925,7 +925,7 @@
// to plexus-utils 1.2.
if ( destination.lastModified() source.lastModified() )
{
-FileUtils.copyFile( source, destination );
+FileUtils.copyFile( source.getCanonicalFile(), destination );
// preserve timestamp
destination.setLastModified( source.lastModified() );
}
svn commit: r417359 - /maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Author: brett
Date: Mon Jun 26 23:53:52 2006
New Revision: 417359
URL: http://svn.apache.org/viewvc?rev=417359view=rev
Log:
clean up test
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=417359r1=417358r2=417359view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Mon Jun 26 23:53:52 2006
@@ -30,11 +30,12 @@
import org.apache.maven.plugin.war.stub.TLDArtifactStub;
import org.codehaus.plexus.util.FileUtils;
+import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
import java.io.FileWriter;
+import java.io.StringReader;
import java.util.LinkedList;
-import java.util.StringTokenizer;
+import java.util.List;
public class WarExplodedMojoTest
extends AbstractWarMojoTest
@@ -59,12 +60,6 @@
assertNotNull( mojo );
}
-public void testEnvironment()
-throws Exception
-{
-// see setUp
-}
-
/**
* @throws Exception
*/
@@ -541,7 +536,7 @@
File sampleResource = new File( webAppResource, custom-setting.cfg );
File sampleResourceWDir = new File( webAppResource,
custom-config/custom-setting.cfg );
File filterFile = new File( getTestDirectory(), testId +
-test-data/filters/filter.properties );
-LinkedList filterList = new LinkedList();
+List filterList = new LinkedList();
ResourceStub[] resources = new ResourceStub[]{new ResourceStub()};
createFile( sampleResource );
@@ -550,9 +545,9 @@
filterList.add( filterFile.getAbsolutePath() );
// prepare web resources and filters
-String filterData = new String( resource_key=${resource_value}\n );
-String systemData = new String( system_key=${user.dir}\n );
-String projectProp = new String( project_key=${is_this_simple}\n );
+String filterData = resource_key=${resource_value}\n;
+String systemData = system_key=${user.dir}\n;
+String projectProp = project_key=${is_this_simple}\n;
FileWriter writer = new FileWriter( sampleResourceWDir );
writer.write( filterData + systemData + projectProp );
writer.flush();
@@ -562,9 +557,8 @@
writer.flush();
writer.close();
-String filterString = new String( resource_value=this_is_filtered );
writer = new FileWriter( filterFile );
-writer.write( filterString );
+writer.write( resource_value=this_is_filtered );
writer.flush();
writer.close();
@@ -589,22 +583,15 @@
expectedResourceWDirFile.exists() );
// validate filtered file
-FileReader reader = new FileReader( expectedResourceWDirFile );
-char[] data = new char[1024];
-StringTokenizer tokenizer;
-
-reader.read( data );
-tokenizer = new StringTokenizer( String.valueOf( data ), \n );
-
-String token = tokenizer.nextToken();
-assertTrue( error in filtering using filter files, token.equals(
resource_key=this_is_filtered ) );
-
-token = tokenizer.nextToken();
-assertTrue( error in filtering using System properties,
-token.equals( system_key= + System.getProperty(
user.dir ) ) );
+String content = FileUtils.fileRead( expectedResourceWDirFile );
+BufferedReader reader = new BufferedReader( new StringReader( content
) );
+
+assertEquals( error in filtering using filter files,
resource_key=this_is_filtered, reader.readLine() );
+
+assertEquals( error in filtering using System properties,
reader.readLine(),
+ system_key= + System.getProperty( user.dir ) );
-token = tokenizer.nextToken();
-assertTrue( error in filtering using project properties,
token.equals( project_key=i_think_so ) );
+assertEquals( error in filtering using project properties,
project_key=i_think_so, reader.readLine() );
}
public void testExplodedWar_WithSourceIncludeExclude()
svn commit: r417362 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ test/java/org/apache/maven/plugin/war/
Author: brett
Date: Tue Jun 27 00:30:32 2006
New Revision: 417362
URL: http://svn.apache.org/viewvc?rev=417362view=rev
Log:
[MWAR-41] align filtering to assembly/resources (filter project properties)
Added:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/CompositeMap.java
(with props)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java
- copied, changed from r417334,
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.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=417362r1=417361r2=417362view=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
Tue Jun 27 00:30:32 2006
@@ -50,6 +50,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -346,7 +347,7 @@
List webResources = this.webResources != null ? Arrays.asList(
this.webResources ) : null;
if ( webResources != null webResources.size() 0 )
{
-Properties filterProperties = getBuildFilterProperties();
+Map filterProperties = getBuildFilterProperties();
for ( Iterator it = webResources.iterator(); it.hasNext(); )
{
Resource resource = (Resource) it.next();
@@ -377,11 +378,11 @@
}
}
-private Properties getBuildFilterProperties()
+private Map getBuildFilterProperties()
throws MojoExecutionException
{
// System properties
-Properties filterProperties = new Properties( System.getProperties() );
+Map filterProperties = new Properties( System.getProperties() );
// Project properties
filterProperties.putAll( project.getProperties() );
@@ -401,7 +402,9 @@
throw new MojoExecutionException( Error loading property file
' + filtersfile + ', e );
}
}
-return filterProperties;
+
+// can't putAll, as ReflectionProperties doesn't enumerate - so we
make a composite map with the project variables as dominant
+return new CompositeMap( new ReflectionProperties( project ),
filterProperties );
}
/**
@@ -417,7 +420,7 @@
* @param filterProperties
* @throws java.io.IOException if an error occured while copying
webResources
*/
-public void copyResources( Resource resource, File webappDirectory,
Properties filterProperties )
+public void copyResources( Resource resource, File webappDirectory, Map
filterProperties )
throws IOException
{
if ( !resource.getDirectory().equals( webappDirectory.getPath() ) )
@@ -496,7 +499,7 @@
{
archiver.getArchiver().addDirectory( classesDirectory,
getIncludes(), getExcludes() );
-archiver.createArchive( getProject(), archive );
+archiver.createArchive( project, archive );
}
catch ( Exception e )
{
@@ -837,7 +840,7 @@
// support ${token}
new FilterWrapper()
{
-public Reader getReader( Reader fileReader, Properties
filterProperties )
+public Reader getReader( Reader fileReader, Map
filterProperties )
{
return new InterpolationFilterReader( fileReader,
filterProperties, ${, } );
}
@@ -845,7 +848,7 @@
// support @token@
new FilterWrapper()
{
-public Reader getReader( Reader fileReader, Properties
filterProperties )
+public Reader getReader( Reader fileReader, Map
filterProperties )
{
return new InterpolationFilterReader( fileReader,
filterProperties, @, @ );
}
@@ -861,7 +864,7 @@
* @throws IOException TO DO: Remove this method when Maven moves to
plexus-utils version 1.4
*/
private static void copyFilteredFile( File from, File to, String encoding,
FilterWrapper[] wrappers,
- Properties filterProperties )
+ Map filterProperties )
throws
svn commit: r417364 - /maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Author: brett Date: Tue Jun 27 00:45:03 2006 New Revision: 417364 URL: http://svn.apache.org/viewvc?rev=417364view=rev Log: test filtering overwrites when changed Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=417364r1=417363r2=417364view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java Tue Jun 27 00:45:03 2006 @@ -591,6 +591,28 @@ assertEquals( error in filtering using System properties, system_property=system-property-value, reader.readLine() ); + +// update property, and generate again +System.setProperty( system.property, new-system-property-value ); + +mojo.execute(); + +// validate filtered file +content = FileUtils.fileRead( expectedResourceWDirFile ); +reader = new BufferedReader( new StringReader( content ) ); + +assertEquals( error in filtering using filter files, resource_key=this_is_filtered, reader.readLine() ); + +assertEquals( error in filtering using System properties, system_key= + System.getProperty( user.dir ), + reader.readLine() ); + +assertEquals( error in filtering using project properties, project_key=i_think_so, reader.readLine() ); + +assertEquals( error in filtering using project properties, project_name=Test Project , reader.readLine() ); + +assertEquals( error in filtering using System properties, system_property=new-system-property-value, + reader.readLine() ); + } public void testExplodedWar_WithSourceIncludeExclude()
svn commit: r417386 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: brett Date: Tue Jun 27 02:32:36 2006 New Revision: 417386 URL: http://svn.apache.org/viewvc?rev=417386view=rev Log: use released testing framework Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=417386r1=417385r2=417386view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Tue Jun 27 02:32:36 2006 @@ -37,10 +37,10 @@ version2.0/version /dependency dependency - groupIdorg.apache.maven/groupId + groupIdorg.apache.maven.shared/groupId artifactIdmaven-plugin-testing-harness/artifactId - scopetest/scope - version1.0-SNAPSHOT/version + scopetest/scope + version1.0-beta-1/version /dependency /dependencies /project
svn commit: r417396 - /maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Author: fgiust
Date: Tue Jun 27 03:10:51 2006
New Revision: 417396
URL: http://svn.apache.org/viewvc?rev=417396view=rev
Log:
avoid NPEs for non-existing build/plugins elements in POM
Modified:
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Modified:
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=417396r1=417395r2=417396view=diff
==
---
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
(original)
+++
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Tue Jun 27 03:10:51 2006
@@ -194,27 +194,37 @@
protected PlexusConfiguration extractPluginConfiguration( String
artifactId, Xpp3Dom pomDom )
throws Exception
{
-Xpp3Dom[] pluginElements = pomDom.getChild( build ).getChild(
plugins ).getChildren();
-
Xpp3Dom pluginConfigurationElement = null;
-for ( int i = 0; i pluginElements.length; i++ )
+Xpp3Dom buildElement = pomDom.getChild( build );
+if ( buildElement != null )
{
-Xpp3Dom pluginElement = pluginElements[i];
-
-String pluginElementArtifactId = pluginElement.getChild(
artifactId ).getValue();
+Xpp3Dom pluginsRootElement = buildElement.getChild( plugins );
-if ( pluginElementArtifactId.equals( artifactId ) )
+if ( pluginsRootElement != null )
{
-pluginConfigurationElement = pluginElement.getChild(
configuration );
+Xpp3Dom[] pluginElements = pluginsRootElement.getChildren();
+
+for ( int i = 0; i pluginElements.length; i++ )
+{
+Xpp3Dom pluginElement = pluginElements[i];
+
+String pluginElementArtifactId = pluginElement.getChild(
artifactId ).getValue();
+
+if ( pluginElementArtifactId.equals( artifactId ) )
+{
+pluginConfigurationElement = pluginElement.getChild(
configuration );
-break;
+break;
+}
+}
}
}
if ( pluginConfigurationElement == null )
{
-throw new ConfigurationException( Cannot find a configuration
element for a plugin with an artifactId of + artifactId + . );
+throw new ConfigurationException( Cannot find a configuration
element for a plugin with an artifactId of
++ artifactId + . );
}
return new XmlPlexusConfiguration( pluginConfigurationElement );
svn commit: r417436 - in /maven/plugins/trunk/maven-repository-plugin/src: main/java/org/apache/maven/plugins/repository/ test/java/org/apache/maven/plugins/repository/ test/resources/repo/ test/resou
Author: fgiust
Date: Tue Jun 27 04:44:19 2006
New Revision: 417436
URL: http://svn.apache.org/viewvc?rev=417436view=rev
Log:
adding tests for bundle-pack goal
Added:
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java
(with props)
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/1.0/
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/1.0/testartifact-1.0-javadoc.jar
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/1.0/testartifact-1.0-sources.jar
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/1.0/testartifact-1.0.jar
maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testartifact/1.0/testartifact-1.0.pom
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack/
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=417436r1=417435r2=417436view=diff
==
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Tue Jun 27 04:44:19 2006
@@ -57,7 +57,7 @@
/**
* @parameter
expression=${component.org.codehaus.plexus.archiver.Archiver#jar}
*/
-private JarArchiver jarArchiver;
+protected JarArchiver jarArchiver;
/**
* Artifact resolver.
@@ -66,7 +66,7 @@
* @required
* @readonly
*/
-private ArtifactResolver artifactResolver;
+protected ArtifactResolver artifactResolver;
/**
* Artifact factory.
@@ -87,29 +87,29 @@
protected ArtifactRepository localRepository;
/**
- * @parameter expression=${groupId}
+ * @component
*/
-private String groupId;
+protected InputHandler inputHandler;
/**
- * @parameter expression=${artifactId}
+ * @parameter expression=${basedir}
*/
-private String artifactId;
+protected String basedir;
/**
- * @parameter expression=${version}
+ * @parameter expression=${groupId}
*/
-private String version;
+protected String groupId;
/**
- * @component
+ * @parameter expression=${artifactId}
*/
-private InputHandler inputHandler;
+protected String artifactId;
/**
- * @parameter expression=${basedir}
+ * @parameter expression=${version}
*/
-private String basedir;
+protected String version;
public void execute()
throws MojoExecutionException
Added:
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java?rev=417436view=auto
==
---
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java
(added)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java
Tue Jun 27 04:44:19 2006
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.maven.plugins.repository;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Enumeration;
+
+import
svn commit: r417465 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: brett Date: Tue Jun 27 07:17:59 2006 New Revision: 417465 URL: http://svn.apache.org/viewvc?rev=417465view=rev Log: [maven-release-plugin] prepare release maven-deploy-plugin-2.2.1 Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=417465r1=417464r2=417465view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Tue Jun 27 07:17:59 2006 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8?project +?xml version=1.0 encoding=UTF-8?project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId @@ -8,7 +8,7 @@ artifactIdmaven-deploy-plugin/artifactId packagingmaven-plugin/packaging nameMaven Deploy Plugin/name - version2.2.1-SNAPSHOT/version + version2.2.1/version inceptionYear2004/inceptionYear dependencies dependency @@ -43,4 +43,10 @@ version1.0-beta-1/version /dependency /dependencies + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/url + /scm /project
svn commit: r417466 - in /maven/plugins/tags/maven-deploy-plugin-2.2.1: ./ pom.xml
Author: brett Date: Tue Jun 27 07:18:08 2006 New Revision: 417466 URL: http://svn.apache.org/viewvc?rev=417466view=rev Log: [maven-scm] copy for tag maven-deploy-plugin-2.2.1 Added: maven/plugins/tags/maven-deploy-plugin-2.2.1/ - copied from r417385, maven/plugins/trunk/maven-deploy-plugin/ maven/plugins/tags/maven-deploy-plugin-2.2.1/pom.xml - copied unchanged from r417465, maven/plugins/trunk/maven-deploy-plugin/pom.xml
svn commit: r417467 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: brett Date: Tue Jun 27 07:18:15 2006 New Revision: 417467 URL: http://svn.apache.org/viewvc?rev=417467view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=417467r1=417466r2=417467view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Tue Jun 27 07:18:15 2006 @@ -8,7 +8,7 @@ artifactIdmaven-deploy-plugin/artifactId packagingmaven-plugin/packaging nameMaven Deploy Plugin/name - version2.2.1/version + version2.2.2-SNAPSHOT/version inceptionYear2004/inceptionYear dependencies dependency @@ -43,10 +43,4 @@ version1.0-beta-1/version /dependency /dependencies - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.2.1/url - /scm /project
svn commit: r417588 - in /maven/sandbox/plugins/maven-maven1-plugin: ./ src/main/java/org/apache/maven/maven1converter/ src/main/java/org/apache/maven/maven1converter/relocators/
Author: dennisl Date: Tue Jun 27 14:16:37 2006 New Revision: 417588 URL: http://svn.apache.org/viewvc?rev=417588view=rev Log: Add plugin relocators that handle plugins that has changed their groupId and/or artifactId between Maven 1 and Maven 2. A plugin relocator is a plexus component. To add a new plugin relocator you just add a class that implements the PluginRelocator interface. Added: maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/ maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java (with props) maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java (with props) Modified: maven/sandbox/plugins/maven-maven1-plugin/pom.xml maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java Modified: maven/sandbox/plugins/maven-maven1-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/pom.xml?rev=417588r1=417587r2=417588view=diff == --- maven/sandbox/plugins/maven-maven1-plugin/pom.xml (original) +++ maven/sandbox/plugins/maven-maven1-plugin/pom.xml Tue Jun 27 14:16:37 2006 @@ -44,6 +44,18 @@ /execution /executions /plugin + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +version1.2/version +executions + execution +goals + goaldescriptor/goal +/goals + /execution +/executions + /plugin /plugins /build reporting @@ -78,7 +90,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId - scopetest/scope + version1.0-alpha-9/version /dependency dependency groupIdorg.codehaus.plexus/groupId Modified: maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java?rev=417588r1=417587r2=417588view=diff == --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java (original)
svn commit: r417592 - in /maven/sandbox/plugins/maven-maven1-plugin/src: main/java/org/apache/maven/maven1converter/ main/java/org/apache/maven/maven1converter/plugins/ test/java/org/apache/maven/mave
Author: dennisl
Date: Tue Jun 27 14:50:49 2006
New Revision: 417592
URL: http://svn.apache.org/viewvc?rev=417592view=rev
Log:
Add PluginConfigurationConverters for maven-changelog-plugin and
maven-taglist-plugin
Added:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest1.properties
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest2.properties
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest3.properties
(with props)
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCTaglistTest.properties
(with props)
Modified:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java
Modified:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java?rev=417592r1=417591r2=417592view=diff
==
---
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java
(original)
+++
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java
Tue Jun 27 14:50:49 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.maven1converter.plugins.PCCChangelog;
import org.apache.maven.maven1converter.plugins.PCCChanges;
import org.apache.maven.maven1converter.plugins.PCCCheckstyle;
import org.apache.maven.maven1converter.plugins.PCCCompiler;
@@ -24,6 +25,7 @@
import org.apache.maven.maven1converter.plugins.PCCMultiproject;
import org.apache.maven.maven1converter.plugins.PCCPmd;
import org.apache.maven.maven1converter.plugins.PCCSurefire;
+import org.apache.maven.maven1converter.plugins.PCCTaglist;
import org.apache.maven.maven1converter.plugins.PCCWar;
import org.apache.maven.maven1converter.plugins.PluginConfigurationConverter;
import org.apache.maven.maven1converter.relocators.PluginRelocator;
@@ -75,6 +77,7 @@
* Available converters for specific plugin configurations
*/
private PluginConfigurationConverter[] converters = new
PluginConfigurationConverter[] {
+new PCCChangelog(),
new PCCChanges(),
new PCCCheckstyle(),
new PCCCompiler(),
@@ -83,6 +86,7 @@
new PCCMultiproject(),
new PCCPmd(),
new PCCSurefire(),
+new PCCTaglist(),
new PCCWar() };
/**
Added:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java?rev=417592view=auto
==
---
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
(added)
+++
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
Tue Jun 27 14:50:49 2006
@@ -0,0 +1,91 @@
+package org.apache.maven.maven1converter.plugins;
+
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+import java.util.Properties;
+
+/**
+ * A codePluginConfigurationConverter/code for the maven-changelog-plugin.
+ *
+ * @author Dennis Lundberg
+ * @version $Id: PCCChangelog.java 409264 2006-05-24 23:13:13 + (on, 24
maj 2006) carlos $
+ */
+public class PCCChangelog extends
svn commit: r417638 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: AbstractWarMojo.java WarExplodedMojo.java WarInPlaceMojo.java WarMojo.java
Author: brett
Date: Tue Jun 27 19:13:48 2006
New Revision: 417638
URL: http://svn.apache.org/viewvc?rev=417638view=rev
Log:
[MWAR-52] fix error reporting when webXml is missing
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/WarExplodedMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.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=417638r1=417637r2=417638view=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
Tue Jun 27 19:13:48 2006
@@ -23,6 +23,7 @@
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -330,7 +331,7 @@
}
public void buildExplodedWebapp( File webappDirectory )
-throws MojoExecutionException
+throws MojoExecutionException, MojoFailureException
{
getLog().info( Exploding webapp... );
@@ -359,6 +360,11 @@
if ( webXml != null StringUtils.isNotEmpty( webXml.getName() ) )
{
+if ( !webXml.exists() )
+{
+throw new MojoFailureException( The specified web.xml
file ' + webXml + ' does not exist );
+}
+
//rename to web.xml
copyFileIfModified( webXml, new File( webinfDir, /web.xml )
);
}
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=417638r1=417637r2=417638view=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
Tue Jun 27 19:13:48 2006
@@ -17,6 +17,7 @@
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
/**
* Generate the exploded webapp
@@ -28,7 +29,8 @@
public class WarExplodedMojo
extends AbstractWarMojo
{
-public void execute() throws MojoExecutionException
+public void execute()
+throws MojoExecutionException, MojoFailureException
{
buildExplodedWebapp( getWebappDirectory() );
}
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=417638r1=417637r2=417638view=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
Tue Jun 27 19:13:48 2006
@@ -17,6 +17,7 @@
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
/**
* Generates webapp in the source directory
@@ -27,7 +28,8 @@
public class WarInPlaceMojo
extends AbstractWarMojo
{
-public void execute() throws MojoExecutionException
+public void execute()
+throws MojoExecutionException, MojoFailureException
{
getLog().info( Generating webapp in source directory... +
getWarSourceDirectory() );
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=417638r1=417637r2=417638view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
svn commit: r417642 - /maven/shared/trunk/pom.xml
Author: brett Date: Tue Jun 27 19:49:19 2006 New Revision: 417642 URL: http://svn.apache.org/viewvc?rev=417642view=rev Log: release version 2 of the 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=417642r1=417641r2=417642view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Jun 27 19:49:19 2006 @@ -12,7 +12,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId packagingpom/packaging - version2-SNAPSHOT/version + version2/version nameMaven Shared Components/name descriptionMaven shared components/description urlhttp://maven.apache.org/shared//url
svn commit: r417643 - /maven/shared/trunk/pom.xml
Author: brett Date: Tue Jun 27 19:50:00 2006 New Revision: 417643 URL: http://svn.apache.org/viewvc?rev=417643view=rev Log: bump version for development Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=417643r1=417642r2=417643view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Jun 27 19:50:00 2006 @@ -12,7 +12,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId packagingpom/packaging - version2/version + version3-SNAPSHOT/version nameMaven Shared Components/name descriptionMaven shared components/description urlhttp://maven.apache.org/shared//url
svn commit: r417644 - /maven/shared/trunk/maven-archiver/pom.xml
Author: brett Date: Tue Jun 27 19:50:47 2006 New Revision: 417644 URL: http://svn.apache.org/viewvc?rev=417644view=rev Log: update parent Modified: maven/shared/trunk/maven-archiver/pom.xml Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=417644r1=417643r2=417644view=diff == --- maven/shared/trunk/maven-archiver/pom.xml (original) +++ maven/shared/trunk/maven-archiver/pom.xml Tue Jun 27 19:50:47 2006 @@ -2,7 +2,7 @@ parent artifactIdmaven-shared-components/artifactId groupIdorg.apache.maven.shared/groupId -version2-SNAPSHOT/version +version2/version /parent modelVersion4.0.0/modelVersion groupIdorg.apache.maven/groupId
svn commit: r417646 - /maven/shared/trunk/maven-archiver/pom.xml
Author: brett Date: Tue Jun 27 19:54:30 2006 New Revision: 417646 URL: http://svn.apache.org/viewvc?rev=417646view=rev Log: [maven-release-plugin] prepare release maven-archiver-2.1 Modified: maven/shared/trunk/maven-archiver/pom.xml Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=417646r1=417645r2=417646view=diff == --- maven/shared/trunk/maven-archiver/pom.xml (original) +++ maven/shared/trunk/maven-archiver/pom.xml Tue Jun 27 19:54:30 2006 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8?project +?xml version=1.0 encoding=UTF-8?project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent artifactIdmaven-shared-components/artifactId groupIdorg.apache.maven.shared/groupId @@ -8,7 +8,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId nameMaven Archiver/name - version2.1-SNAPSHOT/version + version2.1/version dependencies dependency groupIdorg.apache.maven/groupId @@ -26,4 +26,10 @@ version2.0/version /dependency /dependencies + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/url + /scm /project
svn commit: r417647 - in /maven/shared/tags/maven-archiver-2.1: ./ pom.xml
Author: brett Date: Tue Jun 27 19:54:37 2006 New Revision: 417647 URL: http://svn.apache.org/viewvc?rev=417647view=rev Log: [maven-scm] copy for tag maven-archiver-2.1 Added: maven/shared/tags/maven-archiver-2.1/ - copied from r417639, maven/shared/trunk/maven-archiver/ maven/shared/tags/maven-archiver-2.1/pom.xml - copied unchanged from r417646, maven/shared/trunk/maven-archiver/pom.xml
svn commit: r417648 - /maven/shared/trunk/maven-archiver/pom.xml
Author: brett Date: Tue Jun 27 19:54:42 2006 New Revision: 417648 URL: http://svn.apache.org/viewvc?rev=417648view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-archiver/pom.xml Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=417648r1=417647r2=417648view=diff == --- maven/shared/trunk/maven-archiver/pom.xml (original) +++ maven/shared/trunk/maven-archiver/pom.xml Tue Jun 27 19:54:42 2006 @@ -8,7 +8,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId nameMaven Archiver/name - version2.1/version + version2.2-SNAPSHOT/version dependencies dependency groupIdorg.apache.maven/groupId @@ -26,10 +26,4 @@ version2.0/version /dependency /dependencies - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.1/url - /scm /project
svn commit: r417649 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: brett Date: Tue Jun 27 20:05:29 2006 New Revision: 417649 URL: http://svn.apache.org/viewvc?rev=417649view=rev Log: [maven-release-plugin] prepare release maven-war-plugin-2.0.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=417649r1=417648r2=417649view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Tue Jun 27 20:05:29 2006 @@ -8,7 +8,7 @@ artifactIdmaven-war-plugin/artifactId packagingmaven-plugin/packaging nameMaven War Plugin/name - version2.0.1-SNAPSHOT/version + version2.0.1/version prerequisites maven2.0.1/maven /prerequisites @@ -21,7 +21,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId - version2.1-SNAPSHOT/version + version2.1/version /dependency dependency groupIdorg.codehaus.plexus/groupId @@ -46,4 +46,10 @@ scopetest/scope /dependency /dependencies + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/url + /scm /project
svn commit: r417650 - in /maven/plugins/tags/maven-war-plugin-2.0.1: ./ pom.xml
Author: brett Date: Tue Jun 27 20:05:38 2006 New Revision: 417650 URL: http://svn.apache.org/viewvc?rev=417650view=rev Log: [maven-scm] copy for tag maven-war-plugin-2.0.1 Added: maven/plugins/tags/maven-war-plugin-2.0.1/ - copied from r417639, maven/plugins/trunk/maven-war-plugin/ maven/plugins/tags/maven-war-plugin-2.0.1/pom.xml - copied unchanged from r417649, maven/plugins/trunk/maven-war-plugin/pom.xml
svn commit: r417651 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: brett Date: Tue Jun 27 20:05:42 2006 New Revision: 417651 URL: http://svn.apache.org/viewvc?rev=417651view=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=417651r1=417650r2=417651view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Tue Jun 27 20:05:42 2006 @@ -8,7 +8,7 @@ artifactIdmaven-war-plugin/artifactId packagingmaven-plugin/packaging nameMaven War Plugin/name - version2.0.1/version + version2.1-SNAPSHOT/version prerequisites maven2.0.1/maven /prerequisites @@ -46,10 +46,4 @@ scopetest/scope /dependency /dependencies - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.0.1/url - /scm /project
svn commit: r417674 - in /maven/repository-manager/trunk: maven-repository-converter/src/main/java/org/apache/maven/repository/converter/ maven-repository-core/src/main/java/org/apache/maven/repositor
Author: brett
Date: Tue Jun 27 22:45:08 2006
New Revision: 417674
URL: http://svn.apache.org/viewvc?rev=417674view=rev
Log:
clean up some issues and bugs highlighted by inspections
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java
maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DefaultDigester.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BaseAction.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/IndexConfigurationAction.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SchedulerConfigurationAction.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/execution/DiscovererExecution.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/utils/ConfigurationManager.java
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java?rev=417674r1=417673r2=417674view=diff
==
---
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
Tue Jun 27 22:45:08 2006
@@ -105,9 +105,7 @@
*/
private I18N i18n;
-public void convert( Artifact artifact,
- ArtifactRepository targetRepository,
- ArtifactReporter reporter )
+public void convert( Artifact artifact, ArtifactRepository
targetRepository, ArtifactReporter reporter )
throws RepositoryConversionException
{
if ( artifact.getRepository().getUrl().equals(
targetRepository.getUrl() ) )
@@ -165,15 +163,13 @@
return metadata;
}
-private void updateMetadata( RepositoryMetadata artifactMetadata,
- ArtifactRepository sourceRepository,
- ArtifactRepository targetRepository,
- Metadata newMetadata,
+private void updateMetadata( RepositoryMetadata artifactMetadata,
ArtifactRepository sourceRepository,
+ ArtifactRepository targetRepository, Metadata
newMetadata,
FileTransaction transaction )
throws RepositoryConversionException
{
Metadata metadata;
-boolean changed = false;
+boolean changed;
//merge with target repository metadata
File file = new File( targetRepository.getBasedir(),
@@ -198,7 +194,7 @@
if ( srcfile.exists() )
{
Metadata sourceMetadata = readMetadata( srcfile );
-changed = changed | metadata.merge( sourceMetadata );
+changed = changed || metadata.merge( sourceMetadata );
}
}
@@ -256,8 +252,7 @@
return metadata;
}
-private boolean validateMetadata( Artifact artifact,
- ArtifactReporter reporter )
+private boolean validateMetadata( Artifact artifact, ArtifactReporter
reporter )
