You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/07/11 18:13:36 UTC
svn commit: r210153 - in /maven/components/trunk:
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/
maven-artifact-manager/src/main/java/org/apache/maven/a...
Author: jdcasey
Date: Mon Jul 11 09:13:33 2005
New Revision: 210153
URL: http://svn.apache.org/viewcvs?rev=210153&view=rev
Log:
[MNG-377] Resolving.
Added new mojos to the plugin-plugin that will update the plugins.xml mapping metadata in the plugin's group on the distribution repository.
Added:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java (with props)
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java (with props)
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java (with props)
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java (with props)
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java
maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/metadata/PluginMappingMetadata.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Jul 11 09:13:33 2005
@@ -104,7 +104,7 @@
{
getLogger().info( "Uploading " + metadata );
- putRemoteFile( repository, source, metadata.getRepositoryPath(), null );
+ putRemoteFile( repository, source, repository.formatAsFile( metadata.getRepositoryPath() ), null );
}
private void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
@@ -254,7 +254,7 @@
public void getRepositoryMetadata( RepositoryMetadata metadata, ArtifactRepository remoteRepository, File destination )
throws TransferFailedException, ResourceDoesNotExistException
{
- String remotePath = metadata.getRepositoryPath();
+ String remotePath = remoteRepository.formatAsFile( metadata.getRepositoryPath() );
getLogger().info( "Retrieving " + metadata );
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java Mon Jul 11 09:13:33 2005
@@ -64,9 +64,14 @@
return layout.pathOfMetadata( artifactMetadata );
}
- public String formatDirectory( String directory )
+ public String formatAsDirectory( String directory )
{
- return layout.formatDirectory( directory );
+ return layout.formatAsDirectory( directory );
+ }
+
+ public String formatAsFile( String file )
+ {
+ return layout.formatAsFile( file );
}
public String getSnapshotPolicy()
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Mon Jul 11 09:13:33 2005
@@ -4,49 +4,81 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
+import java.io.IOException;
public class DefaultRepositoryMetadataManager
+ extends AbstractLogEnabled
implements RepositoryMetadataManager
{
// component requirement
private WagonManager wagonManager;
- public void get( RepositoryMetadata metadata, ArtifactRepository remote, ArtifactRepository local )
+ public void resolve( RepositoryMetadata metadata, ArtifactRepository remote, ArtifactRepository local, String remoteId )
throws RepositoryMetadataManagementException
{
- String realignedPath = local.formatDirectory( metadata.getRepositoryPath() );
+ String metadataPath = local.formatAsFile( metadata.getRepositoryPath() );
- realignedPath = realignedPath.replace( File.separatorChar, '/' );
+ String realignedPath = metadataPath.replace( File.separatorChar, '/' );
if ( !realignedPath.startsWith( "/" ) )
{
realignedPath = "/" + realignedPath;
}
- realignedPath = "/REPOSITORY-INF/" + remote.getId() + realignedPath;
+ realignedPath = "/REPOSITORY-INF/" + remoteId + realignedPath;
File metadataFile = new File( local.getBasedir(), realignedPath );
- try
- {
- wagonManager.getRepositoryMetadata( metadata, remote, metadataFile );
-
- metadata.setFile( metadataFile );
- }
- catch ( TransferFailedException e )
+ if ( remote == null )
{
- throw new RepositoryMetadataManagementException( metadata, "Failed to download repository metadata.", e );
- }
- catch ( ResourceDoesNotExistException e )
- {
- throw new RepositoryMetadataManagementException( metadata, "Remote repository metadata not found.", e );
+ if ( metadataFile.exists() )
+ {
+ getLogger().warn( "Cannot retrieve repository metadata for: " + metadataPath + ". Using locally cached version instead." );
+
+ getLogger().debug( "Error retrieving repository metadata: " + metadataPath + ". Reason: repository is null." );
+
+ metadata.setFile( metadataFile );
+ }
+ else
+ {
+ throw new RepositoryMetadataManagementException( metadata, "Cannot retrieve repository metadata from null repository." );
+ }
+ }
+ else
+ {
+ try
+ {
+ wagonManager.getRepositoryMetadata( metadata, remote, metadataFile );
+
+ metadata.setFile( metadataFile );
+ }
+ catch ( TransferFailedException e )
+ {
+ throw new RepositoryMetadataManagementException( metadata, "Failed to download repository metadata.", e );
+ }
+ catch ( ResourceDoesNotExistException e )
+ {
+ if ( metadataFile.exists() )
+ {
+ getLogger().warn( "Cannot find repository metadata for: " + metadataPath + ". Using locally cached version instead." );
+ getLogger().debug( "Error retrieving repository metadata: " + metadataPath, e );
+
+ metadata.setFile( metadataFile );
+ }
+ else
+ {
+ throw new RepositoryMetadataManagementException( metadata, "Remote repository metadata not found.", e );
+ }
+ }
}
}
- public void put( RepositoryMetadata metadata, ArtifactRepository remote )
+ public void deploy( RepositoryMetadata metadata, ArtifactRepository remote )
throws RepositoryMetadataManagementException
{
File metadataFile = metadata.getFile();
@@ -62,6 +94,40 @@
throw new RepositoryMetadataManagementException( metadata, "Failed to upload repository metadata.", e );
}
+ }
+
+ public void install( RepositoryMetadata metadata, ArtifactRepository local, String remoteRepositoryId )
+ throws RepositoryMetadataManagementException
+ {
+ String realignedPath = local.formatAsFile( metadata.getRepositoryPath() );
+
+ realignedPath = realignedPath.replace( File.separatorChar, '/' );
+
+ if ( !realignedPath.startsWith( "/" ) )
+ {
+ realignedPath = "/" + realignedPath;
+ }
+
+ realignedPath = "/REPOSITORY-INF/" + remoteRepositoryId + realignedPath;
+
+ File metadataFile = new File( local.getBasedir(), realignedPath ).getAbsoluteFile();
+
+ try
+ {
+ File dir = metadataFile.getParentFile();
+
+ if ( !dir.exists() )
+ {
+ dir.mkdirs();
+ }
+
+ FileUtils.copyFile( metadata.getFile(), metadataFile );
+ }
+ catch ( IOException e )
+ {
+ throw new RepositoryMetadataManagementException( metadata, "Failed to install repository metadata.", e );
+ }
+
}
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java Mon Jul 11 09:13:33 2005
@@ -47,7 +47,9 @@
String pathOfMetadata( ArtifactMetadata artifactMetadata );
- String formatDirectory( String directory );
+ String formatAsDirectory( String directory );
+
+ String formatAsFile( String file );
String getUrl();
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java Mon Jul 11 09:13:33 2005
@@ -31,5 +31,7 @@
String pathOfMetadata( ArtifactMetadata metadata );
- String formatDirectory( String directory );
+ String formatAsDirectory( String directory );
+
+ String formatAsFile( String file );
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java Mon Jul 11 09:13:33 2005
@@ -33,7 +33,7 @@
StringBuffer path = new StringBuffer();
- path.append( formatDirectory( artifact.getGroupId() ) ).append( '/' );
+ path.append( formatAsDirectory( artifact.getGroupId() ) ).append( '/' );
path.append( artifact.getArtifactId() ).append( '/' );
path.append( artifact.getBaseVersion() ).append( '/' );
path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() );
@@ -55,7 +55,7 @@
{
StringBuffer path = new StringBuffer();
- path.append( formatDirectory( metadata.getGroupId() ) ).append( '/' );
+ path.append( formatAsDirectory( metadata.getGroupId() ) ).append( '/' );
path.append( metadata.getArtifactId() ).append( '/' );
if ( !metadata.getBaseVersion().equals( "RELEASE" ) )
{
@@ -67,8 +67,26 @@
return path.toString();
}
- public String formatDirectory( String directory )
+ public String formatAsDirectory( String directory )
{
return directory.replace( '.', '/' );
+ }
+
+ public String formatAsFile( String file )
+ {
+ int lastSlash = file.lastIndexOf('/');
+
+ if( lastSlash > -1 )
+ {
+ String filePart = file.substring( lastSlash );
+
+ String dirPart = file.substring( 0, lastSlash );
+
+ return dirPart.replace('.', '/') + filePart;
+ }
+ else
+ {
+ return file;
+ }
}
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java Mon Jul 11 09:13:33 2005
@@ -59,9 +59,13 @@
return path.toString();
}
- public String formatDirectory( String directory )
+ public String formatAsDirectory( String directory )
{
return directory;
}
-
+
+ public String formatAsFile( String file )
+ {
+ return file;
+ }
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java Mon Jul 11 09:13:33 2005
@@ -7,8 +7,8 @@
String getRepositoryPath();
- void setFile( File metadataFile );
-
File getFile();
+
+ void setFile( File file );
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java Mon Jul 11 09:13:33 2005
@@ -6,13 +6,6 @@
private final RepositoryMetadata metadata;
- public RepositoryMetadataManagementException( RepositoryMetadata metadata )
- {
- super( "Failed to resolve repository metadata: " + metadata + ".");
-
- this.metadata = metadata;
- }
-
public RepositoryMetadataManagementException( RepositoryMetadata metadata, String message, Throwable cause )
{
super( "Failed to resolve repository metadata: " + metadata + ". Error was: " + cause.getMessage(), cause );
@@ -22,11 +15,11 @@
public RepositoryMetadataManagementException( RepositoryMetadata metadata, String message )
{
- super( "Failed to resolve repository metadata: " + metadata + ".");
+ super( "Failed to resolve repository metadata: " + metadata + "." );
this.metadata = metadata;
}
-
+
public RepositoryMetadata getMetadata()
{
return metadata;
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java Mon Jul 11 09:13:33 2005
@@ -5,10 +5,13 @@
public interface RepositoryMetadataManager
{
- void get( RepositoryMetadata repositoryMetadata, ArtifactRepository remote, ArtifactRepository local )
+ void resolve( RepositoryMetadata repositoryMetadata, ArtifactRepository remote, ArtifactRepository local, String remoteRepositoryId )
throws RepositoryMetadataManagementException;
- void put( RepositoryMetadata repositoryMetadata, ArtifactRepository remote )
+ void deploy( RepositoryMetadata repositoryMetadata, ArtifactRepository remote )
+ throws RepositoryMetadataManagementException;
+
+ void install( RepositoryMetadata repositoryMetadata, ArtifactRepository local, String remoteRepositoryId )
throws RepositoryMetadataManagementException;
}
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Jul 11 09:13:33 2005
@@ -193,8 +193,8 @@
<test-compile>compiler:testCompile</test-compile>
<test>surefire:test</test>
<package>jar:jar</package>
- <install>install:install</install>
- <deploy>deploy:deploy</deploy>
+ <install>install:install,plugin:install-mapping</install>
+ <deploy>deploy:deploy,plugin:deploy-mapping</deploy>
</phases>
<!-- END SNIPPET: maven-plugin-lifecycle -->
</configuration>
Modified: maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java (original)
+++ maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java Mon Jul 11 09:13:33 2005
@@ -93,7 +93,7 @@
try
{
- repositoryMetadataManager.get( metadata, repository, localRepository );
+ repositoryMetadataManager.resolve( metadata, repository, localRepository, repository.getId() );
break;
}
Modified: maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/metadata/PluginMappingMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/metadata/PluginMappingMetadata.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/metadata/PluginMappingMetadata.java (original)
+++ maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/metadata/PluginMappingMetadata.java Mon Jul 11 09:13:33 2005
@@ -32,5 +32,10 @@
{
return metadataFile;
}
+
+ public String toString()
+ {
+ return PLUGIN_MAPPING_FILE + " (plugin mappings) for group: \'" + groupId + "\'";
+ }
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml Mon Jul 11 09:13:33 2005
@@ -34,5 +34,25 @@
<version>2.0-beta-1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-mapping</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=210153&r1=210152&r2=210153&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java Mon Jul 11 09:13:33 2005
@@ -50,6 +50,8 @@
/**
* The goal prefix that will appear before the ":".
+ *
+ * @parameter
*/
protected String goalPrefix;
Added: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java?rev=210153&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java Mon Jul 11 09:13:33 2005
@@ -0,0 +1,159 @@
+package org.apache.maven.plugin.plugin.metadata;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManagementException;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+
+import java.io.File;
+
+public abstract class AbstractMetadataPublisherMojo
+ extends AbstractMojo
+{
+
+ /**
+ * @parameter
+ */
+ private String goalPrefix;
+
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * @parameter expression="${localRepository}"
+ * @required
+ * @readonly
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * @parameter expression="${project.build.directory}/repository-metadata"
+ * @required
+ * @readonly
+ */
+ private String outputDirectory;
+
+ /**
+ * @parameter expression="${component.org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager}"
+ * @required
+ * @readonly
+ */
+ private RepositoryMetadataManager repositoryMetadataManager;
+
+ protected String getGroupId()
+ {
+ return project.getGroupId();
+ }
+
+ protected String getArtifactId()
+ {
+ return project.getArtifactId();
+ }
+
+ protected String getGoalPrefix()
+ {
+ if ( goalPrefix == null )
+ {
+ goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId( getArtifactId() );
+ }
+
+ return goalPrefix;
+ }
+
+ protected void publish( boolean doDeploy )
+ throws MojoExecutionException
+ {
+ ArtifactRepository distributionRepository = project.getDistributionManagementArtifactRepository();
+
+ String remoteRepositoryId = "local";
+
+ if( distributionRepository != null )
+ {
+ remoteRepositoryId = distributionRepository.getId();
+ }
+ else if ( doDeploy )
+ {
+ throw new MojoExecutionException( "You must provide a distribution repository for your plugin." );
+ }
+
+ RepositoryMetadata metadata = createMetadataInstance();
+
+ try
+ {
+ repositoryMetadataManager.resolve( metadata, distributionRepository, localRepository, remoteRepositoryId );
+ }
+ catch ( RepositoryMetadataManagementException e )
+ {
+ Throwable cause = e.getCause();
+
+ if ( cause == null || ( cause instanceof ResourceDoesNotExistException ) )
+ {
+ getLog().debug( "Cannot find remote repository metadata for: " + metadata.getRepositoryPath() + "; creating new metadata resource..." );
+
+ metadata.setFile( null );
+ }
+ else
+ {
+ throw new MojoExecutionException( "Cannot retrieve plugin-mapping metadata for: "
+ + metadata.getRepositoryPath(), e );
+ }
+ }
+
+ updateMetadata( metadata );
+
+ if ( distributionRepository != null )
+ {
+ try
+ {
+ repositoryMetadataManager.install( metadata, localRepository, remoteRepositoryId );
+ }
+ catch ( RepositoryMetadataManagementException e )
+ {
+ throw new MojoExecutionException( "Error installing plugin-mapping metadata to local repository.", e );
+ }
+
+ if ( doDeploy )
+ {
+ try
+ {
+ repositoryMetadataManager.deploy( metadata, distributionRepository );
+ }
+ catch ( RepositoryMetadataManagementException e )
+ {
+ throw new MojoExecutionException(
+ "Error deploying plugin-mapping metadata to distribution repository: "
+ + distributionRepository.getId(), e );
+ }
+ }
+ }
+ }
+
+ protected File getMetadataFile( String path )
+ {
+ File metadataFile = new File( outputDirectory, path ).getAbsoluteFile();
+
+ File dir = metadataFile.getParentFile();
+
+ if ( !dir.exists() )
+ {
+ dir.mkdirs();
+ }
+
+ return metadataFile;
+ }
+
+ protected abstract void updateMetadata( RepositoryMetadata metadata )
+ throws MojoExecutionException;
+
+ protected abstract RepositoryMetadata createMetadataInstance();
+
+}
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractMetadataPublisherMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java?rev=210153&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java Mon Jul 11 09:13:33 2005
@@ -0,0 +1,125 @@
+package org.apache.maven.plugin.plugin.metadata;
+
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.mapping.MappedPlugin;
+import org.apache.maven.plugin.mapping.PluginMap;
+import org.apache.maven.plugin.mapping.io.xpp3.PluginMappingXpp3Reader;
+import org.apache.maven.plugin.mapping.io.xpp3.PluginMappingXpp3Writer;
+import org.apache.maven.plugin.mapping.metadata.PluginMappingMetadata;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Iterator;
+
+public abstract class AbstractPluginMappingPublisherMojo
+ extends AbstractMetadataPublisherMojo
+{
+
+ protected RepositoryMetadata createMetadataInstance()
+ {
+ return new PluginMappingMetadata( getGroupId() );
+ }
+
+ protected void updateMetadata( RepositoryMetadata metadata ) throws MojoExecutionException
+ {
+ PluginMappingXpp3Reader mappingReader = new PluginMappingXpp3Reader();
+
+ PluginMap pluginMap = null;
+
+ Reader reader = null;
+
+ File metadataFile = metadata.getFile();
+
+ if ( metadataFile != null )
+ {
+ try
+ {
+ reader = new FileReader( metadataFile );
+
+ pluginMap = mappingReader.read( reader );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Cannot read plugin-mapping metadata from file: " + metadataFile, e );
+ }
+ catch ( XmlPullParserException e )
+ {
+ throw new MojoExecutionException( "Cannot parse plugin-mapping metadata from file: " + metadataFile, e );
+ }
+ finally
+ {
+ IOUtil.close( reader );
+ }
+ }
+ else
+ {
+ pluginMap = new PluginMap();
+
+ pluginMap.setGroupId( getGroupId() );
+ }
+
+ MappedPlugin mappedPlugin = new MappedPlugin();
+
+ mappedPlugin.setArtifactId( getArtifactId() );
+
+ mappedPlugin.setPrefix( getGoalPrefix() );
+
+ boolean prefixAlreadyMapped = false;
+
+ for ( Iterator it = pluginMap.getPlugins().iterator(); it.hasNext(); )
+ {
+ MappedPlugin preExisting = (MappedPlugin) it.next();
+
+ if ( preExisting.getPrefix().equals( getGoalPrefix() ) )
+ {
+ prefixAlreadyMapped = true;
+
+ if ( !preExisting.getArtifactId().equals( getArtifactId() ) )
+ {
+ // TODO: In this case, should we rather just replace the existing plugin mapping??
+
+ throw new MojoExecutionException( "Cannot map plugin to it's prefix in plugins.xml metadata; the prefix: \'" + getGoalPrefix() + "\' is already mapped to: " + preExisting.getArtifactId() );
+ }
+ else
+ {
+ getLog().info( "NOT updating plugins.xml metadata; this plugin is already mapped." );
+ }
+ }
+ }
+
+ if ( !prefixAlreadyMapped )
+ {
+ pluginMap.addPlugin( mappedPlugin );
+
+ Writer writer = null;
+ try
+ {
+ metadataFile = getMetadataFile( metadata.getRepositoryPath() );
+
+ writer = new FileWriter( metadataFile );
+
+ PluginMappingXpp3Writer mappingWriter = new PluginMappingXpp3Writer();
+
+ mappingWriter.write( writer, pluginMap );
+
+ metadata.setFile( metadataFile );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Error writing repository metadata to build directory.", e );
+ }
+ finally
+ {
+ IOUtil.close( writer );
+ }
+ }
+ }
+
+}
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingPublisherMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java?rev=210153&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java Mon Jul 11 09:13:33 2005
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin.plugin.metadata;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * @goal deploy-mapping
+ * @phase deploy
+ */
+public class PluginMappingDeployMojo
+ extends AbstractPluginMappingPublisherMojo
+{
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ publish( true );
+ }
+
+}
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java?rev=210153&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java Mon Jul 11 09:13:33 2005
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin.plugin.metadata;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * @goal install-mapping
+ * @phase install
+ */
+public class PluginMappingInstallMojo
+ extends AbstractPluginMappingPublisherMojo
+{
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ publish( false );
+ }
+
+}
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org