harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r538471 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/JettyScenario/README.txt adaptors/JettyScenario/adaptor.xml adaptors/JettyScenario/cc-config.xml adaptors/JettyScenario/parameters.xml tests/JettyScenario/src/JettyTestCase.java
Date Wed, 16 May 2007 08:15:47 GMT
Author: smishura
Date: Wed May 16 01:15:46 2007
New Revision: 538471

URL: http://svn.apache.org/viewvc?view=rev&rev=538471
Log:
Apply patch from HARMONY-3530 - fixes for jetty testing scenarion

Removed:
    harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/cc-config.xml
Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/README.txt
    harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario/src/JettyTestCase.java

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/README.txt?view=diff&rev=538471&r1=538470&r2=538471
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/README.txt (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/README.txt Wed May 16 01:15:46
2007
@@ -2,13 +2,13 @@
                          Jetty automated scenario
                          ========================    
 
----------------
-Archive Content
----------------
-
-This archive contains automated scenario which performs user-like actions such
-as viewing and navigating with browser through web site hosted by Mortbay*
-Jetty application server.
+--------------
+Scenario files
+--------------
+
+This is automated scenario which performs user-like actions such as viewing
+and navigating with browser through web site hosted by Mortbay* Jetty
+application server. The scenario consists of the following files:
 
  +/
   |-+adaptors/             - Adaptors connecting test suites to Build Test
@@ -19,17 +19,17 @@
   |     |
   |     |--parameters.xml  - Parameters file
   |     |
-  |     |--cc-config.xml   - Cruise Control configuration file
-  |
-  |-+tests/                - Tests suites placed under Build Test repository
-  |  |
-  |  |-+JettyScenario/     - Jetty scenario root directory
-  |     |
-  |     |-+resources/      - Resources required for Jetty scenario
+  |     |--publisher.xml   - publisher for running in Cruise Control mode
   |     |
-  |     |-+src/            - Jetty scenario sources
+  |     |--README.txt      - This readme file
   |
-  |-README.txt             - Readme File
+  |-+tests/                - Tests suites placed under Build Test repository
+     |
+     |-+JettyScenario/     - Jetty scenario root directory
+        |
+        |-+resources/      - Resources required for Jetty scenario
+        |
+        |-+src/            - Jetty scenario sources
 
 
 ----------------
@@ -86,9 +86,9 @@
 
 The following steps should by made to run Jetty scenario:
 
-1. Check out Build Test installer from SVN
+1. Check out Build Test from SVN
 
-     svn co -r HEAD -N http://svn.apache.org/repos/asf/harmony/enhanced/buildtest/trunk
+     svn co -r HEAD -N http://svn.apache.org/repos/asf/harmony/enhanced/buildtest/branches/2.0
 
 2. Setup Build Test and required suites with the following command:
 
@@ -120,31 +120,6 @@
    or
 
      ant -Dtest.suites=JettyScenario run-cc
-
-
------------------
-Known limitations
------------------
-
-If you want to try this scenario without checkouts of BT and the scenario from
-SVN, you should do the following:
-
-1. Download BT from JIRA: http://issues.apache.org/jira/browse/HARMONY-3501
-
-2. Unzip BT into some directory (e.g. WORKDIR)
-
-3. Unzip this archive into WORKDIR
-
-4. Copy directory JettyScenario from WORKDIR/tests to WORKDIR/build/checkouts
-
-5. Comment in WORKDIR/adaptors/JettyScenario/adaptor.xml all tasks starting:
-
-     <exec executable="svn" ...
-
-   there should be only two tasks (first in setup target and second in update
-   one).
-
-6. Make steps from 2nd of above instructions (scenario execution).
 
 
 -----------------------------------------------

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/adaptor.xml?view=diff&rev=538471&r1=538470&r2=538471
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/adaptor.xml Wed May 16
01:15:46 2007
@@ -20,112 +20,103 @@
      ====================================================================== -->
 <project name="JettyScenario" default="run" basedir=".">
 
-    <condition property="ps" value="\" else="/">
-            <os family="Windows"/>
-    </condition>
-    <property name="scenario.dir" location="${checkouts.dir}${ps}${suite.name}"/>
-    <property name="scenario.bin.dir" location="${scenario.dir}${ps}classes"/>
-    <property name="scenario.results.dir" location="${scenario.dir}${ps}results"/>
+    <property name="scenario.dir" location="${checkouts.dir}/${suite.name}"/>
+    <property name="scenario.src.dir" location="${test.sources.dir}/${suite.name}"/>
+    <property name="scenario.bin.dir" location="${scenario.dir}/classes"/>
+    <property name="scenario.results.dir" location="${results.dir}/${suite.name}"/>
 
     <target name="setup">
-        <condition property="ps" value="\" else="/">
-            <os family="Windows"/>
-        </condition>
-        <log message="============= Adaptor for ${suite.name}: Set Up .."/>
-        <log message=""/>
-        <log message="=== External dependencies ========================"/>
-        <log message="Jetty exists:      ${JettyScenario.parameters.external.jetty-6.1.2rc1.exists}"/>
-        <log message="Jetty basename:    ${JettyScenario.parameters.external.jetty-6.1.2rc1.basename}"/>
-        <log message="Jetty location:    ${ext.jetty-6.1.2rc1.location}"/>
-        <log message="=================================================="/>
-        <log message="HtmlUnit exists:   ${JettyScenario.parameters.external.htmlunit-1.11.exists}"/>
-        <log message="HtmlUnit basename: ${JettyScenario.parameters.external.htmlunit-1.11.basename}"/>
-        <log message="HtmlUnit location: ${ext.htmlunit-1.11.location}"/>
-        <log message="=================================================="/>
-        <log message="JUnit exists:      ${JettyScenario.parameters.external.junit-3.8.2.exists}"/>
-        <log message="JUnit basename:    ${JettyScenario.parameters.external.junit-3.8.2.basename}"/>
-        <log message="JUnit location:    ${ext.junit-3.8.2.location}"/>
-        <log message="=================================================="/>
-        <log message=""/>
-        <log message="=== Required parameters =========================="/>
-        <log message="Jetty JRE:    ${JettyScenario.parameters.required.jetty.server.jre}"/>
-        <log message="Scenario JRE: ${JettyScenario.parameters.required.scenario.framework.jre}"/>
-        <log message="=================================================="/>
+        <echo level="info" message="============= Adaptor for ${suite.name}: Set Up .."/>
+        <echo level="info" message=""/>
+        <echo level="info" message="=== External dependencies ========================"/>
+        <echo level="info" message="Jetty location:    ${ext.jetty-6.1.2rc1.location}"/>
+        <echo level="info" message="=================================================="/>
+        <echo level="info" message="HtmlUnit location: ${ext.htmlunit-1.11.location}"/>
+        <echo level="info" message="=================================================="/>
+        <echo level="info" message=""/>
+        <echo level="info" message="=== Required parameters =========================="/>
+        <echo level="info" message="Jetty JVM:    ${JettyScenario.parameters.required.jetty.server.jvm}"/>
+        <echo level="info" message="Scenario JVM: ${JettyScenario.parameters.required.scenario.framework.jvm}"/>
+        <echo level="info" message="=================================================="/>
 
         <!--
             Performing scenario setup in the following order:
 
-            1. Create working directory
-            2. Checkout scenario sources and resources from svn
+            1. Update sources from repository
+            2. Create working directory
             3. Compile scenario sources
         -->
 
+        <svn-update-bt path="${scenario.src.dir}"/>
+
         <mkdir dir="${scenario.bin.dir}"/>
 
-        <exec executable="svn" dir="${trunk.dir}" failonerror="true">
-            <arg line="co ${svn.url}"/>
-            <arg line="${trunk.dir}"/>
-        </exec>
+        <antcall target="-compile-sources"/>
+    </target>
 
-        <javac srcdir="${scenario.dir}${ps}src" destdir="${scenario.bin.dir}">
+    <target name="-compile-sources">
+        <javac srcdir="${test.sources.dir}/${suite.name}/src"
+               destdir="${scenario.bin.dir}">
             <classpath>
                 <pathelement location="${scenario.bin.dir}"/>
-                <pathelement location="${ext.junit-3.8.2.location}"/>
+                <pathelement location="${ext.junit.location}"/>
                 <fileset dir="${ext.htmlunit-1.11.location}">
-                    <include name="lib${ps}*.jar"/>
+                    <include name="lib/*.jar"/>
                 </fileset>
             </classpath>
         </javac>
     </target>
 
-    <target name="update">
-        <log message="============= Adaptor for ${suite.name}: Update .."/>
-        <exec executable="svn" dir="${trunk.dir}" failonerror="true">
-            <arg line="update"/>
-        </exec>
+    <target name="-compile-if-needed" if="repository.updated">
+        <antcall target="-compile-sources"/>
     </target>
 
-    <target name="run">
-        <log message="============= Adaptor for ${suite.name}: Run .."/>
-        <condition property="exe.ext" value=".exe" else="">
-            <os family="Windows"/>
-        </condition>
-        <condition property="ps" value="\" else="/">
-            <os family="Windows"/>
-        </condition>
+    <target name="run" depends="-compile-if-needed">
+        <echo level="info" message="============= Adaptor for ${suite.name}: Run .."/>
 
         <!--
             Performing scenario run in the following order:
 
             1. Create directory for scenario results
-            2. Start Jetty server
-            3. Run the scenario by 'junit' task
-            4. Stop Jetty server
-            5. Collect logs and results in results directory
+            2. Remove previous Jetty server log, if any
+            3. Start Jetty server and wait until it is started
+            4. Run the scenario by 'junit' task
+            5. Stop Jetty server
+            6. Collect logs and results in results directory
         -->
 
         <mkdir dir="${scenario.results.dir}"/>
+        <delete file="${scenario.results.dir}/jetty.log"/>
 
         <parallel>
             <sequential>
-                <log message="Starting Jetty server"/>
-                <java jvm="${JettyScenario.parameters.required.jetty.server.jre}${ps}bin${ps}java${exe.ext}"
+                <echo level="info" message="Starting Jetty server"/>
+                <java jvm="${JettyScenario.parameters.required.jetty.server.jvm}"
                       dir="${ext.jetty-6.1.2rc1.location}"
                       classname="start.jar"
                       fork="true"
-                      spawn="false"
-                      output="${scenario.results.dir}${ps}jetty.log">
-                    <jvmarg value="-Djetty.port=7070"/>
-                    <jvmarg value="-DSTOP.PORT=4444"/>
-                    <jvmarg value="-DSTOP.KEY=kill"/>
+                      timeout="1${JettyScenario.parameters.optional.jetty.server.timeout}000"
+                      output="${scenario.results.dir}/jetty.log">
+                    <sysproperty key="jetty.port" value="${JettyScenario.parameters.optional.jetty.server.port}"/>
+                    <sysproperty key="STOP.PORT"  value="${JettyScenario.parameters.optional.jetty.server.stop.port}"/>
+                    <sysproperty key="STOP.KEY"   value="kill"/>
                     <jvmarg value="-jar"/>
                 </java>
             </sequential>
 
             <sequential>
-                <sleep milliseconds="${JettyScenario.parameters.optional.jetty.server.timeout}"/>
+                <waitfor maxwait="${JettyScenario.parameters.optional.jetty.server.timeout}"
+                         maxwaitunit="second" timeoutproperty="failed.timeout">
+                    <and>
+                        <available file="${scenario.results.dir}/jetty.log"/>
+                        <isfileselected file="${scenario.results.dir}/jetty.log">
+                            <contains text="INFO:  Started SelectChannelConnector"/>
+                        </isfileselected>
+                    </and>
+                </waitfor>
+                <fail message="Jetty server startup timeout exceeded" if="failed.timeout"/>
 
-                <junit jvm="${JettyScenario.parameters.required.scenario.framework.jre}${ps}bin${ps}java${exe.ext}"
+                <junit jvm="${JettyScenario.parameters.required.scenario.framework.jvm}"
                        dir="${scenario.dir}"
                        fork="true"
                        forkmode="once"
@@ -133,35 +124,32 @@
                        haltonfailure="false"
                        printsummary="on"
                        failureproperty="scenario.failed">
-                    <jvmarg value="-Djetty.scenario.resources.path=${scenario.dir}${ps}resources"/>
-                    <jvmarg value="-Djetty.scenario.results.path=${scenario.results.dir}"/>
-                    <jvmarg value="-Djetty.scenario.savepages=${JettyScenario.parameters.optional.do.save.pages}"/>
-                    <jvmarg value="-Djetty.server.startup.timeout=${JettyScenario.parameters.optional.jetty.server.timeout}"/>
-                    <jvmarg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
-                    <jvmarg value="-Dorg.apache.commons.logging.simplelog.defaultlog=error"/>
+                    <sysproperty key="jetty.scenario.resources.path"  value="${scenario.src.dir}/resources"/>
+                    <sysproperty key="jetty.scenario.results.path"    value="${scenario.results.dir}"/>
+                    <sysproperty key="jetty.scenario.savepages"       value="${JettyScenario.parameters.optional.do.save.pages}"/>
+                    <sysproperty key="jetty.server.startup.timeout"   value="${JettyScenario.parameters.optional.jetty.server.timeout}"/>
+                    <sysproperty key="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.SimpleLog"/>
+                    <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="error"/>
                     <classpath >
                         <pathelement location="${scenario.bin.dir}"/>
-                        <pathelement location="${ext.junit-3.8.2.location}"/>
+                        <pathelement location="${ext.junit.location}"/>
                         <fileset dir="${ext.htmlunit-1.11.location}">
-                            <include name="lib${ps}*.jar"/>
+                            <include name="lib/*.jar"/>
                         </fileset>
                     </classpath>
                     <formatter type="plain" />
                     <test name="JettyScenario" todir="${scenario.results.dir}"/>
                 </junit>
 
-                <echo file="${scenario.results.dir}${ps}result.property">JettyScenario.failed=${scenario.failed}</echo>
-
-                <log message="Stopping Jetty server"/>
-                <java jvm="${JettyScenario.parameters.required.jetty.server.jre}${ps}bin${ps}java${exe.ext}"
+                <echo level="info" message="Stopping Jetty server"/>
+                <java jvm="${JettyScenario.parameters.required.jetty.server.jvm}"
                       dir="${ext.jetty-6.1.2rc1.location}"
                       classname="start.jar"
                       fork="true"
-                      spawn="false"
-                      failonerror="false">
-                    <jvmarg value="-Djetty.port=7070"/>
-                    <jvmarg value="-DSTOP.PORT=4444"/>
-                    <jvmarg value="-DSTOP.KEY=kill"/>
+                      failonerror="true">
+                    <sysproperty key="jetty.port" value="${JettyScenario.parameters.optional.jetty.server.port}"/>
+                    <sysproperty key="STOP.PORT" value="${JettyScenario.parameters.optional.jetty.server.stop.port}"/>
+                    <sysproperty key="STOP.KEY" value="kill"/>
                     <jvmarg value="-jar"/>
                     <arg value="--stop"/>
                 </java>
@@ -171,79 +159,97 @@
 
     </target>
 
-    <target name="publish">
-        <condition property="exe.ext" value=".exe" else="">
-            <os family="Windows"/>
-        </condition>
-        <condition property="ps" value="\" else="/">
-            <os family="Windows"/>
-        </condition>
-        <condition property="use.mail.publisher">
-            <equals arg1="${sendmail}" arg2="yes" casesensitive="false" trim="true"/>
-        </condition>
-        <property file="${resultfile}"/>
-        <condition property="build.failed">
-            <equals arg1="${JettyScenario.failed}" arg2="true" casesensitive="false"/>
-        </condition>
-        <property name="buildname" value="${os.name} ${os.version} ${os.arch}"/>
-        <antcall target="-build-failed-subject"/>
-        <antcall target="-build-passed-subject"/>
-    </target>
-
-    <target name="-mail-publish" if="use.mail.publisher">
-        <echo file="${resultdir}${ps}notification.txt">Jetty server JRE:${line.separator}${line.separator}</echo>
-        <exec executable="${serverjre}${ps}bin${ps}java${exe.ext}"
-              spawn="false"
-              failonerror="false"
-              output="${resultdir}${ps}notification.txt"
-              append="true">
+    <target name="clean">
+        <echo level="info" message="============= Adaptor for ${suite.name}: Clean .."/>
+        <echo level="info" message="Removing all from working directory"/>
+        <delete dir="${scenario.dir}"/>
+    </target>
+
+    <!--
+        Jetty scenario publisher
+    -->
+
+    <condition property="subject"
+        value="${framework.parameters.usemail.subject.prefix} BUILD PASSED ${os.name} ${os.arch}:
Jetty scenario"
+        else="${framework.parameters.usemail.subject.prefix} BUILD FAILED ${os.name} ${os.arch}:
Jetty scenario">
+            <istrue value="${thisbuildsuccessful}"/>
+    </condition>
+
+    <condition property="do.send">
+        <and>
+            <isset property="framework.parameters.usemail"/>
+            <or>
+                <equals arg1="${framework.parameters.usemail.always}"
+                        arg2="true"/>
+                <not>
+                    <equals arg1="${thisbuildsuccessful}"
+                            arg2="${lastbuildsuccessful}"/>
+                </not>
+            </or>
+        </and>
+    </condition>
+
+    <property name="scenario.results.dir" location="${results.dir}/${suite.name}"/>
+    <property name="ls" value="${line.separator}"/>
+
+    <target name="-compose-notification">
+        <echo file="${scenario.results.dir}/notification.txt"
+              message="Jetty server JRE:${ls}${ls}"/>
+
+        <exec executable="${JettyScenario.parameters.required.jetty.server.jvm}"
+              output="${scenario.results.dir}/notification.txt" append="true">
             <arg value="-version"/>
         </exec>
-        <echo file="${resultdir}${ps}notification.txt" append="true">Scenario framework
JRE:${line.separator}${line.separator}</echo>
-        <exec executable="${fwjre}${ps}bin${ps}java${exe.ext}"
-              spawn="false"
-              failonerror="false"
-              output="${resultdir}${ps}notification.txt"
-              append="true">
+
+        <echo file="${scenario.results.dir}/notification.txt" append="true"
+              message="${ls}Scenario framework JRE:${ls}${ls}"/>
+
+        <exec executable="${JettyScenario.parameters.required.scenario.framework.jvm}"
+              output="${scenario.results.dir}/notification.txt" append="true">
             <arg value="-version"/>
         </exec>
-        <echo file="${resultdir}${ps}notification.txt" append="true">${line.separator}================================================================================</echo>
-        <echo file="${resultdir}${ps}notification.txt" append="true">${line.separator}Scenario
results:${line.separator}${line.separator}</echo>
-        <concat destfile="${resultdir}${ps}notification.txt" append="true">
-            <filelist dir="${resultdir}" files="${file}"/>
+
+        <echo file="${scenario.results.dir}/notification.txt" append="true"
+              message="${ls}================================================================================${ls}Scenario
results:${ls}${ls}"/>
+
+        <concat destfile="${scenario.results.dir}/notification.txt" append="true">
+            <filelist dir="${scenario.results.dir}" files="TEST-JettyScenario.txt"/>
         </concat>
-        <echo file="${resultdir}${ps}notification.txt" append="true">${line.separator}================================================================================</echo>
-        <echo file="${resultdir}${ps}notification.txt" append="true">${line.separator}Jetty
server output:${line.separator}${line.separator}</echo>
-        <concat destfile="${resultdir}${ps}notification.txt" append="true">
-            <filelist dir="${resultdir}" files="jetty.log"/>
+
+        <echo file="${scenario.results.dir}/notification.txt" append="true"
+              message="${ls}================================================================================${ls}Jetty
server output:${ls}${ls}"/>
+
+        <concat destfile="${scenario.results.dir}/notification.txt" append="true">
+            <filelist dir="${scenario.results.dir}" files="jetty.log"/>
         </concat>
 
-        <mail mailhost="${mailhost}"
-              mailport="${mailport}"
-              user="${username}"
-              password="${password}"
-              from="${fromaddress}"
-              tolist="${toaddress}"
-              subject="${subject}"
-              messagefile="${resultdir}${ps}notification.txt"
-              messagemimetype="text/plain"
-              failonerror="false"/>
-    </target>
+        <xslt basedir="${scripts.dir}/xslt"
+              in="${logdir}/${logfile}"
+              style="${scripts.dir}/xslt/br.xsl"
+              out="${scenario.results.dir}/buildresults.txt"
+              classpath="${ext.xalan.location}:${ext.cc.location}/lib/serializer-2.7.0.jar">
+        </xslt>
 
-    <target name="-build-failed-subject" if="build.failed">
-        <property name="subject" value="[build-test alert] BUILD FAILED ${buildname}:
Jetty scenario on drlvm"/>
-        <antcall target="-mail-publish"/>
-    </target>
+        <echo file="${scenario.results.dir}/notification.txt" append="true"
+              message="${ls}================================================================================${ls}"/>
 
-    <target name="-build-passed-subject" unless="build.failed">
-        <property name="subject" value="[build-test alert] BUILD SUCCEEDED ${buildname}:
Jetty scenario on drlvm"/>
-        <antcall target="-mail-publish"/>
-    </target>
+        <concat destfile="${scenario.results.dir}/notification.txt" append="true">
+            <filelist dir="${scenario.results.dir}" files="buildresults.txt"/>
+        </concat>
 
-    <target name="clean">
-        <log message="============= Adaptor for ${suite.name}: Clean .."/>
-        <log message="Removing all from working directory"/>
-        <delete dir="${scenario.dir}"/>
+        <delete file="${scenario.results.dir}/buildresults.txt"/>
+    </target>
+    
+    <target name="publish" if="do.send" depends="-compose-notification">
+        <echo>Sending notification</echo>
+        <mail from="${framework.parameters.usemail.from}" 
+              tolist="${framework.parameters.usemail.to}"
+              messagefile="${scenario.results.dir}/notification.txt"
+              failonerror="true"
+              mailhost="${framework.parameters.usemail}"
+              subject="${subject}"
+              encoding="plain"
+              messagemimetype="text/plain"/>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/parameters.xml?view=diff&rev=538471&r1=538470&r2=538471
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/JettyScenario/parameters.xml Wed May
16 01:15:46 2007
@@ -14,50 +14,32 @@
      See the License for the specific language governing permissions and
      limitations under the License. -->
 
-<parameters depends="classlib,drlvm">
+<parameters depends="drlvm">
 
     <!-- Required parameters -->
     <required>
-        <jetty.server.jre
-            description="Path to JRE on which Jetty server will be started (current build
of drlvm+classlib by default)."
-            value="${drlvm.parameters.shared.jre.dir}"/>
-        <scenario.framework.jre
-            description="Path to JRE on which the scenario framework will be started (current
build of drlvm+classlib by default)."
-            value="${drlvm.parameters.shared.jre.dir}"/>
-        <use.mail.notifications
-            description="Tells Cruise Control whether it should send email notifications
or not (default is yes)."
-            value="yes"/>
-        <mail.notification.from
-            description="Email address of notification sender (e.g. somebody@mail.server)."
-            value=""/>
-        <mail.notification.to
-            description="A comma-separated list of email addresses where to send notifications."
-            value=""/>
-        <mail.notification.mailhost
-            description="Name of SMTP server to use for sending notifications (default is
localhost)."
-            value="localhost"/>
+        <jetty.server.jvm
+            description="Path to JVM on which Jetty server will be started (current build
of drlvm by default)."
+            value="${drlvm.parameters.shared.jvm.location}"/>
+        <scenario.framework.jvm
+            description="Path to JVM on which the scenario framework will be started (current
build of drlvm by default)."
+            value="${drlvm.parameters.shared.jvm.location}"/>
     </required>
 
     <!-- Optional parameters -->
     <optional>
+        <jetty.server.port
+            description="Port on which Jetty server will startup."
+            value="7070"/>
+        <jetty.server.stop.port
+            description="Port for stopping Jetty server."
+            value="4444"/>
         <jetty.server.timeout
-            description="Timeout for waiting Jetty server loaded."
-            value="30000"/>
+            description="Timeout for waiting Jetty server loaded (seconds)."
+            value="300"/>
         <do.save.pages
             description="Tells scenario whether it should store downloaded pages or not."
             value="yes"/>
-        <ant.home.dir
-            description="Home directory of the ant (this is workaround for stupid CC configs)."
-            value="${ant.home}"/>
-        <mail.notification.mailhost.port
-            description="Port of SMTP server (default is 25)."
-            value="25"/>
-        <mail.notification.mailhost.username
-            description="User name for accessing SMTP server (if required)."
-            value=""/>
-        <mail.notification.mailhost.password
-            description="User password for accessing SMTP server (if required)."
-            value=""/>
     </optional>
 
     <!-- External dependencies -->
@@ -65,34 +47,25 @@
         <jetty-6.1.2rc1
             url="http://dist.codehaus.org/jetty/jetty-6.1.2rc1.zip"
             md5="b35a6c1767c116999a1f3d205174429c"
-            dir="jetty-6.1.2rc1"
-        />
+            dir="jetty-6.1.2rc1"/>
         <htmlunit-1.11
             url="http://downloads.sourceforge.net/htmlunit/htmlunit-1.11.zip"
             md5="829ff23c7d921b6cb04df2b6fdcd4672"
             dir="htmlunit-1.11"
-            inc="*/lib/**,*/*.txt"
-        />
-        <junit-3.8.2
-            url="http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/3.8.2/junit-3.8.2.jar"
-            md5="28e7eb9eeefe31a657c68755bfccc541"
-        />
+            inc="*/lib/**,*/*.txt"/>
     </external>
 
     <!-- Shared parameters -->
     <shared>
-        <!-- define the place where drlvm workspace will be placed -->
-        <trunk.dir value="${scenario.dir}" id="trunk.dir.id"/>
-
-        <!-- FIXME: the scenario shouldn't depend on its location in svn -->
-        <svn.url value="http://svn.apache.org/repos/asf/harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario"/>
+        <!-- define where the scenario sources are placed -->
+        <trunk.dir value="${scenario.src.dir}" id="trunk.dir.id"/>
     </shared>
 
     <!-- CC specific configuration -->
-    <cc config="${adaptors.dir}/${suite.name}/cc-config.xml">
+    <cc>
         <!-- Re-run if changes in SVN -->
-        <!-- HINT: Uncomment this if you want to re-run if changes in scenario repository.
         <usesvn refid="trunk.dir.id"/>
-        -->
+        <!-- Run this script for publishing results -->
+        <publisher value="${adaptors.dir}/${suite.name}/adaptor.xml"/>
     </cc>
 </parameters>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario/src/JettyTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario/src/JettyTestCase.java?view=diff&rev=538471&r1=538470&r2=538471
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario/src/JettyTestCase.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/JettyScenario/src/JettyTestCase.java Wed
May 16 01:15:46 2007
@@ -46,7 +46,7 @@
     protected static PrintStream LOG_ERR = System.err;
 
     protected static final int SERVER_START_TIMEOUT = Integer.valueOf(
-        System.getProperty("jetty.server.startup.timeout", "10000")).intValue();
+        System.getProperty("jetty.server.startup.timeout", "60")).intValue() * 1000;
 
     static {
         scenarioRoot = ".";



Mime
View raw message