harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r617502 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test: adaptor.xml parameters.xml
Date Fri, 01 Feb 2008 14:02:18 GMT
Author: ayza
Date: Fri Feb  1 06:02:16 2008
New Revision: 617502

URL: http://svn.apache.org/viewvc?rev=617502&view=rev
Log:
Support for Tomcat version 6.0.14 was added

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/parameters.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/adaptor.xml?rev=617502&r1=617501&r2=617502&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/adaptor.xml Fri Feb  1 06:02:16
2008
@@ -28,12 +28,12 @@
     <property name="tests.results.dir" location="${results.dir}/${suite.name}/test-results"/>
 
     <property name="catalina.localhost.port.default" value="8080" />
-    <property name="catalina.config.file"  location="${ext.tomcat-5.0.30.location}/conf/server.xml"/>
-    <property name="catalina.base.dir" location="${ext.tomcat-5.0.30.location}"/>
-    <property name="catalina.home.dir" location="${ext.tomcat-5.0.30.location}"/>
-    <property name="catalina.tmp.dir"  location="${ext.tomcat-5.0.30.location}/temp"/>
+    <property name="catalina.config.file"  location="${ext.tomcat-6.0.14.location}/conf/server.xml"/>
+    <property name="catalina.base.dir" location="${ext.tomcat-6.0.14.location}"/>
+    <property name="catalina.home.dir" location="${ext.tomcat-6.0.14.location}"/>
+    <property name="catalina.tmp.dir"  location="${ext.tomcat-6.0.14.location}/temp"/>
     <property name="catalina.out.file" location="${results.dir}/${suite.name}/catalina.out"/>
-    <property name="catalina.maxwait" value="180"/>
+    <property name="catalina.maxwait" value="1800"/>
 
     <property name="tomcat.deploy.app.name" value="struts2-showcase-2.0.6"/>
 
@@ -282,7 +282,7 @@
           target: -start-server                      
          - - - - - - - - - - - - - - - - - -->
     <target name="-start-server" depends="-set-server-port,-reset-server-port" >
-        <server-java output="${catalina.out.file}" append="false" arg="start" />
+        <server-java output="${catalina.out.file}" append="false" arg="start"/>
     </target>
 
     <!-- - - - - - - - - - - - - - - - - - 
@@ -290,7 +290,7 @@
          - - - - - - - - - - - - - - - - - -->
     <target name="-start-server-for-setup" depends="-set-server-port,-reset-server-port"
>
         <server-java jvm="${req.driver.java.home}/bin/java"
-            output="${catalina.out.file}" append="false" arg="start" />
+            output="${catalina.out.file}" append="false" arg="start"/>
     </target>
 
     <!-- - - - - - - - - - - - - - - - - - 
@@ -312,11 +312,12 @@
           target: -stop-server                      
          - - - - - - - - - - - - - - - - - -->
     <target name="-stop-server">
-        <parallel failonany="true">
-            <server-java output="${catalina.out.file}" append="true" arg="stop" />
+        <parallel failonany="false">
+            <server-java output="${catalina.out.file}" append="true" arg="stop"/>
             <waitfor maxwait="${catalina.maxwait}" maxwaitunit="second" timeoutproperty="failed.timeout">
                 <isfileselected file="${catalina.out.file}">
-                    <contains text="INFO: Stopping Coyote HTTP/1.1 on http-" />
+                    <!--contains text="INFO: Stopping Coyote HTTP/1.1 on http-" /-->
+                    <contains text="Stopping service Catalina"/>
                 </isfileselected>
             </waitfor>
         </parallel>
@@ -329,7 +330,7 @@
     <target name="-stop-server-for-setup">
         <parallel failonany="true">
             <server-java jvm="${req.driver.java.home}/bin/java"
-                output="${catalina.out.file}" append="true" arg="stop" />
+                output="${catalina.out.file}" append="true" arg="stop"/>
             <waitfor maxwait="${catalina.maxwait}" maxwaitunit="second"
                 timeoutproperty="failed.timeout">
                 <isfileselected file="${catalina.out.file}">
@@ -344,27 +345,30 @@
           target: -prepare-run
          - - - - - - - - - - - - - - - - - -->
     <target name="-prepare-run">
-        <copy file="${req.test.java.home}/lib/boot/bootclasspath.properties"
+        <!-- Outdated, newer versions of Tomcat does not contain MX4J -->
+
+        <!--copy file="${req.test.java.home}/lib/boot/bootclasspath.properties"
             tofile="${req.test.java.home}/lib/boot/bootclasspath.properties.bak"
             failonerror="false"
-        />
-        <replaceregexp
+        /-->
+        <!--replaceregexp
             file="${req.test.java.home}/lib/boot/bootclasspath.properties"
             match="(bootclasspath.*/mx4j.*\.jar)"
             replace="#\1"
             flags="g"
-        />
+        /-->
     </target>
 
     <!-- - - - - - - - - - - - - - - - - - 
           target: -finish-run                      
          - - - - - - - - - - - - - - - - - -->
     <target name="-finish-run">
-        <move file="${req.test.java.home}/lib/boot/bootclasspath.properties.bak"
+        <!-- Outdated, see -prepare-run -->
+        <!--move file="${req.test.java.home}/lib/boot/bootclasspath.properties.bak"
             tofile="${req.test.java.home}/lib/boot/bootclasspath.properties"
             overwrite="true"
             failonerror="false"
-        />
+        /-->
     </target>
 
 
@@ -406,6 +410,7 @@
         <attribute name="output"/>
         <attribute name="append"/>
         <attribute name="arg"/>
+        <attribute name="failOnError" default="false"/>
         <sequential  >
         <condition property="vm.options"
             value="${struts_test.parameters.optional.tested.vm.options}"
@@ -414,7 +419,7 @@
         </condition>
         <java jvm="@{jvm}"
             fork="true"
-            failonerror="true"
+            failonerror="@{failOnError}"
             errorproperty="failed.server.java"
             classname="org.apache.catalina.startup.Bootstrap"
             output="@{output}"

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/parameters.xml?rev=617502&r1=617501&r2=617502&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/struts_test/parameters.xml Fri Feb  1
06:02:16 2008
@@ -54,10 +54,10 @@
             url="http://downloads.sourceforge.net/junit/junit4.1.zip"
             md5="e66d3e77c70b3297f2c6a12990fc3120"
         />
-        <tomcat-5.0.30
-            url="http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip"
-            md5="8d5c3150f7b8b04dd78e38d653259132"
-            dir="jakarta-tomcat-5.0.30"
+        <tomcat-6.0.14
+            url="http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.14/bin/apache-tomcat-6.0.14.zip"
+            md5="43c87fe61a3f10d8d4509afea25c8e30"
+            dir="apache-tomcat-6.0.14"
         />
         <struts-2.0.6
             url="http://archive.apache.org/dist/struts/binaries/struts-2.0.6-all.zip"



Mime
View raw message