geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r984550 - in /geronimo/tck/branches/3.0: jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java pom.xml validator-tck-runner/README.TXT validator-tck-runner/pom.xml
Date Wed, 11 Aug 2010 19:35:04 GMT
Author: dwoods
Date: Wed Aug 11 19:35:04 2010
New Revision: 984550

URL: http://svn.apache.org/viewvc?rev=984550&view=rev
Log:
use geronimo-maven-plugin to allow assemblies to be extracted and used for automated builds

Modified:
    geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java
    geronimo/tck/branches/3.0/pom.xml
    geronimo/tck/branches/3.0/validator-tck-runner/README.TXT
    geronimo/tck/branches/3.0/validator-tck-runner/pom.xml

Modified: geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java?rev=984550&r1=984549&r2=984550&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java
(original)
+++ geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/ProcessLauncher.java
Wed Aug 11 19:35:04 2010
@@ -25,9 +25,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.logging.*;
 
 public abstract class ProcessLauncher {
 
+    private static Logger logger = Logger.getLogger("org.apache.geronimo.testharness.ProcessLauncher");
     private String directory;
     private List<String> cmd;
     private long timeout = 2* 60 * 1000;
@@ -36,6 +38,7 @@ public abstract class ProcessLauncher {
     public ProcessLauncher(String directory, List<String> cmd) { 
         this.directory = directory;
         this.cmd = cmd;
+        logger.info("created with directory=" + directory + ", cmd=" + cmd);
     }
     
     public void start() throws IOException {
@@ -45,6 +48,7 @@ public abstract class ProcessLauncher {
             builder.directory(new File(directory));
         }
 
+        logger.info("starting server");
         process = builder.start();
         
         OutputThread outputThread = new OutputThread(process.getInputStream(), new FilterOutputStream(System.out)
{
@@ -57,6 +61,7 @@ public abstract class ProcessLauncher {
         long sleepTime = 0;
         while (isProcessRunning() && sleepTime < timeout) {
             if (isServerRunning()) {
+                logger.info("started server");
                 return;
             } else {
                 try {
@@ -87,6 +92,7 @@ public abstract class ProcessLauncher {
     
     public void destroy() {
         if (process != null) {
+            logger.info("killing server");
             process.destroy();
         }
     }

Modified: geronimo/tck/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/pom.xml?rev=984550&r1=984549&r2=984550&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/pom.xml (original)
+++ geronimo/tck/branches/3.0/pom.xml Wed Aug 11 19:35:04 2010
@@ -131,13 +131,21 @@
 
                         <optionSets>
                             <optionSet>
+                                <id>default</id>
+                                <options>
+                                    <option>-Xmx512m</option>
+                                    <option>-XX:MaxPermSize=256m</option>
+                                    <option>-XX:+HeapDumpOnOutOfMemoryError</option>
+                                    <option>-enableassertions</option>
+                                </options>
+                            </optionSet>
+                            <optionSet>
                                 <id>morememory</id>
                                 <options>
                                     <option>-Xmx1024m</option>
-                                    <option>-XX:MaxPermSize=256m</option>
+                                    <option>-XX:MaxPermSize=512m</option>
                                 </options>
                             </optionSet>
-
                             <optionSet>
                                 <id>debug</id>
                                 <options>

Modified: geronimo/tck/branches/3.0/validator-tck-runner/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/validator-tck-runner/README.TXT?rev=984550&r1=984549&r2=984550&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/validator-tck-runner/README.TXT (original)
+++ geronimo/tck/branches/3.0/validator-tck-runner/README.TXT Wed Aug 11 19:35:04 2010
@@ -1,7 +1,19 @@
 Running the TCK
 ===============
 
-Execute:
+To execute against an existing Geronimo installation:
 
-mvn test -Dincontainer -Dgeronimo.home=<Geronimo installation directory>
+  mvn test -Dincontainer -Dgeronimo.home=<Geronimo installation directory>
+
+To extract a new Geronimo assembly to the target directory for the tests:
+
+ mvn clean test -Dincontainer -Dgeronimo-assembly -DassemblyId=tomcat7-javaee6
+or 
+ mvn clean test -Pincontainer,geronimo-assembly -DassemblyId=tomcat7-javaee6
+
+where assemblyId can be one of:
+    tomcat7-javaee6
+    tomcat7-javaee6-web
+    jetty8-javaee6
+    jetty8-javaee6-web
 

Modified: geronimo/tck/branches/3.0/validator-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/validator-tck-runner/pom.xml?rev=984550&r1=984549&r2=984550&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/validator-tck-runner/pom.xml (original)
+++ geronimo/tck/branches/3.0/validator-tck-runner/pom.xml Wed Aug 11 19:35:04 2010
@@ -157,8 +157,40 @@
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <profile>
+            <id>geronimo-assembly</id>
+            <activation>
+                <property>
+                    <name>geronimo-assembly</name>
+                </property>
+            </activation>
+            <properties>
+                <geronimo.home>${project.build.directory}/geronimo-${assemblyId}-${geronimoVersion}</geronimo.home>
+                <!-- Geronimo assembly configuration -->
+                <assemblyId>${assemblyId}</assemblyId>
+            </properties>
+            <build>
+            <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-assembly</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>install-assembly</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            </plugins>
+            </build>
+        </profile>
+
+        <profile>
             <id>incontainer-debug</id>
             <activation>
                 <property>
@@ -171,6 +203,7 @@
                 </remote.debug>
             </properties>
         </profile>
+
         <profile>
             <id>incontainer</id>
             <activation>
@@ -202,7 +235,7 @@
                                 </property>
                                 <property>
                                     <name>JAVA_OPTS</name>
-                                    <value>-Xms128m -Xmx384m -XX:MaxPermSize=128m 
+                                    <value>-Xms128m -Xmx512m -XX:MaxPermSize=256m 
                                         -Djline.terminal=jline.UnsupportedTerminal
                                         -Dvalidation.provider=${validation.provider} ${remote.debug}
                                     </value>
@@ -229,6 +262,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>write-artifacts-to-disk</id>
             <activation>



Mime
View raw message