[jboss-cvs] JBossAS SVN: r61342 - trunk/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 15 13:59:51 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-03-15 13:59:51 -0400 (Thu, 15 Mar 2007)
New Revision: 61342
Modified:
trunk/testsuite/build.xml
Log:
Update the create-config patternsets to AS 5 usage
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-03-15 17:41:21 UTC (rev 61341)
+++ trunk/testsuite/build.xml 2007-03-15 17:59:51 UTC (rev 61342)
@@ -1153,9 +1153,10 @@
<create-config baseconf="default" newconf="tomcat-ssl">
<patternset>
<include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
<include name="lib/**"/>
+ <include name="deploy/jmx-invoker-service.xml"/>
</patternset>
</create-config>
@@ -1188,13 +1189,13 @@
<patternset>
<include name="conf/**"/>
<include name="deployers/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
+ <include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<server:start name="tomcat-sso"/>
@@ -1253,10 +1254,10 @@
newconf-src="tomcat-webctx">
<patternset>
<include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
<include name="lib/**"/>
+ <include name="deploy/jmx-invoker-service.xml"/>
</patternset>
</create-config>
@@ -1272,19 +1273,17 @@
description="Tomcat tests requiring Federation configured">
<!-- Create the federation enabled tomcat config starting with the default config -->
<create-config baseconf="default" newconf="tomcat-federation">
- <patternset>
+ <patternset>
<include name="conf/**"/>
- <include name="deploy/jbossweb-tomcat6.sar/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<copy file="${source.resources}/web/federation/authext/jboss-service.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat6.sar/META-INF" />
@@ -1892,6 +1891,7 @@
<create-config baseconf="default" newconf="jrmp-invoker">
<patternset>
<include name="conf/**"/>
+ <include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
</patternset>
@@ -1914,14 +1914,15 @@
<create-config baseconf="default" newconf="deployment-service">
<patternset>
<include name="conf/**"/>
- <include name="deploy/jbossweb-tomcat6.sar/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jms/**"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<!-- overlay the deployment-service stuff -->
@@ -2292,24 +2293,20 @@
<create-config baseconf="default" newconf="jacc">
<patternset>
<include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
<include name="deploy/jbossws14.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/jms/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
<include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<!-- Copy the test-destinations-service.xml to the all config.
@@ -2345,24 +2342,20 @@
<create-config baseconf="default" newconf="jacc-securitymgr" newconf-src="jacc">
<patternset>
<include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
<include name="deploy/jbossws14.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/jms/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
<include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<!-- TODO: Need to fix JBAS-4154
@@ -2401,22 +2394,18 @@
<create-config baseconf="default" newconf="jaspi">
<patternset>
<include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/jms/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
<include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="lib/**"/>
</patternset>
</create-config>
<server:start name="jaspi"/>
@@ -2448,22 +2437,17 @@
<create-config baseconf="default" newconf="opends">
<patternset>
<include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="lib/**"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
<include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
<include name="deploy/properties**"/>
- <include name="deployers/**"/>
- <include name="lib/**"/>
</patternset>
</create-config>
@@ -3178,9 +3162,10 @@
<!-- Create the sso enabled tomcat config starting with the default config -->
<create-config baseconf="default" newconf="jbpm-bpel">
<patternset>
- <include name="conf/**" />
- <include name="deploy/**" />
- <include name="lib/**" />
+ <include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/**"/>
+ <include name="lib/**"/>
</patternset>
</create-config>
<server:start name="jbpm-bpel"/>
More information about the jboss-cvs-commits
mailing list