You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2010/02/05 15:18:56 UTC
svn commit: r906945 - in /labs/magma/trunk/maven-magma-plugin: pom.xml
src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java
Author: simoneg
Date: Fri Feb 5 14:18:56 2010
New Revision: 906945
URL: http://svn.apache.org/viewvc?rev=906945&view=rev
Log:
Support different war file names
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=906945&r1=906944&r2=906945&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Fri Feb 5 14:18:56 2010
@@ -24,7 +24,7 @@
<groupId>org.apache.magma.tools</groupId>
<artifactId>maven-magma-plugin</artifactId>
<name>Magma Extension Mojo</name>
- <version>0.0.3-rev21</version>
+ <version>0.0.3-rev22</version>
<description>
Provides mojos to compile and test a magma package.
</description>
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java?rev=906945&r1=906944&r2=906945&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java Fri Feb 5 14:18:56 2010
@@ -867,7 +867,7 @@
}
*/
//art = (Artifact) project.getPluginArtifactMap().get(ArtifactUtils.versionlessKey( "org.apache.magma.tools", "maven-magma-plugin"));
- art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev21"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev22"));
artifactResolver.resolve(art, project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java?rev=906945&r1=906944&r2=906945&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java Fri Feb 5 14:18:56 2010
@@ -34,28 +34,39 @@
*/
public class MagmaWarPackaged extends MagmaWarExploded {
+ /**
+ * War file name
+ *
+ * @parameter expression="${war.name}"
+ */
+ protected String warName;
+
/**
- * Directory in which to build the war structure.
+ * Final WAR file
*
* @parameter expression="${project.build.directory}/${project.build.finalName}.war"
- * @required
*/
- protected File warName;
+ protected File warFile;
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
+ if (warName != null) {
+ if (!warName.endsWith(".war")) warName += ".war";
+ warFile = new File(project.getBuild().getDirectory() + "/" + warName);
+ }
+ getLog().info("Producing WAR in " + warFile.getAbsolutePath());
super.execute();
try {
MavenArchiver archiver = new MavenArchiver();
JarArchiver jarArchiver = (JarArchiver) container.lookup("org.codehaus.plexus.archiver.Archiver","jar");
archiver.setArchiver(jarArchiver);
- archiver.setOutputFile(warName);
+ archiver.setOutputFile(warFile);
archiver.getArchiver().addDirectory(webappDirectory);
MavenArchiveConfiguration conf = new MavenArchiveConfiguration();
archiver.createArchive(project, conf);
- projectHelper.attachArtifact(project, "war", null, warName);
+ projectHelper.attachArtifact(project, "war", null, warFile);
} catch (Exception e) {
- throw new RuntimeException("Error creating WAR file " + warName.getAbsolutePath(), e);
+ throw new RuntimeException("Error creating WAR file " + warFile.getAbsolutePath(), e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org