Author: thomas.diesler(a)jboss.com Date: 2007-01-25 11:20:03 -0500 (Thu, 25 Jan 2007) New Revision: 2114 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml branches/jbossws-1.2.0/jbossws-tests/build.xml Log: add tomcat-users.xml Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 16:04:03 UTC (rev 2113) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 16:20:03 UTC (rev 2114) @@ -7,21 +7,21 @@ # Module settings # MODULE=TC-5.5 -HUDSON_HOME=(a)hudson.home@ WORKSPACE=`pwd` # # copy tomcat installation # -cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE +cp -r @hudson.home@/../apache-tomcat $WORKSPACE rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* rm -rf $WORKSPACE/apache-tomcat/work rm -rf $WORKSPACE/apache-tomcat/temp # -# copy tomcat server.xml +# copy tomcat config # cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf +cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf </command> </hudson.tasks.Shell> </builders> Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (rev 0) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-25 16:20:03 UTC (rev 2114) @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='utf-8'?> +<tomcat-users> + <role rolename="manager"/> + <user username="manager" password="manager" roles="manager"/> +</tomcat-users> Property changes on: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:04:03 UTC (rev 2113) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:20:03 UTC (rev 2114) @@ -129,7 +129,10 @@ <!-- Define excluded tests --> <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> - <available file="${jboss.client}/jboss-ejb3-client.jar"/> + <or> + <available file="${jboss.client}/jboss-ejb3-client.jar"/> + <isset property="integration.target.tomcat"/> + </or> </condition> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>