[jboss-cvs] JBossAS SVN: r58590 - trunk/testsuite/imports
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 18 06:47:00 EST 2006
Author: bstansberry at jboss.com
Date: 2006-11-18 06:46:59 -0500 (Sat, 18 Nov 2006)
New Revision: 58590
Modified:
trunk/testsuite/imports/server-config.xml
Log:
Configure mux stacks
Use -beans.xml for configs
Tweaks to reflects where things are located now
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2006-11-18 11:44:37 UTC (rev 58589)
+++ trunk/testsuite/imports/server-config.xml 2006-11-18 11:46:59 UTC (rev 58590)
@@ -135,6 +135,16 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
</server>
+ <server name="cluster-udp-sync-0" host="${node0}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ </server>
+ <server name="cluster-udp-sync-1" host="${node1}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ </server>
<server name="cluster-udp-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
@@ -154,34 +164,42 @@
<server name="cluster-udp-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-udp-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-field-udp-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-field-udp-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-udp-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-udp-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-field-udp-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-field-udp-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="cluster-tcp-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
@@ -191,6 +209,14 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
</server>
+ <server name="cluster-tcp-sync-0" host="${node0}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ </server>
+ <server name="cluster-tcp-sync-1" host="${node1}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ </server>
<server name="cluster-field-tcp-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
@@ -201,35 +227,35 @@
</server>
<server name="cluster-tcp-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-tcp-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-field-tcp-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-field-tcp-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-tcp-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-tcp-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-field-tcp-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-field-tcp-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
</server>
<server name="cluster-tcp_nio-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
@@ -249,44 +275,56 @@
</server>
<server name="cluster-tcp_nio-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-tcp_nio-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-field-tcp_nio-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-field-tcp_nio-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-tcp_nio-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-tcp_nio-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-field-tcp_nio-TOTAL-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="cluster-field-tcp_nio-TOTAL-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
</server>
<server name="tomcat-sso-cluster0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
<server name="tomcat-sso-cluster1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
+ <server name="tomcat-sso-cluster-br0" host="${node0}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ </server>
+ <server name="tomcat-sso-cluster-br1" host="${node1}">
+ <sysproperty key="resolve.dns" value="false" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ </server>
<server name="dtm0" host="${node0}"/>
<server name="dtm1" host="${node1}"/>
<server name="dtm2" host="${node2}"/>
@@ -393,6 +431,7 @@
<fileset dir="${jboss.dist}/server/all">
<include name="conf/**"/>
<include name="lib/**"/>
+ <include name="deployers/**"/>
<include name="deploy/ear-deployer.xml"/>
<include name="deploy/ejb-deployer.xml"/>
<include name="deploy/jbossjca-service.xml"/>
@@ -401,7 +440,7 @@
<include name="deploy/jbossweb-*.sar/**"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/cluster-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"/>
@@ -412,15 +451,16 @@
<include name="deploy/jboss-aop*.deployer/**"/>
<include name="deploy/ejb3-*.xml"/>
<include name="deploy/ejb3.deployer/**"/>
- <include name="deploy/jbossws*.sar/**"/>
- <include name="deploy/deploy.last/farm-service.xml"/>
+ <include name="deploy/jbossws*.sar/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="deploy/deploy.last/farm-beans.xml"/>
</fileset>
</copy>
<antcall target="modify-farming">
- <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/deploy.last/farm-service.xml"/>
+ <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/deploy.last/farm-beans.xml"/>
</antcall>
<antcall target="modify-ejb3-repl_sync">
- <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
+ <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-beans.xml"/>
</antcall>
</sequential>
</macrodef>
@@ -470,6 +510,37 @@
match="REPL_ASYNC"
replace="REPL_SYNC"/>
</target>
+
+ <!-- A macro for creating a clustered sso config -->
+ <macrodef name="create-cluster-sso-node"
+ description="Create a simplified clustered-sso configuration">
+ <attribute name="newconf"/>
+ <sequential>
+ <create-config baseconf="all" newconf="@{newconf}"
+ newconf-src="tomcat-sso-cluster">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy/jbossweb*.sar/**"/>
+ <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"/>
+ <!-- Whichever AOP Deployer they built -->
+ <include name="deploy/jboss-aop*.deployer/**"/>
+ <include name="deploy/tc6-cluster.sar/**"/>
+ <include name="deploy/jgroups-multiplexer.sar/**"/>
+ <include name="deploy/jbossws*.sar/**"/>
+ <include name="deploy/ROOT.war/**"/>
+ <include name="deployers/**"/>
+ <include name="lib/**"/>
+ </patternset>
+ </create-config>
+ </sequential>
+ </macrodef>
<!-- Macro for creating a test config with DTM and CORBA OTS -->
@@ -592,20 +663,20 @@
<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 tc6-cluster.sar/META-INF/jboss-service.xml -->
- <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/jboss-service.xml"
- token=""CacheMode">REPL_ASYNC" value=""CacheMode">REPL_SYNC"/>
- <!-- Toggle buddy replication in tc5-cluster-service.xml -->
- <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/jboss-service.xml"
- token="buddyReplicationEnabled>true" value="buddyReplicationEnabled>@{useBuddyRepl}"/>
+ <!-- Switch from sync to async mode in tc6-cluster.sar/META-INF/tc6-cluster-beans.xml -->
+ <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+ token=""cacheModeString">REPL_ASYNC" value=""cacheModeString">REPL_SYNC"/>
+ <!-- Toggle buddy replication in tc6-cluster-beans.xml -->
+ <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+ token="<property name="enabled">true" value="<property name="enabled">@{useBuddyRepl}"/>
<!-- Added jvmRoute in server.xml -->
- <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb-tomcat6.sar/server.xml"
+ <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb-tomcat6.deployer/server.xml"
token="jvmRoute="@{conf}"" value=""/>
- <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb-tomcat6.sar/server.xml"
+ <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb-tomcat6.deployer/server.xml"
token="defaultHost" value="jvmRoute="@{conf}" defaultHost"/>
<!-- Turn on UseJK in jboss-service.xml -->
- <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml"
- token=""UseJK">false<" value=""UseJK">true<"/>
+ <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb-tomcat6.deployer/META-INF/war-deployers-beans.xml"
+ token=""useJK">false<" value=""useJK">true<"/>
</sequential>
</macrodef>
@@ -616,12 +687,12 @@
description="The jboss dist root directory" />
<sequential>
<echo message="Configuring the Tomcat instance under ${jboss.dist}/server/@{conf} for FIELD granularity"/>
- <!-- Switch on marshalling in tc6-cluster.sar/META-INF/jboss-service.xml -->
- <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/jboss-service.xml"
- token=""UseRegionBasedMarshalling">false" value=""UseRegionBasedMarshalling">true"/>
- <!-- Inactivate on startup in tc6-cluster.sar/META-INF/jboss-service.xml -->
- <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/jboss-service.xml"
- token=""InactiveOnStartup">false" value=""InactiveOnStartup">true"/>
+ <!-- Switch on marshalling in tc6-cluster.sar/META-INF/tc6-cluster-beans.xml -->
+ <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+ token=""useRegionBasedMarshalling">false" value=""useRegionBasedMarshalling">true"/>
+ <!-- Inactivate on startup in tc6-cluster.sar/META-INF/tc6-cluster-beans.xml -->
+ <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+ token=""inactiveOnStartup">false" value=""inactiveOnStartup">true"/>
</sequential>
</macrodef>
More information about the jboss-cvs-commits
mailing list