cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1416528 - in /cocoon/subprojects/cocoon-it-fw/trunk: pom.xml src/changes/changes.xml src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java
Date Mon, 03 Dec 2012 14:08:43 GMT
Author: ilgrosso
Date: Mon Dec  3 14:08:42 2012
New Revision: 1416528

URL: http://svn.apache.org/viewvc?rev=1416528&view=rev
Log:
Make the 'org.apache.cocoon.mode' configurable via systemProperties

Modified:
    cocoon/subprojects/cocoon-it-fw/trunk/pom.xml
    cocoon/subprojects/cocoon-it-fw/trunk/src/changes/changes.xml
    cocoon/subprojects/cocoon-it-fw/trunk/src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java

Modified: cocoon/subprojects/cocoon-it-fw/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-it-fw/trunk/pom.xml?rev=1416528&r1=1416527&r2=1416528&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-it-fw/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-it-fw/trunk/pom.xml Mon Dec  3 14:08:42 2012
@@ -103,7 +103,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.2</version>
+        <version>2.3.2</version>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-it-fw/tags/</tagBase>
         </configuration>

Modified: cocoon/subprojects/cocoon-it-fw/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-it-fw/trunk/src/changes/changes.xml?rev=1416528&r1=1416527&r2=1416528&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-it-fw/trunk/src/changes/changes.xml (original)
+++ cocoon/subprojects/cocoon-it-fw/trunk/src/changes/changes.xml Mon Dec  3 14:08:42 2012
@@ -24,6 +24,11 @@
 -->
 <document> 
   <body>
+    <release version="1.0.1-SNAPSHOT">
+      <action dev="ilgrosso" type="add">
+        Make the 'org.apache.cocoon.mode' configurable via systemProperties.
+      </action>   
+    </release>
     <release version="1.0.0" date="2012-06-08" description="released">
       <action dev="ilgrosso" type="add">
         Setting POM parent to Cocoon 9.

Modified: cocoon/subprojects/cocoon-it-fw/trunk/src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-it-fw/trunk/src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java?rev=1416528&r1=1416527&r2=1416528&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-it-fw/trunk/src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java
(original)
+++ cocoon/subprojects/cocoon-it-fw/trunk/src/main/java/org/apache/cocoon/maven/test/jetty/JettyStarterMojo.java
Mon Dec  3 14:08:42 2012
@@ -17,20 +17,20 @@
 package org.apache.cocoon.maven.test.jetty;
 
 import java.io.File;
-
+import java.util.Properties;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Start a Jetty container to run the Cocoon integration tests.
- * 
+ *
  * @goal jetty-start
  */
 public class JettyStarterMojo extends AbstractMojo {
 
     /**
      * The absolute path to the web application under test.
-     * 
+     *
      * @parameter
      * @required
      */
@@ -38,7 +38,7 @@ public class JettyStarterMojo extends Ab
 
     /**
      * The HTTP port of the container.
-     * 
+     *
      * @parameter
      */
     private int port = 8888;
@@ -46,7 +46,7 @@ public class JettyStarterMojo extends Ab
     /**
      * Keep the container running. This keeps the Maven process in a while loop after the
container has been started.
      * This is useful for debugging the 'integration-test' phase.
-     * 
+     *
      * @parameter expression="${keepRunning}"
      */
     private boolean keepRunning = false;
@@ -58,20 +58,28 @@ public class JettyStarterMojo extends Ab
 
     /**
      * Don't start the container.
-     * 
+     *
      * @parameter
      */
     private boolean skip;
 
+    /**
+     * System properties to be set - currently supporting only 'org.apache.cocoon.mode',
'dev' by default.
+     * 
+     * @parameter
+     */
+    private Properties systemProperties;
+
     public void execute() throws MojoExecutionException {
         if (this.skip) {
             this.getLog().info("Skip starting server environment.");
             return;
         }
         try {
-            System.setProperty("org.apache.cocoon.mode", "dev");
-            System.setProperty("net.sourceforge.cobertura.datafile", new File(this.builddir,
"cobertura.ser")
-                    .getAbsolutePath());
+            System.setProperty("org.apache.cocoon.mode",
+                    this.systemProperties.getProperty("org.apache.cocoon.mode", "dev"));
+            System.setProperty("net.sourceforge.cobertura.datafile",
+                    new File(this.builddir, "cobertura.ser").getAbsolutePath());
             new JettyContainer().start("/", this.webAppDirectory.getAbsolutePath(), this.port);
             if (this.keepRunning) {
                 while (true) {



Mime
View raw message