[jboss-cvs] JBossAS SVN: r69374 - trunk/testsuite/imports.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jan 26 21:03:04 EST 2008
Author: bstansberry at jboss.com
Date: 2008-01-26 21:03:04 -0500 (Sat, 26 Jan 2008)
New Revision: 69374
Modified:
trunk/testsuite/imports/server-config.xml
Log:
Clean out old unused stuff
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-01-27 01:09:29 UTC (rev 69373)
+++ trunk/testsuite/imports/server-config.xml 2008-01-27 02:03:04 UTC (rev 69374)
@@ -946,34 +946,9 @@
<include name="deploy-hasingleton/**"/>
<include name="farm/**"/>
<include name="lib/**"/>
- <!-- Stop spelling this out in detail; way too prone to breakage
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-jdbc-metadata.sar"/>
- <include name="deploy/jbossweb-*.sar/**"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/cluster-beans.xml"/>
- <include name="deploy/jgroups-multiplexer.sar/**"/>
- <include name="deploy/cache-invalidation-service.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-jca.sar"/>
- <include name="deploy/transaction-service.xml"/>
- <include name="deploy/jboss-web-cluster/**"/>
- <include name="deploy/ejb2-timer-service.xml"/>
- <include name="deploy/ejb3-*.xml"/>
- <include name="deploy/jbossws*.sar/**"/>
- <include name="deploy/deploy.last/farm-beans.xml"/>
- <include name="deploy/properties-service.xml"/>
- <include name="deploy/security*/**"/>
- -->
</fileset>
</copy>
- <antcall target="modify-farming">
- <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/deploy.last/farm-beans.xml"/>
- </antcall>
+ <!-- FIXME only needs to be done in the ejb3 testsuite -->
<antcall target="modify-ejb3-repl_sync">
<param name="file_" value="${jboss.dist}/server/@{conf}/deploy/cluster/ejb3-clustered-sfsbcache-beans.xml"/>
</antcall>
@@ -983,7 +958,7 @@
</sequential>
</macrodef>
- <!-- A macro for creating a test cluster config -->
+ <!-- A macro for creating a test cluster config that uses the ServiceBindingManager -->
<macrodef name="create-all-cluster-node"
description="Create a full cluster configuration">
<attribute name="conf"/>
@@ -1072,13 +1047,7 @@
</sequential>
</macrodef>
- <target name="modify-farming">
- <echo message="reducing the farm deployment scan time in ${file_}"/>
- <replaceregexp file="${file_}" byline="false" flags="is"
- match="5000"
- replace="1000"/>
- </target>
-
+ <!-- FIXME This only needs to be in the ejb3 testsuite -->
<target name="modify-ejb3-repl_sync">
<echo message="replacing the cache mode to REPL_SYNC in ${file_}"/>
<replaceregexp file="${file_}" byline="yes" flags="is"
@@ -1096,7 +1065,7 @@
<!-- A macro for creating a clustered sso config -->
<macrodef name="create-cluster-sso-node"
description="Create a simplified clustered-sso configuration">
- <attribute name="newconf"/>
+ <attribute name="newconf"/>
<sequential>
<create-config baseconf="all" newconf="@{newconf}"
newconf-src="tomcat-sso-cluster">
@@ -1107,19 +1076,6 @@
<include name="deploy-hasingleton/**"/>
<include name="farm/**"/>
<include name="lib/**"/>
- <!-- Stop spelling this out in detail; way too prone to breakage
- <include name="deploy/ROOT.war/**"/>
- <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="deploy/jboss-web-cluster/**"/>
- <include name="deploy/jgroups-multiplexer.sar/**"/>
- <include name="deploy/jbossws*.sar/**"/>
- <include name="deploy/ejb2-timer-service.xml"/>
- <include name="deploy/security*/**"/>
- -->
</patternset>
</create-config>
</sequential>
@@ -1161,7 +1117,6 @@
<attribute name="conf"/>
<attribute name="useBuddyRepl" default="false"/>
<sequential>
- <echo message="Giving a name to the Tomcat instance under ${jboss.dist}/server/@{conf}"/>
<!-- Switch from sync to async mode in cluster/jbossweb-cluster-beans.xml -->
<replace file="${jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-cluster-beans.xml"
token=""cacheModeString">REPL_ASYNC" value=""cacheModeString">REPL_SYNC"/>
@@ -1169,11 +1124,12 @@
<replace file="${jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-cluster-beans.xml"
token="<property name="enabled">true" value="<property name="enabled">@{useBuddyRepl}"/>
<!-- Added jvmRoute in server.xml -->
- <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/server.xml"
+ <echo message="Giving a name to the Tomcat instance under ${jboss.dist}/server/@{conf}"/>
+ <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/server.xml"
token="jvmRoute="@{conf}"" value=""/>
<replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/server.xml"
token="defaultHost" value="jvmRoute="@{conf}" defaultHost"/>
- <!-- Turn on UseJK in jboss-service.xml -->
+ <!-- Turn on UseJK in war-deployers-beans.xml -->
<replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
token=""useJK">false<" value=""useJK">true<"/>
</sequential>
More information about the jboss-cvs-commits
mailing list