Author: jhalliday Date: 2008-04-15 12:21:17 -0400 (Tue, 15 Apr 2008) New Revision: 10 Modified: trunk/DTF-Install-README.txt trunk/build.xml trunk/lib/README.txt trunk/scripts/install.xml trunk/src/org/jboss/dtf/testframework/dtfweb/DTFResultsLogger.java trunk/testenv/coordinator/service_manager.xml trunk/testenv/services/service_manager.xml trunk/testenv/testnode1/nodeconfig.xml trunk/tests/build.xml trunk/tests/db_manager.xml trunk/tests/nodeconfig.xml trunk/tests/products/ComputeServer.xml trunk/tests/products/TestProduct.xml trunk/tests/results_collator.xml trunk/xml/context.xml trunk/xml/web.xml Log: Updates to reflect newer versions of dependencies. DTF-3 Modified: trunk/DTF-Install-README.txt =================================================================== --- trunk/DTF-Install-README.txt 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/DTF-Install-README.txt 2008-04-15 16:21:17 UTC (rev 10) @@ -22,7 +22,7 @@ Installing the DTF ================== -Instructions follow showing how to install the DTF from Branch_DTF_3_9 on a laptop. +Instructions follow showing how to install the DTF on a laptop. In this configuration, you can start the DTF services, one test node, and the DTFweb GUI. This document includes the following sections: @@ -36,18 +36,19 @@ 0. Base software you will need ------------------------------ * MySQL -- I am using Ver 14.12 Distrib 5.0.27, installed in default Fedora Core 6 location -- I am also using mysql-connector-java-5.0.5-bin.jar as the MySQL Connector/J JDBC driver, -which needs to be made available to both the DTF Runtime (in $DTF_HOME/lib/ext) and Tomcat -(in $CATALINA_HOME/common/lib and $CATALINA_HOME/webapps/dtf/WEB-INF/lib) +- You need access to a MySQL 5.0 (or later) server. +- The MySQL JDBC driver is provided in the DTF lib/ or you can you use a later version. +- The driver needs to be installed in tomcat, see below * Tomcat -- I am using version 5.5.20, installed in /opt/apache-tomcat-5.5.20 -- old instructions for use of Tomcat 4 with DTF appear in Appendix +- You need access to a tomcat server. We use 6.0 but 5.5 may also work. +- copy the mysql drivers into tomcat. On 6.0 they go in lib/ * ant -- I am using version 1.6.5, installed in /opt/apache-ant-1.6.5 +- We use version 7. +* JDK. Minimum Java 1.5 +- compile with the earliest jdk you want to execute tests on or you'll have .class file version problems. 1. Setup MySQL for DTF use -------------------------- @@ -76,16 +77,9 @@ 2. Setup Tomcat for DTF use --------------------------- - you need to several things to set up Tomcat: -(i) modify $CATALINA_HOME/conf/tomcat-users.xml to add enable the managet webapp -- add a user of your choice with manager role to tomcat-users: -<tomcat-users> - <role rolename="manager"/> - <user usename="someuser" password="somepassword" roles="manager"/> -</tomcat-users> -The manager webapp will be used to deploy the dtf.war web application which defines the DTF GUI. -(ii) modify $CATALINA_HOME/conf/web.xml to turn on the default servlet invoker -- the two sections which need to be uncommented are: +(i) modify $CATALINA_HOME/conf/web.xml to turn on (uncomment) the default servlet invoker + <servlet> <servlet-name>invoker</servlet-name> <servlet-class> @@ -98,27 +92,20 @@ <load-on-startup>2</load-on-startup> </servlet> - ... +(ii) Setup libraries required by Tomcat when using the dtf.war web application: +- copy the MySQL Connector/J driver mysql-connector-java-5.1.16-bin.jar to $CATALINA_HOME/lib - <!-- The mapping for the invoker servlet --> - <servlet-mapping> - <servlet-name>invoker</servlet-name> - <url-pattern>/servlet/*</url-pattern> - </servlet-mapping> +- TODO copy the JavaMail library activation.jar to $CATALINA_HOME/common/lib ?? +- TODO obsolete? NOTE: may also need xerces.jar, mail.jar, commons-logging-1.1.jar and log4j-1.2.8.jar -(iii) Setup libraries required by Tomcat when using the dtf.war web application: -- copy the MySQL Connector/J driver mysql-connector-java-5.0.5-bin.jar to $CATALINA_HOME/common/lib -- copy the JavaMail library activation.jar to $CATALINA_HOME/common/lib -- NOTE: may also need xerces.jar, mail.jar, commons-logging-1.1.jar and log4j-1.2.8.jar - The DTFweb GUI makes JDBC connections to the MySQL database, and so Tomcat needs access to the Connector/J driver. The DTFweb GUI also needs to use JavaMail to notify users that test runs have completed. -(iv) The dtf.war web application includes the following Resource definition in META-INF/context.xml: +(iii) The dtf.war web application includes the following Resource definition in META-INF/context.xml: - <!-- the Tomcat 5 Context for the DTF web application --> -<Context> + <!-- the Tomcat 6 Context for the DTF web application --> +<Context privileged="true"> <!-- set up JDBC access to the DTF database for the DTF web application --> <Resource name="jdbc/ResultsDB" @@ -137,37 +124,14 @@ /> </Context> -This Resource is used to define access to the JDBC database from Tomcat. This context definition differs -in format and placement from the equivalent definition in Tomcat 4. You will need to adjust the url to -point to your MySQL database. +You will need to adjust the url to point to your MySQL database. - The dtf.war web application accesses the defined resource via its WEB-INF/web.xml descriptor: + The dtf.war web application accesses the defined resource via its WEB-INF/web.xml descriptor. + You may need to change the mail server config. <web-app> - <display-name>DTF Web Interface</display-name> - <description>GUI access to the DTF</description> + .... - <!-- - <servlet-mapping> - <servlet-name>invoker</servlet-name> - <url-pattern>/servlet/*</url-pattern> - </servlet-mapping> - --> - - <welcome-file-list> - <welcome-file>default.jsp</welcome-file> - </welcome-file-list> - - <resource-ref> - <description> - Resource reference to a factory for java.sql.Connection - instances that may be used for talking to the MySQL database. - </description> - <res-ref-name>jdbc/ResultsDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - </resource-ref> - <env-entry> <description> String value of SMTP server used to e-mail results via JavaMail @@ -179,39 +143,23 @@ </web-app> - - -(v) use the Tomcat manager web application to install the dtf.war web application correctly within -Tomcat. (This step can be completed after you have built and installed the DTF as described in 3.) - -The manager application is accessible from the main Tomcat web page, or via the URL -http://locahost:8080/manager/html. You will be prompted for the username and password you defined -earlier in tomcat-users.xml when you access this page. At the bottom of the Manager page is a deployment -section where you may locate the dtf.war file and deploy it to the Tomcat instance. - -(v) Once these steps have been completed, the DTF is then accessed via http://localhost:8080/dtf (or similar, +(iv) After installation (see below), the DTF can be accessed via http://localhost:8080/dtf (or similar, depending on your configured Tomcat host and port) -Generally, i've found that Tomcat can give problems of various types, and I found myself looking in -$CATALINA_HOME/logs/catalina.out too frequently. Common problems relate to -(i) the MySQL JDBC driver not being found -(ii) starting up Tomcat with different Java versions which seem to corrupt it and force reinstallation -of Tomcat and the DTF stuff. +For debugging, $CATALINA_HOME/logs/catalina.out is useful + 3. Build the DTF from source and install ---------------------------------------- -- I check out Branch_DTF_3_9 as a basic project in the workspace, not as a Java project using the -New Project Wizard. One of the tasks on my TODO list is to learn how to set it up as a Java project. -- the Branch_DTF_3_9 distribution should build cleanly under Eclipse, producing a 'dist' directory -containing the dtf distribution file adtf.zip and an installer script, among other stuff +- run 'ant'. The dist dir will now contain a DTF binary distribution. -- to install the DTF, open the installer.xml file and set the properties: +- to install the DTF, open the dist/install.xml file and set the properties: * install.dir, where you want the DTF software to reside, * webapps.dir, where you want the webapp deployed and then run the 'full' target of the install script: -> ant -f install.xml full +> cd dist; ant -f install.xml full - the distribution is configured to run by default on a single host (called localhost), with the following settings: @@ -221,7 +169,7 @@ * product installers in $CATALINA_HOME/webapps/dtf/productinstallers * product tests and selections in $CATALINA_HOME/webapps/dtf/producttests -- the installation as describes above has no products, no installers, no tests, but should start cleanly in +- the installation as described above has no products, no installers, no tests, but should start cleanly in that state from DTFweb, at which time you can define products and write your own tests. Section 5 shows how to do this. @@ -253,6 +201,10 @@ + +edit nodeconfig.xml jvm-definitions section to reflect +the location(s) of the jvm(s) installed on your system. + * point your browser to http://localhost:8080/dtf @@ -261,11 +213,11 @@ - check that the DTFweb setup is correct. Click on the menu item "setup". The resulting page of input fields should look something like this: DefaultNameService URI //localhost:1099/NameService -UploadDirectory /opt/jakarta-tomcat-4.1.31/dtf/producttests +UploadDirectory /opt/jakarta-tomcat-6.0.16/dtf/producttests UploadWebDirectory http://localhost:8080/dtf/producttests Root URL http://localhost:8080/dtf - you may receive Tomcat exceptions upon startup if the installation has not been -performed correctly. Check the Tomcat logs in $TOMCAT_HOME/logs. +performed correctly. Check the Tomcat logs in $CATALINA_HOME/logs. 5. Run a test case against a product @@ -273,101 +225,12 @@ - as mentioned earlier, this running DTF instance has no products, test cases or test selections defined yet - to install a sample product, product installer, and sample test definition and selection, run the 'install-sample' -target of the installer.xml file. In order to run this example, you will need to do a couple of things: +target of the install.xml file. In order to run this example, you will need to do a couple of things: (i) add an OS (e.g. Linux) in the Setup menu (ii) associate the TestProduct with the TestProductInstaller in the Deployment menu (using the fully qualified name of the installer as http://localhost:8080/dtf/productinstallers/TestProductInstaller.xml) +(iii) You may also need to edit TestProduct.xml to set DTF_HOME to the correct value. You should then be able to: (i) deploy the product on a single test node from the Deployment menu (ii) import the product definition, and run the sample test from the Management menu - - -Appendix ---------- -These are instructions for using Tomcat 4 with the DTF. - -2. Setup Tomcat for DTF use ---------------------------- -- you need to several things to set up Tomcat: -1. modify $CATALINA_HOME/conf/server.xml to add a DTF context called dtf -2. modify $CATALINA_HOME/conf/web.xml to turn on the default servlet invoker -3. Copy the MySQL Connector/J driver mysql-connector-java-3.1.12-bin.jar to $CATALINA_HOME/common/lib -Although this driver also appears in the web application's local library WEB-INF/lib, not having it -in one of the other place seems to cause Tomcat problems. -4. copy the DTFweb web application war dtf.war in exploded form to $CATALINA_HOME/webapps (this step is -part of the general DTF installation described below) -5. adjust access permissions on the new web application directory, if desired. I set up a group -called tomcat which allows write access to the directories where users need to place installer scripts, -etc. and only read access elsewhere. - -The DTF is then accessed via http://localhost:8080/dtf (or similar, depending on your configured host and port) - -Here are diffs of the changes, with respect to the original server.xml and web.xml: - -1. Add the dtf context to Tomcat - -diff -r jakarta-tomcat-4.1.31/conf/server.xml /opt/jakarta-tomcat-4.1.31/conf/server.xml -380a381,484 -> <!-- Context for DTF --> -> -> <Context path="/dtf" docBase="dtf"> -> -> <Logger className="org.apache.catalina.logger.FileLogger" -> prefix="localhost_DTF_log." suffix=".txt" timestamp="true"/> -> -> <!-- set up JDBC access to the DTF database for the DTF web application --> -> <Resource name="jdbc/ResultsDB" auth="Container" type="javax.sql.DataSource"/> -> -> <ResourceParams name="jdbc/ResultsDB"> -> -> <parameter> -> <name>username</name> -> <value>dtfuser</value> -> </parameter> -> -> <parameter> -> <name>password</name> -> <value>dtfuser</value> -> </parameter> -> -> <parameter> -> <name>driverClassName</name> -> <value>org.gjt.mm.mysql.Driver</value> -> </parameter> -> -> <parameter> -> <name>url</name> -> <value>jdbc:mysql://localhost:3306/dtf</value> -> </parameter> -> -> <parameter> -> <name>maxActive</name> -> <value>8</value> -> </parameter> -> -> <parameter> -> <name>maxIdle</name> -> <value>4</value> -> </parameter> -> -> </ResourceParams> -> -> </Context> - - -2. Turn on the servlet invoker - the DTFweb JSP pages sometimes call servlets with URLs like -http://localhost:8080/servlet/<servlet_name>. This involves removing comments surropunding the -servlet invoker definition. - -diff -r jakarta-tomcat-4.1.31/conf/web.xml /opt/jakarta-tomcat-4.1.31/conf/web.xml -281d280 -< <!-- -286d284 -< --> - -Generally, i've found that Tomcat can give problems of various types, and I found myself looking in -$CATALINA_HOME/logs/catalina.out too frequently. Common problems relate to -(i) the MySQL JDBC driver not being found -(ii) starting up Tomcat with different Java versions which seem to corrupt it and force reinstallation -of Tomcat and the DTF stuff. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/build.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -46,7 +46,7 @@ <property name="build" value="build"/> <property name="tests.build" value="test-build"/> <property name="bin.build" value="bin.build"/> - <property name="deploy-dir" value="/opt/jakarta-tomcat-5.5.20/webapps/"/> + <property name="deploy-dir" value="/opt/apache-tomcat-6.0.16/webapps"/> <!-- Classpaths for compilation of framework classes, org.jboss.dtf.tools and tests @@ -226,8 +226,12 @@ <copy todir="${war}/WEB-INF/lib/"> <fileset dir="${lib}"> <include name="**/jdom.jar"/> - <include name="**/mysql-connector-java-5.0.5-bin.jar"/> + <include name="**/commons-fileupload-1.2.1.jar"/> + <include name="**/commons-io-1.3.2.jar"/> + <!-- + <include name="**/mysql-connector-java-5.0.5-bin.jar"/> <include name="**/struts.jar"/> + --> </fileset> </copy> @@ -318,7 +322,7 @@ </zip> <!-- Create a zip file of the distribution for use with install.xml --> - <zip zipfile="${dist}/adtf.zip"> + <zip zipfile="${dist}/jbossdtf.zip"> <zipfileset dir="${dist}" includes="dtf.war,install.xml,setup-dtf.sh"/> <zipfileset dir="${dist}/lib" prefix="lib"/> <zipfileset dir="${dist}/bin" prefix="bin"/> Modified: trunk/lib/README.txt =================================================================== --- trunk/lib/README.txt 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/lib/README.txt 2008-04-15 16:21:17 UTC (rev 10) @@ -32,7 +32,7 @@ # Apache ant 1.7.0 from http://ant.apache.org/ ant.jar -ant--launcher.jar +ant-launcher.jar (apache2.txt) # iText 2.0.8 from http://www.lowagie.com/iText/ Modified: trunk/scripts/install.xml =================================================================== --- trunk/scripts/install.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/scripts/install.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -18,16 +18,16 @@ (C) 2008, @author JBoss Inc. --> -<project name="ADTF-Install" default="help"> +<project name="JBossDTF-Install" default="help"> <property name="install.dir" location="/tmp/DTF"/> <property name="webapps.dir" location="/tmp/DTFwebapps"/> - <property name="temp.dir" location="/tmp/adtf/"/> + <property name="temp.dir" location="/tmp/dtf/"/> <target name="help"> - <echo message="Arjuna Distributed Testing Framework"/> + <echo message="JBoss Distributed Testing Framework"/> <echo message="Install script version:($Id: install.xml 170 2008-03-25 18:59:26Z jhalliday $)"/> <echo message="Usage:-"/> <echo message=" Properties: install.dir - The directory to install the DTF into"/> @@ -49,7 +49,7 @@ <exec dir="${install.dir}" os="Windows 2000" executable="${install.dir}/javaservice/javaservice.exe"> <arg line="-install"/> - <arg line="ADTFTestNode"/> + <arg line="JBossDTFTestNode"/> <arg line="${java.home}/bin/classic/jvm.dll"/> <arg line="-Djava.class.path=.;${install.dir}/lib/TestingFramework.jar;${install.dir}/lib/ext/jdom.jar;${install.dir}/lib/ext/xerces.jar"/> <arg line="-start"/> @@ -70,7 +70,7 @@ <exec dir="${install.dir}" os="Windows 2000" executable="${temp.dir}/javaservice/javaservice.exe"> <arg line="-uninstall"/> - <arg line="ADTFTestNode"/> + <arg line="JBossDTFTestNode"/> </exec> </target> @@ -82,7 +82,7 @@ <mkdir dir="${install.dir}"/> <echo message="Unpacking install image"/> - <unzip src="adtf.zip" dest="${temp.dir}"/> + <unzip src="jbossdtf.zip" dest="${temp.dir}"/> </target> Modified: trunk/src/org/jboss/dtf/testframework/dtfweb/DTFResultsLogger.java =================================================================== --- trunk/src/org/jboss/dtf/testframework/dtfweb/DTFResultsLogger.java 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/src/org/jboss/dtf/testframework/dtfweb/DTFResultsLogger.java 2008-04-15 16:21:17 UTC (rev 10) @@ -994,7 +994,7 @@ "UploadWebDirectory VARCHAR(255),"+ "RootURL VARCHAR(255) )"); - s.execute("insert into Configuration values (0,'//localhost:1099/NameService','/opt/jakarta-tomcat-4.1.31/webapps/dtf/producttests','http://localhost:8080/dtf/producttests','http://localhost:8080/dtf/')"); + s.execute("insert into Configuration values (0,'//localhost:1099/NameService','/opt/jakarta-tomcat-6.0.16/webapps/dtf/producttests','http://localhost:8080/dtf/producttests','http://localhost:8080/dtf/')"); } catch (SQLException e) Modified: trunk/testenv/coordinator/service_manager.xml =================================================================== --- trunk/testenv/coordinator/service_manager.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/testenv/coordinator/service_manager.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -28,11 +28,12 @@ <!-- Coordinator needs to parse XML descriptiors --> <jar name="../../lib/ext/jdom.jar"/> - <jar name="../../lib/ext/xerces.jar"/> + <!-- <jar name="../../lib/ext/xerces.jar"/> --> + <!-- Coordinator needs commons-logging --> - <jar name="../../lib/ext/commons-logging.jar"/> - <jar name="../../lib/ext/log4j-1.2.8.jar"/> + <!-- <jar name="../../lib/ext/commons-logging.jar"/> --> + <jar name="../../lib/ext/log4j-1.2.15.jar"/> </classpath> <parameters> Modified: trunk/testenv/services/service_manager.xml =================================================================== --- trunk/testenv/services/service_manager.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/testenv/services/service_manager.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -27,7 +27,8 @@ <!-- NameService requires use of TestingFramework classes --> <directory name="."/> <jar name="../../lib/TestingFramework.jar"/> - </classpath> + <jar name="../../lib/ext/jdom.jar"/> + </classpath> <properties> <!-- set the RMI port number (default is 1099) --> @@ -46,7 +47,7 @@ <!-- ProductRepository needs to parse XML product descriptions --> <jar name="../../lib/ext/jdom.jar"/> - <jar name="../../lib/ext/xerces.jar"/> + <!-- <jar name="../../lib/ext/xerces.jar"/> --> </classpath> <parameters> @@ -96,11 +97,13 @@ <!-- DBManager needs to parse XML product descriptions --> <jar name="../../lib/ext/jdom.jar"/> - <jar name="../../lib/ext/xerces.jar"/> + + <!-- <jar name="../../lib/ext/xerces.jar"/> --> + <!-- DBManager needs JDBC access to a MySQL database --> - <jar name="../../lib/ext/jdbc2_0-stdext.jar"/> - <jar name="../../lib/ext/mysql-connector-java-3.1.12-bin.jar"/> + <!-- <jar name="../../lib/ext/jdbc2_0-stdext.jar"/> --> + <jar name="../../lib/ext/mysql-connector-java-5.1.6-bin.jar"/> </classpath> <parameters> @@ -140,11 +143,12 @@ <!-- ResultsCollator needs to parse XML product descriptions --> <jar name="../../lib/ext/jdom.jar"/> - <jar name="../../lib/ext/xerces.jar"/> + <!-- <jar name="../../lib/ext/xerces.jar"/> --> + <!-- ResultsCollator needs to commun icate with the MySQL dtf database --> - <jar name="../../lib/ext/jdbc2_0-stdext.jar"/> - <jar name="../../lib/ext/mysql-connector-java-3.1.12-bin.jar"/> + <!-- <jar name="../../lib/ext/jdbc2_0-stdext.jar"/> --> + <jar name="../../lib/ext/mysql-connector-java-5.1.6-bin.jar"/> <!-- The ZIP file plugin --> <!-- <jar name="../../lib/AMSPlugin.jar"/> --> Modified: trunk/testenv/testnode1/nodeconfig.xml =================================================================== --- trunk/testenv/testnode1/nodeconfig.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/testenv/testnode1/nodeconfig.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -68,9 +68,9 @@ </task-runner-definitions> - <jvm-definitions default="1.4.2"> - <jvm version="1.4.2" java-home="/opt/j2sdk1.4.2_13"/> - <jvm version="1.5.0" java-home="/opt/jdk1.5.0_06"/> + <jvm-definitions default="1.5.0"> + <jvm version="1.5.0" java-home="/opt/jdk1.5.0_15"/> + <jvm version="1.6.0" java-home="/opt/jdk1.6.0_05"/> </jvm-definitions> </test-node-configuration> Modified: trunk/tests/build.xml =================================================================== --- trunk/tests/build.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/build.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -81,7 +81,7 @@ <pathelement location="${lib}/tests.jar"/> <pathelement location="${lib}/ext/fscontext.jar"/> <pathelement location="${lib}/ext/providerutil.jar"/> - <pathelement location="${lib}/ext/mysql-connector-java-3.1.12-bin.jar"/> + <pathelement location="${lib}/ext/mysql-connector-java-5.1.6-bin.jar"/> <pathelement path="${java.class.path}"/> </classpath> Modified: trunk/tests/db_manager.xml =================================================================== --- trunk/tests/db_manager.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/db_manager.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -30,15 +30,16 @@ <!-- DBManager needs to parse XML product descriptions --> <jar name="../lib/ext/jdom.jar"/> - <jar name="../lib/ext/xerces.jar"/> + <!-- <jar name="../lib/ext/xerces.jar"/> --> + <!-- DBManager needs to use the filesystem as a JNDI nameservice --> <jar name="../lib/ext/providerutil.jar"/> <jar name="../lib/ext/fscontext.jar"/> <!-- DBManager needs JDBC access to a MySQL database --> - <jar name="../lib/ext/jdbc2_0-stdext.jar"/> - <jar name="../lib/ext/mysql-connector-java-3.1.12-bin.jar"/> + <!-- <jar name="../lib/ext/jdbc2_0-stdext.jar"/> --> + <jar name="../lib/ext/mysql-connector-java-5.1.6-bin.jar"/> </classpath> <parameters> Modified: trunk/tests/nodeconfig.xml =================================================================== --- trunk/tests/nodeconfig.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/nodeconfig.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -68,9 +68,9 @@ </task-runner-definitions> - <jvm-definitions default="1.4.2"> - <jvm version="1.4.2" java-home="/opt/j2sdk1.4.2_13"/> - <jvm version="1.5.0" java-home="/opt/jdk1.5.0_06"/> + <jvm-definitions default="1.5.0"> + <jvm version="1.5.0" java-home="/opt/jdk1.5.0_15"/> + <jvm version="1.6.0" java-home="/opt/jdk1.6.0_05"/> </jvm-definitions> </test-node-configuration> Modified: trunk/tests/products/ComputeServer.xml =================================================================== --- trunk/tests/products/ComputeServer.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/products/ComputeServer.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -44,7 +44,7 @@ <set name="COMPUTE_HOME" value="/tmp/DTF/testenv/compute/product" /> <set name="COMPUTEQA_HOME" value="/tmp/DTF/testenv/compute/qa" /> </sets> - <jvm id="1.4.2" /> + <jvm id="1.5.0" /> <default-classpath name="main" /> <node-exclusions /> </node-configuration> Modified: trunk/tests/products/TestProduct.xml =================================================================== --- trunk/tests/products/TestProduct.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/products/TestProduct.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -49,7 +49,7 @@ <set name="PRODUCT_HOME" value="/tmp/DTF/testenv/sample/product" /> <set name="QA_HOME" value="/tmp/DTF/testenv/sample/qa" /> </sets> - <jvm id="1.4.2" /> + <jvm id="1.5.0" /> <default-classpath name="main" /> <node-exclusions /> </node-configuration> Modified: trunk/tests/results_collator.xml =================================================================== --- trunk/tests/results_collator.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/tests/results_collator.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -33,11 +33,12 @@ <!-- ResultsCollator needs to parse XML product descriptions --> <jar name="../lib/ext/jdom.jar"/> - <jar name="../lib/ext/xerces.jar"/> + <!-- <jar name="../lib/ext/xerces.jar"/> --> + <!-- ResultsCollator needs to commun icate with the MySQL dtf database --> - <jar name="../lib/ext/jdbc2_0-stdext.jar"/> - <jar name="../lib/ext/mysql-connector-java-3.1.12-bin.jar"/> + <!-- <jar name="../lib/ext/jdbc2_0-stdext.jar"/> --> + <jar name="../lib/ext/mysql-connector-java-5.1.6-bin.jar"/> <!-- The ZIP file plugin --> <!-- <jar name="../lib/AMSPlugin.jar"/> --> Modified: trunk/xml/context.xml =================================================================== --- trunk/xml/context.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/xml/context.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -18,9 +18,10 @@ (C) 2008, @author JBoss Inc. --> -<!-- the Tomcat 5 Context for the DTF web application --> +<!-- the Tomcat 6 Context for the DTF web application --> -<Context> +<Context privileged="true"> + <!-- privileged is needed to allow use of the invoker servlet --> <!-- set up JDBC access to the DTF database for the DTF web application --> <Resource name="jdbc/ResultsDB" Modified: trunk/xml/web.xml =================================================================== --- trunk/xml/web.xml 2008-04-15 14:44:54 UTC (rev 9) +++ trunk/xml/web.xml 2008-04-15 16:21:17 UTC (rev 10) @@ -32,12 +32,11 @@ no description </description> - <!-- + <!-- this requies the invoker servlet to be uncommented in tomcat's web.xml or moved in here --> <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping> - --> <welcome-file-list> <welcome-file>default.jsp</welcome-file>