geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r990156 [1/2] - in /geronimo/server/branches/2.2/testsuite: ./ cluster-testsuite/ cluster-testsuite/ejb-multicast/ cluster-testsuite/ejb-multicast/src/ cluster-testsuite/ejb-multicast/src/main/ cluster-testsuite/ejb-multicast/src/main/resou...
Date Fri, 27 Aug 2010 14:06:02 GMT
Author: genspring
Date: Fri Aug 27 14:05:59 2010
New Revision: 990156

URL: http://svn.apache.org/viewvc?rev=990156&view=rev
Log:
GERONIMO-5469 Add EJB cluster testsuite, patch from Viola.

Added:
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/build.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/server-overrides.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/Load.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/build.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/server-overrides.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/Load.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/build.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/Load.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.class
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.class
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/RollbackTest.class
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/enterprise/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/RollbackTest.java
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/resources/
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/resources/jndi.properties
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/test/resources/testng.xml
Modified:
    geronimo/server/branches/2.2/testsuite/pom.xml

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/build.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/build.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/build.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/build.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+ |  
+ | Download Helios artifacts and unzip them into the user's local maven repo     
+ |                                                                                             
+ |                                                                                             
+ | @version $Rev$ $Date$
+ -->
+<project name="Mutlicast-setup"> 
+    <target name="win" description="Unzip Windows specific artifact(s)">                  
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/>        
+        <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.zip" 
+               dest="${Base_Dir}/server1"
+               overwrite="true"/>
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>
+       <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+         <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty>  
+        </java>-->             
+    </target>
+
+    
+    <target name="linux" description="Download Linux-specific artifact(s)">       
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1" />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+       <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>
+       <!-- <java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+         <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty>  
+        </java>-->
+        <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>     
+    </target>
+    
+  <target name="macos" description="Download Mac-specific artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1"
+               />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+        <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>
+       <!-- <java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+         <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty>  
+        </java>-->
+        <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>
+    </target>
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>cluster-testsuite</artifactId>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<version>2.2.2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>ejb-multicast</artifactId>
+	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multicast Tests</name>
+
+	<description>
+        EJB multicast test for the Geronimo cluster.
+   </description>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-server-instance</id>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<tasks>
+								<property name="LOCAL_M2_REPO" value="${settings.localRepository}" />
+								<property name="geronimo_versoin" value="${version}" />
+								<property name="Base_Dir" value="${basedir}" />
+								<property name="Resources_Dir" value="${basedir}/src/main/resources/" />
+								<ant antfile="${basedir}/build.xml">
+									<target name="${platformFamily}" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.geronimo.buildsupport</groupId>
+				<artifactId>geronimo-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-server1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server1</geronimoHome>
+							<port>1100</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server1</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>1</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MulticastEnabled</name>
+											<value>true</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>start-server2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server2</geronimoHome>
+							<port>1109</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server2</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>10</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MulticastEnabled</name>
+											<value>true</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<port>1100</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<port>1109</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-server1</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>stop-server</goal>
+						</goals>
+						<configuration>
+							<port>1100</port>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<!-- Disable surefire plugin and make it not run in the testsuites -->
+					<skip>false</skip>
+				</configuration>
+				<!-- By default, use failsafe plugin -->
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+					<execution>
+						<id>integration</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testFailureIgnore>true</testFailureIgnore>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>child</id>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>win</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>unix-x86</id>
+			<activation>
+				<os>
+					<family>unix</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>linux</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>macos</platformFamily>
+			</properties>
+		</profile>
+	</profiles>
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/server-overrides.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/server-overrides.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/server-overrides.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/main/resources/var/config/overrides/server-overrides.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 2566 $ $Date: 2008-05-16 01:28:53 +0800 (Fri, 16 May 2008) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<module name="org.apache.geronimo.configs/activemq-broker/${geronimoVersion}/car" load="false"/>
+<module name="org.apache.geronimo.configs/activemq-ra/${geronimoVersion}/car" load="false">
+<gbean name="ActiveMQ RA">
+<attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
+</gbean>
+</module>
+<module name="org.apache.geronimo.plugins/activemq-console-tomcat/${geronimoVersion}/car" load="false"/>
+</attributes>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.testsuite;
+
+import java.util.Properties;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.ejb.EJB;
+import org.superbiz.load.Load;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Unit test for simple App.
+ */
+public class EJBMulticastTest {
+    
+    /**
+     * Rigourous Test :-)
+     */
+	@Test
+    public void testEJBMulticast()
+    {
+        //Remote lookup
+            Properties p = new Properties();
+            p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+            Load loadRemote = null;           
+            
+            //Multicast
+            p.setProperty(Context.PROVIDER_URL,"multicast://239.255.3.2:6142?group=cluster1");
+            Context context1;
+			try {
+				context1 = new InitialContext(p);
+				loadRemote =(Load) context1.lookup("LoadBeanRemote");
+				Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"multicast://239.255.3.2:6142?group=cluster1");
+				Assert.assertNotNull(loadRemote.getNodeName());
+				Assert.assertEquals(loadRemote.add(1, 2), 3);          
+				Assert.assertEquals(loadRemote.sum(1,2,1), 4);
+			} catch (NamingException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();			}
+            
+            
+            p.setProperty(Context.PROVIDER_URL,"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211,multicast://239.255.3.2:6142");
+            
+            try {
+            	Context context3 = new InitialContext(p);
+				loadRemote =(Load) context3.lookup("LoadBeanRemote");
+				Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211,multicast://239.255.3.2:6142");
+				Assert.assertNotNull(loadRemote.getNodeName());				
+				Assert.assertEquals(loadRemote.add(1, 2), 3);          
+				Assert.assertEquals(loadRemote.sum(1,2,1), 4);
+			} catch (NamingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+            
+    }
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/Load.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/Load.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/Load.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/superbiz/load/Load.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.superbiz.load;
+
+public interface Load {
+    public void ping();
+
+    public int add(int a, int b);
+
+    public int sum(int... items);
+    
+    public String getNodeName();
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/build.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/build.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/build.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/build.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+ |  
+ | Download Helios artifacts and unzip them into the user's local maven repo     
+ |                                                                                             
+ |                                                                                             
+ | @version $Rev$ $Date$
+ -->
+<project name="Mutlipoint-setup"> 
+    <target name="win" description="Unzip Windows specific artifact(s)">                  
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/>        
+        <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.zip" 
+               dest="${Base_Dir}/server1"
+               overwrite="true"/>
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>
+       <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>     
+    </target>
+
+    
+    <target name="linux" description="Download Linux-specific artifact(s)">       
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1" />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+       <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+        <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty> 
+        </java>-->
+        <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>
+    </target>
+    
+  <target name="macos" description="Download Mac-specific artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1"
+               />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+        <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+        <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty> 
+        </java>-->
+        <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>
+    </target>
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>cluster-testsuite</artifactId>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<version>2.2.2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>ejb-multipoint</artifactId>
+	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multipoint Tests</name>
+
+	<description>
+        EJB multipoint test for the Geronimo cluster.
+   </description>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-server-instances</id>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<tasks>
+								<property name="LOCAL_M2_REPO" value="${settings.localRepository}" />
+								<property name="geronimo_versoin" value="${version}" />
+								<property name="Base_Dir" value="${basedir}" />
+								<property name="Resources_Dir" value="${basedir}/src/main/resources/" />
+								<ant antfile="${basedir}/build.xml">
+									<target name="${platformFamily}" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.geronimo.buildsupport</groupId>
+				<artifactId>geronimo-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-server1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server1</geronimoHome>
+							<port>1100</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server1</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>1</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MultipointEnabled</name>
+											<value>true</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MultipointServers</name>
+											<value>127.0.0.1:4213, 127.0.0.1:4222</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>start-server2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server2</geronimoHome>
+							<port>1109</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server2</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>10</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MultipointEnabled</name>
+											<value>true</value>
+										</property>
+										<property>
+											<name>org.apache.geronimo.config.substitution.MultipointServers</name>
+											<value>127.0.0.1:4213, 127.0.0.1:4222</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<port>1100</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<port>1109</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-server1</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>stop-server</goal>
+						</goals>
+						<configuration>
+							<port>1100</port>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<!-- Disable surefire plugin and make it not run in the testsuites -->
+					<skip>false</skip>
+				</configuration>
+				<!-- By default, use failsafe plugin -->
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>integration</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testFailureIgnore>true</testFailureIgnore>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>child</id>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>win</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>unix-x86</id>
+			<activation>
+				<os>
+					<family>unix</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>linux</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>macos</platformFamily>
+			</properties>
+		</profile>
+	</profiles>
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/server-overrides.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/server-overrides.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/server-overrides.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/main/resources/var/config/overrides/server-overrides.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 2566 $ $Date: 2008-05-16 01:28:53 +0800 (Fri, 16 May 2008) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<module name="org.apache.geronimo.configs/activemq-broker/${geronimoVersion}/car" load="false"/>
+<module name="org.apache.geronimo.configs/activemq-ra/${geronimoVersion}/car" load="false">
+<gbean name="ActiveMQ RA">
+<attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
+</gbean>
+</module>
+<module name="org.apache.geronimo.plugins/activemq-console-tomcat/${geronimoVersion}/car" load="false"/>
+</attributes>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.testsuite;
+
+import java.util.Properties;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.ejb.EJB;
+import org.superbiz.load.Load;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Unit test for simple App.
+ */
+public class EJBMultipointTest {
+    
+    /**
+     * Rigourous Test :-)
+     */
+	@Test
+    public void testEJBSinglepoint()
+    {
+        //Remote lookup
+            Properties p = new Properties();
+            p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+            Load loadRemote = null;             
+            p.setProperty(Context.PROVIDER_URL,"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211");            
+            try {
+            	Context context3 = new InitialContext(p);
+				loadRemote =(Load) context3.lookup("LoadBeanRemote");
+				Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211");
+				Assert.assertNotNull(loadRemote.getNodeName());				
+				Assert.assertEquals(loadRemote.add(1, 2), 3); 
+				Assert.assertEquals(loadRemote.sum(1,2,1), 4);
+			} catch (NamingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+            
+    }
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/Load.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/Load.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/Load.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/superbiz/load/Load.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.superbiz.load;
+
+public interface Load {
+    public void ping();
+
+    public int add(int a, int b);
+
+    public int sum(int... items);
+    
+    public String getNodeName();
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/build.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/build.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/build.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/build.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+ |  
+ | Download Helios artifacts and unzip them into the user's local maven repo     
+ |                                                                                             
+ |                                                                                             
+ | @version $Rev$ $Date$
+ -->
+<project name="Singlepoint-setup">
+    <target name="win" description="Unzip Windows specific artifact(s)">                  
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/>        
+        <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.zip" 
+               dest="${Base_Dir}/server1"
+               overwrite="true"/>
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>
+       <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>        
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+        <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty> 
+        </java>-->
+    </target>
+
+    
+    <target name="linux" description="Download Linux-specific artifact(s)">       
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: multicast assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1" />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+        <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>        
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+        <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty> 
+        </java>-->     
+       <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>
+    </target>
+    
+  <target name="macos" description="Download Mac-specific artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                               </echo>
+        <echo>## Unzipping: multicast assembly                                                 </echo>
+        <echo>##                                                                               </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${Base_Dir}/server1" quiet="true"/>          
+        <mkdir dir="${Base_Dir}/server1"/> 
+        <gunzip src="${LOCAL_M2_REPO}/org/apache/geronimo/assemblies/geronimo-tomcat6-javaee5/${geronimo_versoin}/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar.gz"
+               dest="${Base_Dir}/server1"
+               />    
+        <untar src="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}-bin.tar"
+               dest="${Base_Dir}/server1"
+               />
+        <copy todir="${Base_Dir}/server1">
+        <fileset dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}"/>        
+        </copy>
+        <delete dir="${Base_Dir}/server1/geronimo-tomcat6-javaee5-${geronimo_versoin}" quiet="true"/>     
+         <delete dir="${Base_Dir}/server2" quiet="true"/>          
+       <mkdir dir="${Base_Dir}/server2"/>
+       <copy todir="${Base_Dir}/server2">
+        <fileset dir="${Base_Dir}/server1"/>        
+        </copy>        
+        <!--<java classname="org.apache.geronimo.testsuite.SetClusterConfiguration">
+        <classpath>
+         <pathelement path="${Base_Dir}/target/classes/"/>
+        </classpath>
+        <sysproperty key="base_path" value="${Base_Dir}">  
+            </sysproperty> 
+        </java>-->      
+       <chmod dir="${Base_Dir}/server1/bin" perm="ugo+rwx" includes="**/*"/>
+       <chmod dir="${Base_Dir}/server2/bin" perm="ugo+rwx" includes="**/*"/>
+    </target>
+
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>cluster-testsuite</artifactId>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<version>2.2.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>ejb-singlepoint</artifactId>
+	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Singlepoint Tests</name>
+	<description>
+EJB singlepoint test for the Geronimo cluster.
+</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-system</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-plugin</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-server-instance</id>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<tasks>
+								<property name="LOCAL_M2_REPO" value="${settings.localRepository}" />
+								<property name="geronimo_versoin" value="${version}" />
+								<property name="Base_Dir" value="${basedir}" />
+								<property name="Resources_Dir" value="${basedir}/src/main/resources/" />
+								<ant antfile="${basedir}/build.xml">
+									<target name="${platformFamily}" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.geronimo.buildsupport</groupId>
+				<artifactId>geronimo-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-server1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides-1.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server1</geronimoHome>
+							<port>1100</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server1</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>1</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>start-server2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>start-server</goal>
+						</goals>
+						<configuration>
+							<overrides>
+								<ServerOverride>
+									<server>default</server>
+									<overrides>server-overrides-2.xml</overrides>
+								</ServerOverride>
+							</overrides>
+							<geronimoHome>${basedir}/server2</geronimoHome>
+							<port>1109</port>
+							<logOutput>true</logOutput>
+							<background>true</background>
+							<verifyTimeout>300</verifyTimeout>
+							<refresh>true</refresh>
+							<optionSets>
+								<optionSet>
+									<id>default</id>
+									<options>
+										<option>-XX:MaxPermSize=256m</option>
+										<option>-Dnode.name=server2</option>
+									</options>
+									<properties>
+										<property>
+											<name>org.apache.geronimo.config.substitution.PortOffset</name>
+											<value>10</value>
+										</property>
+									</properties>
+								</optionSet>
+							</optionSets>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-1</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<modulePlan>${basedir}/src/main/resources/slsb_sample.xml</modulePlan>
+							<port>1100</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-ejb-2</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>deploy-module</goal>
+						</goals>
+						<configuration>
+							<moduleArchive>${basedir}/src/main/resources/load-bean.jar</moduleArchive>
+							<modulePlan>${basedir}/src/main/resources/slsb_sample.xml</modulePlan>
+							<port>1109</port>
+							<startModules>true</startModules>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-server1</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>stop-server</goal>
+						</goals>
+						<configuration>
+							<port>1100</port>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<!-- Disable surefire plugin and make it not run in the testsuites -->
+					<skip>false</skip>
+				</configuration>
+				<!-- By default, use failsafe plugin -->
+
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>integration</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testFailureIgnore>true</testFailureIgnore>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>child</id>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>win</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>unix-x86</id>
+			<activation>
+				<os>
+					<family>unix</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>linux</platformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<platformFamily>macos</platformFamily>
+			</properties>
+		</profile>
+	</profiles>
+</project>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
+   xmlns:wadi="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2">
+	<environment>
+       <moduleId>
+           <groupId>org.superbiz</groupId>
+           <artifactId>load-beans</artifactId>
+           <version>1.0</version>
+           <type>car</type>
+       </moduleId>
+   </environment>
+    
+   <wadi:openejb-clustering-wadi>
+      <wadi:deltaReplication>false</wadi:deltaReplication>
+  </wadi:openejb-clustering-wadi>
+</ejb-jar>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 2566 $ $Date: 2008-05-16 01:28:53 +0800 (Fri, 16 May 2008) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<module name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car">
+<gbean name="DefaultBackingStrategyFactory">
+		     <attribute name="nbReplica">${ReplicaCount}</attribute>
+	      </gbean>
+<gbean name="DefaultDispatcherHolder">
+		<attribute name="disableMCastService">true</attribute>
+		<attribute name="receiverPort">4002</attribute>
+		<attribute name="endPointURI">${EndPointURI}</attribute>
+		<attribute name="clusterName">${WADIClusterName}</attribute>
+		<reference name="staticMember">
+			<pattern>
+				<groupId>org.apache.geronimo.configs</groupId>
+				<artifactId>wadi-clustering</artifactId>
+				<version>${geronimoVersion}</version>
+				<type>car</type>
+				<name>firstStaticMember</name>
+			</pattern>
+		</reference>
+	</gbean>
+	<gbean
+		name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car?ServiceModule=org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car,j2eeType=GBean,name=firstStaticMember"
+		gbeanInfo="org.apache.geronimo.clustering.wadi.WadiStaticMember">
+		<attribute name="className">org.apache.catalina.tribes.membership.StaticMember</attribute>
+		<attribute name="port">4002</attribute>
+		<attribute name="securePort">-1</attribute>
+		<attribute name="domain">test-domain</attribute>
+		<attribute name="UniqueId">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</attribute>
+		<attribute name="host">127.0.0.1</attribute>
+		<reference name="nextWadiStaticMember">
+			<pattern>
+				<groupId>org.apache.geronimo.configs</groupId>
+				<artifactId>wadi-clustering</artifactId>
+				<version>${geronimoVersion}</version>
+				<type>car</type>
+				<name>secondStaticMember</name>
+			</pattern>
+		</reference>
+	</gbean>
+	<gbean
+		name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car?ServiceModule=org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car,j2eeType=GBean,name=secondStaticMember"
+		gbeanInfo="org.apache.geronimo.clustering.wadi.WadiStaticMember">
+		<attribute name="className">org.apache.catalina.tribes.membership.StaticMember</attribute>
+		<attribute name="port">4003</attribute>
+		<attribute name="securePort">-1</attribute>
+		<attribute name="domain">test-domain</attribute>
+		<attribute name="UniqueId">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1</attribute>
+		<attribute name="host">127.0.0.1</attribute>
+		<reference name="nextWadiStaticMember" />
+	</gbean>
+</module>
+<module name="org.apache.geronimo.configs/activemq-broker/${geronimoVersion}/car" load="false"/>
+<module name="org.apache.geronimo.configs/activemq-ra/${geronimoVersion}/car" load="false">
+<gbean name="ActiveMQ RA">
+<attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
+</gbean>
+</module>
+<module name="org.apache.geronimo.plugins/activemq-console-tomcat/${geronimoVersion}/car" load="false"/>
+</attributes>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 2566 $ $Date: 2008-05-16 01:28:53 +0800 (Fri, 16 May 2008) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
+ <module name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car">
+        <gbean name="DefaultBackingStrategyFactory">
+		     <attribute name="nbReplica">${ReplicaCount}</attribute>
+	      </gbean>
+	<gbean name="DefaultDispatcherHolder">
+		<attribute name="disableMCastService">true</attribute>
+		<attribute name="receiverPort">4003</attribute>
+		<attribute name="endPointURI">${EndPointURI}</attribute>
+		<attribute name="clusterName">${WADIClusterName}</attribute>
+		<reference name="staticMember">
+			<pattern>
+				<groupId>org.apache.geronimo.configs</groupId>
+				<artifactId>wadi-clustering</artifactId>
+				<version>${geronimoVersion}</version>
+				<type>car</type>
+				<name>firstStaticMember</name>
+			</pattern>
+		</reference>
+	</gbean>
+	<gbean
+		name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car?ServiceModule=org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car,j2eeType=GBean,name=firstStaticMember"
+		gbeanInfo="org.apache.geronimo.clustering.wadi.WadiStaticMember">
+		<attribute name="className">org.apache.catalina.tribes.membership.StaticMember</attribute>
+		<attribute name="port">4003</attribute>
+		<attribute name="securePort">-1</attribute>
+		<attribute name="domain">test-domain</attribute>
+		<attribute name="UniqueId">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</attribute>
+		<attribute name="host">127.0.0.1</attribute>
+		<reference name="nextWadiStaticMember">
+			<pattern>
+				<groupId>org.apache.geronimo.configs</groupId>
+				<artifactId>wadi-clustering</artifactId>
+				<version>${geronimoVersion}</version>
+				<type>car</type>
+				<name>secondStaticMember</name>
+			</pattern>
+		</reference>
+	</gbean>
+	<gbean
+		name="org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car?ServiceModule=org.apache.geronimo.configs/wadi-clustering/${geronimoVersion}/car,j2eeType=GBean,name=secondStaticMember"
+		gbeanInfo="org.apache.geronimo.clustering.wadi.WadiStaticMember">
+		<attribute name="className">org.apache.catalina.tribes.membership.StaticMember</attribute>
+		<attribute name="port">4002</attribute>
+		<attribute name="securePort">-1</attribute>
+		<attribute name="domain">test-domain</attribute>
+		<attribute name="UniqueId">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1</attribute>
+		<attribute name="host">127.0.0.1</attribute>
+		<reference name="nextWadiStaticMember" />
+	</gbean>
+</module>
+<module name="org.apache.geronimo.configs/activemq-broker/${geronimoVersion}/car" load="false"/>
+<module name="org.apache.geronimo.configs/activemq-ra/${geronimoVersion}/car" load="false">
+<gbean name="ActiveMQ RA">
+<attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
+</gbean>
+</module>
+<module name="org.apache.geronimo.plugins/activemq-console-tomcat/${geronimoVersion}/car" load="false"/>
+</attributes>

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.testsuite;
+
+import java.util.Properties;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.ejb.EJB;
+import org.superbiz.load.Load;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Unit test for simple App.
+ */
+public class EJBSinglepointTest {
+    
+    /**
+     * Rigourous Test :-)
+     */
+	@Test
+    public void testEJBMultipoint()
+    {
+        //Remote lookup
+            Properties p = new Properties();
+            p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+            Load loadRemote = null;             
+            p.setProperty(Context.PROVIDER_URL,"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211");            
+            try {
+            	Context context3 = new InitialContext(p);
+				loadRemote =(Load) context3.lookup("LoadBeanRemote");
+				Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"failover:ejbd://127.0.0.1:4202,ejbd://127.0.0.1:4211");
+				Assert.assertNotNull(loadRemote.getNodeName());				
+				Assert.assertEquals(loadRemote.add(1, 2), 3); 
+				Assert.assertEquals(loadRemote.sum(1,2,1), 4);
+			} catch (NamingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+            
+    }
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/Load.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/Load.java?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/Load.java (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/superbiz/load/Load.java Fri Aug 27 14:05:59 2010
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.superbiz.load;
+
+public interface Load {
+    public void ping();
+
+    public int add(int a, int b);
+
+    public int sum(int... items);
+    
+    public String getNodeName();
+}

Added: geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml?rev=990156&view=auto
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml (added)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml Fri Aug 27 14:05:59 2010
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>testsuite</artifactId>
+    <groupId>org.apache.geronimo.testsuite</groupId>
+    <version>2.2.2-SNAPSHOT</version>
+  </parent>  
+  
+  <artifactId>cluster-testsuite</artifactId> 
+  <name>Geronimo TestSuite :: Cluster Testsuite</name>
+  <packaging>pom</packaging>
+  
+  <description>
+        Geronimo cluster testsuite.
+  </description>
+  <dependencies>
+   <dependency>
+     <groupId>org.testng</groupId>
+     <artifactId>testng</artifactId>                
+     <classifier>jdk15</classifier>
+     <scope>test</scope>         
+     </dependency>
+    <dependency>
+     <groupId>org.apache.openejb</groupId>
+     <artifactId>openejb-ejbd</artifactId>      
+     <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId> 
+      <artifactId>geronimo-ejb_3.0_spec</artifactId> 
+      <scope>provided</scope>             
+    </dependency>    
+  </dependencies>
+  
+  <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>it-manual</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>                    
+                </plugins>
+            </build>
+        </profile>
+
+
+        <profile>
+            <id>child</id>
+        </profile>   
+
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>ejb-multicast</module>
+                <module>ejb-multipoint</module>
+                <module>ejb-singlepoint</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>

Added: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.class
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.class?rev=990156&view=auto
==============================================================================
Files geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.class (added) and geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/bin/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.class Fri Aug 27 14:05:59 2010 differ



Mime
View raw message