You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/09/09 14:42:57 UTC
svn commit: r693450 -
/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java
Author: djencks
Date: Tue Sep 9 05:42:56 2008
New Revision: 693450
URL: http://svn.apache.org/viewvc?rev=693450&view=rev
Log:
make it possible to specify non-project-artifact plugins to install
Modified:
geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java
Modified: geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java?rev=693450&r1=693449&r2=693450&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java (original)
+++ geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java Tue Sep 9 05:42:56 2008
@@ -57,22 +57,20 @@
private boolean startModules = false;
/**
- * Artifact file
+ * maven artifact
*
- * @parameter expression="${project.build.directory}/${project.build.finalName}.car"
+ * @parameter expression="${project.artifact}"
* @readonly
* @required
*/
- private File artifactFile;
+ private Artifact projectArtifact;
/**
* maven artifact
*
- * @parameter expression="${project.artifact}"
- * @readonly
- * @required
+ * @parameter
*/
- private Artifact artifact;
+ private String moduleId;
/**
* local repository location
@@ -92,11 +90,13 @@
@Override
public void execute() throws MojoExecutionException {
- getLog().info("artifactFile: " + artifactFile);
- getLog().info("artifact: " + artifact);
+ if (moduleId == null) {
+ moduleId = projectArtifact.getGroupId() + "/" + projectArtifact.getArtifactId() + "/" + projectArtifact.getVersion() + "/" + projectArtifact.getType();
+ getLog().info("using project artifact");
+ }
+ getLog().info("moduleId: " + moduleId);
getLog().info("artifactRepository: " + artifactRepository);
- String moduleId = artifact.getGroupId() + "/" + artifact.getArtifactId() + "/" + artifact.getVersion() + "/" + artifact.getType();
org.apache.geronimo.kernel.repository.Artifact geronimoArtifact = org.apache.geronimo.kernel.repository.Artifact.create(moduleId);
PluginListType pluginListType = new PluginListType();