Index: tests/JettyScenario/src/JettyTestCase.java =================================================================== --- tests/JettyScenario/src/JettyTestCase.java (revision 538452) +++ tests/JettyScenario/src/JettyTestCase.java (working copy) @@ -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 = "."; Index: adaptors/JettyScenario/parameters.xml =================================================================== --- adaptors/JettyScenario/parameters.xml (revision 538139) +++ adaptors/JettyScenario/parameters.xml (working copy) @@ -14,50 +14,32 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - - - - - + + + + + description="Timeout for waiting Jetty server loaded (seconds)." + value="300"/> - - - - @@ -65,34 +47,25 @@ + dir="jetty-6.1.2rc1"/> - + inc="*/lib/**,*/*.txt"/> - - - - - + + - + - + + Index: adaptors/JettyScenario/cc-config.xml =================================================================== --- adaptors/JettyScenario/cc-config.xml (revision 538139) +++ adaptors/JettyScenario/cc-config.xml (working copy) @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: adaptors/JettyScenario/adaptor.xml =================================================================== --- adaptors/JettyScenario/adaptor.xml (revision 538139) +++ adaptors/JettyScenario/adaptor.xml (working copy) @@ -20,112 +20,103 @@ ====================================================================== --> - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + - + + - + - + - - - - - + + - - - - - - - - + + + - - + - - - + timeout="1${JettyScenario.parameters.optional.jetty.server.timeout}000" + output="${scenario.results.dir}/jetty.log"> + + + - + + + + + + + + + - - - - - - - + + + + + + - + - + - JettyScenario.failed=${scenario.failed} - - - + - - - + failonerror="true"> + + + @@ -171,79 +159,97 @@ - - - - - - - - - - - - - - - - - + + + + - - Jetty server JRE:${line.separator}${line.separator} - + + + + + + + + + + + + + + + + + + + + + + + + + - Scenario framework JRE:${line.separator}${line.separator} - + + + + - ${line.separator}================================================================================ - ${line.separator}Scenario results:${line.separator}${line.separator} - - + + + + + - ${line.separator}================================================================================ - ${line.separator}Jetty server output:${line.separator}${line.separator} - - + + + + + - - + + - - - - + - - - - + + + - - - - + + + + Sending notification + + Index: adaptors/JettyScenario/README.txt =================================================================== --- adaptors/JettyScenario/README.txt (revision 538139) +++ adaptors/JettyScenario/README.txt (working copy) @@ -2,13 +2,13 @@ Jetty automated scenario ======================== ---------------- -Archive Content ---------------- +-------------- +Scenario files +-------------- -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. +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 + | |--publisher.xml - publisher for running in Cruise Control mode | | - | |-+resources/ - Resources required for Jetty scenario - | | - | |-+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: @@ -122,31 +122,6 @@ 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: - -