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/01 23:41:58 UTC
svn commit: r905433 - in /labs/magma/trunk/maven-magma-plugin: ./
src/main/java/org/apache/magma/tools/maven/
src/main/resources/org/apache/magma/tools/maven/
Author: simoneg
Date: Mon Feb 1 22:41:57 2010
New Revision: 905433
URL: http://svn.apache.org/viewvc?rev=905433&view=rev
Log:
Configurable target environment
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRunWar.java
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/MagmaWarExploded.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java
labs/magma/trunk/maven-magma-plugin/src/main/resources/org/apache/magma/tools/maven/web.xml
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=905433&r1=905432&r2=905433&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Mon Feb 1 22:41:57 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-rev20</version>
+ <version>0.0.3-rev21</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/MagmaAjcCompileMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java?rev=905433&r1=905432&r2=905433&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java Mon Feb 1 22:41:57 2010
@@ -51,7 +51,8 @@
* The maven project.
*
* @parameter expression="${project}"
- * @required @readonly
+ * @required
+ * @readonly
*/
protected MavenProject project;
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRunWar.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRunWar.java?rev=905433&r1=905432&r2=905433&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRunWar.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRunWar.java Mon Feb 1 22:41:57 2010
@@ -46,9 +46,10 @@
/**
* @goal runwar
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution compile
* @execute phase="process-resources"
* @description Runs a jetty 6 server on the created jar
+ * @author <a href="mailto:simoneg@apache.org">Simone Gianni</a>
*/
public class MagmaJettyRunWar extends MagmaWarExploded {
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=905433&r1=905432&r2=905433&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 Mon Feb 1 22:41:57 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-rev20"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev21"));
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/MagmaWarExploded.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarExploded.java?rev=905433&r1=905432&r2=905433&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarExploded.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarExploded.java Mon Feb 1 22:41:57 2010
@@ -16,7 +16,13 @@
*/
package org.apache.magma.tools.maven;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -63,9 +69,20 @@
FileUtils.copyDirectoryStructure(baseout, classes);
// Setup basic web.xml
- File webxml = new File(webinf, "web.xml");
- FileUtils.copyURLToFile(getClass().getResource("web.xml"), webxml);
+ String env = System.getProperty("magma.env", "prod");
+ File webxml = new File(webinf, "web.xml");
+ InputStream wxstr = getClass().getResourceAsStream("web.xml");
+ BufferedReader br = new BufferedReader(new InputStreamReader(wxstr, "UTF-8"));
+ String line = null;
+ FileWriter fw = new FileWriter(webxml);
+ while ((line = br.readLine()) != null) {
+ line = line.replaceAll("\\$env", env);
+ fw.write(line);
+ fw.write("\n");
+ }
+ fw.close();
+ wxstr.close();
// Override everywthing with custom website if any
File srcwebsite = new File(project.getBasedir(), "src/main/website");
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=905433&r1=905432&r2=905433&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 Mon Feb 1 22:41:57 2010
@@ -26,12 +26,12 @@
import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
-* @goal war
-* @requiresDependencyResolution compile
-* @execute phase="process-resources"
-* @description Magma AspectJ Compiler Plugin.
-* @author <a href="mailto:simoneg@apache.org">Simone Gianni</a>
-*/
+ * @goal war
+ * @requiresDependencyResolution compile
+ * @execute phase="process-resources"
+ * @description Magma AspectJ Compiler Plugin.
+ * @author <a href="mailto:simoneg@apache.org">Simone Gianni</a>
+ */
public class MagmaWarPackaged extends MagmaWarExploded {
/**
Modified: labs/magma/trunk/maven-magma-plugin/src/main/resources/org/apache/magma/tools/maven/web.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/resources/org/apache/magma/tools/maven/web.xml?rev=905433&r1=905432&r2=905433&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/resources/org/apache/magma/tools/maven/web.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/resources/org/apache/magma/tools/maven/web.xml Mon Feb 1 22:41:57 2010
@@ -28,7 +28,7 @@
<servlet-class>org.apache.magma.website.Dispatch</servlet-class>
<init-param>
<param-name>magma.env</param-name>
- <param-value>prod</param-value>
+ <param-value>$env</param-value>
</init-param>
</servlet>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org