Author: jdcasey
Date: Tue Jul 19 10:15:41 2005
New Revision: 219716
URL: http://svn.apache.org/viewcvs?rev=219716&view=rev
Log:
Removing leftover lifecycle binding for ValidatePomMojo in the
maven-plugin-plugin (removed that last night).
Removed:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/ValidatePluginPomMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/GenerateUpdatedMappingMojo.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/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-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
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=219716&r1=219715&r2=219716&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
Tue Jul 19 10:15:41 2005
@@ -116,7 +116,7 @@
}
- public void install( RepositoryMetadata metadata, ArtifactRepository
local, String remoteRepositoryId )
+ public void install( RepositoryMetadata metadata, ArtifactRepository local
)
throws RepositoryMetadataManagementException
{
File metadataFile = constructLocalRepositoryFile( metadata, local );
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java?rev=219716&r1=219715&r2=219716&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
Tue Jul 19 10:15:41 2005
@@ -14,7 +14,7 @@
void deploy( RepositoryMetadata repositoryMetadata, ArtifactRepository
remote )
throws RepositoryMetadataManagementException;
- void install( RepositoryMetadata repositoryMetadata, ArtifactRepository
local, String remoteRepositoryId )
+ void install( RepositoryMetadata repositoryMetadata, ArtifactRepository
local )
throws RepositoryMetadataManagementException;
void purgeLocalCopy( RepositoryMetadata repositoryMetadata,
ArtifactRepository local )
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=219716&r1=219715&r2=219716&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
Tue Jul 19 10:15:41 2005
@@ -189,14 +189,13 @@
<configuration>
<!-- START SNIPPET: maven-plugin-lifecycle -->
<phases>
- <validate>plugin:validatePom</validate>
<generate-resources>plugin:descriptor</generate-resources>
<process-resources>resources:resources</process-resources>
<compile>compiler:compile</compile>
<process-test-resources>resources:testResources</process-test-resources>
<test-compile>compiler:testCompile</test-compile>
<test>surefire:test</test>
-
<package>jar:jar,plugin:generateUpdatedMapping,plugin:addPluginArtifactMetadata</package>
+ <package>jar:jar,plugin:addPluginArtifactMetadata</package>
<install>install:install,plugin:installMapping</install>
<deploy>deploy:deploy,plugin:deployMapping</deploy>
</phases>
Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java?rev=219716&r1=219715&r2=219716&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
Tue Jul 19 10:15:41 2005
@@ -4,6 +4,7 @@
import org.apache.maven.artifact.metadata.LatestArtifactMetadata;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
/** Inject any plugin-specific artifact metadata to the project's artifact,
for subsequent installation
* and deployment. The first use-case for this is to add the LATEST metadata
(which is plugin-specific)
@@ -18,15 +19,17 @@
/** The project artifact, which should have the LATEST metadata added to
it.
*
- * @parameter expression="${project.artifact}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
- private Artifact projectArtifact;
+ private MavenProject project;
public void execute()
throws MojoExecutionException
{
+ Artifact projectArtifact = project.getArtifact();
+
LatestArtifactMetadata metadata = new LatestArtifactMetadata(
projectArtifact );
metadata.setVersion( projectArtifact.getVersion() );
Modified:
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=219716&r1=219715&r2=219716&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
Tue Jul 19 10:15:41 2005
@@ -19,66 +19,40 @@
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.mapping.metadata.PluginMappingMetadata;
-import org.apache.maven.project.MavenProject;
-
-import java.io.File;
/**
* @goal deployMapping
* @phase deploy
*/
public class PluginMappingDeployMojo
- extends AbstractMojo
+ extends AbstractPluginMappingMojo
{
- /**
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * @parameter
expression="${component.org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager}"
- * @required
- * @readonly
- */
- private RepositoryMetadataManager repositoryMetadataManager;
-
- /**
- * @parameter expression="${project.build.directory}/repository-metadata"
- * @required
- * @readonly
- */
- private String outputDirectory;
-
public void execute()
throws MojoExecutionException
{
- ArtifactRepository distributionRepository =
project.getDistributionManagementArtifactRepository();
+ RepositoryMetadata metadata = new PluginMappingMetadata(
getProject().getGroupId() );
- RepositoryMetadata metadata = new PluginMappingMetadata(
project.getGroupId() );
-
- File updatedMetadataFile = new File( outputDirectory,
metadata.getRepositoryPath() ).getAbsoluteFile();
+ ArtifactRepository distributionRepository =
getProject().getDistributionManagementArtifactRepository();
- if ( !updatedMetadataFile.exists() )
+ if ( distributionRepository == null )
{
- throw new MojoExecutionException( "Cannot find updated " +
metadata + " in file: \'" + updatedMetadataFile + "\'. This seems to indicate
that the 'package' lifecycle phase didn't succeed." );
+ throw new MojoExecutionException( "No distribution repository
specified. You must specify a <distributionManagement/> section with a valid
<repository/> specified within." );
}
-
- metadata.setFile( updatedMetadataFile );
-
+
try
{
- repositoryMetadataManager.deploy( metadata, distributionRepository
);
+ getRepositoryMetadataManager().resolve( metadata,
distributionRepository, getLocalRepository() );
+
+ updatePluginMap( metadata );
+
+ getRepositoryMetadataManager().deploy( metadata,
distributionRepository );
}
catch ( RepositoryMetadataManagementException e )
{
- throw new MojoExecutionException( "Error updating plugin-mapping
metadata.", e );
+ throw new MojoExecutionException( "Failed to install " + metadata,
e );
}
}
Modified:
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=219716&r1=219715&r2=219716&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
Tue Jul 19 10:15:41 2005
@@ -1,73 +1,30 @@
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.mapping.metadata.PluginMappingMetadata;
-import org.apache.maven.project.MavenProject;
-
-import java.io.File;
/**
* @goal installMapping
* @phase install
*/
public class PluginMappingInstallMojo
- extends AbstractMojo
+ extends AbstractPluginMappingMojo
{
- /**
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * @parameter
expression="${component.org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager}"
- * @required
- * @readonly
- */
- private RepositoryMetadataManager repositoryMetadataManager;
-
- /**
- * @parameter expression="${localRepository}"
- * @required
- * @readonly
- */
- private ArtifactRepository localRepository;
-
- /**
- * @parameter expression="${project.build.directory}/repository-metadata"
- * @required
- * @readonly
- */
- private String outputDirectory;
-
public void execute()
throws MojoExecutionException
{
- ArtifactRepository distributionRepository =
project.getDistributionManagementArtifactRepository();
-
- String remoteRepositoryId = distributionRepository.getId();
-
- RepositoryMetadata metadata = new PluginMappingMetadata(
project.getGroupId() );
-
- File updatedMetadataFile = new File( outputDirectory,
metadata.getRepositoryPath() ).getAbsoluteFile();
-
- if ( !updatedMetadataFile.exists() )
- {
- throw new MojoExecutionException( "Cannot find updated " +
metadata + " in file: \'" + updatedMetadataFile + "\'. This seems to indicate
that the 'package' lifecycle phase didn't succeed." );
- }
-
- metadata.setFile( updatedMetadataFile );
+ RepositoryMetadata metadata = new PluginMappingMetadata(
getProject().getGroupId() );
try
{
- repositoryMetadataManager.install( metadata, localRepository,
remoteRepositoryId );
+ getRepositoryMetadataManager().resolveLocally( metadata,
getLocalRepository() );
+
+ updatePluginMap( metadata );
+
+ getRepositoryMetadataManager().install( metadata,
getLocalRepository() );
}
catch ( RepositoryMetadataManagementException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
