geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1001576 - in /geronimo/server/branches/2.2/testsuite/cluster-testsuite: ./ ejb-loadbean/ ejb-loadbean/src/main/java/org/superbiz/load/ ejb-loadbean/src/main/resources/META-INF/ ejb-multicast/ ejb-multicast/src/test/java/org/apache/geronimo...
Date Mon, 27 Sep 2010 02:59:58 GMT
Author: genspring
Date: Mon Sep 27 02:59:58 2010
New Revision: 1001576

URL: http://svn.apache.org/viewvc?rev=1001576&view=rev
Log:
Clean up clustering testsuite.

Modified:
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/java/org/superbiz/load/LoadBean.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml
    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-multipoint/pom.xml
    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-singlepoint/pom.xml
    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/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/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java
    geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml

Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml?rev=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml Mon Sep 27 02:59:58 2010
@@ -9,28 +9,21 @@
   </parent>
   <groupId>org.superbiz.load</groupId>
   <artifactId>loadbean</artifactId>  
+  <version>2.2.1-SNAPSHOT</version>
   <name>loadbean</name>  
  <dependencies>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>5.0-1</version>
-      <scope>provided</scope>
-    </dependency>  
-   
-    <!-- START SNIPPET: openejbdep -->
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-ejbd</artifactId>     
-    </dependency>
-    <!-- END SNIPPET: openejbdep -->
+       <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>  
-	<profiles>
-		<profile>
-			<id>child</id>
-		</profile>		
-	</profiles>
+    <profiles>
+        <profile>
+            <id>child</id>
+        </profile>        
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/java/org/superbiz/load/LoadBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/java/org/superbiz/load/LoadBean.java?rev=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/java/org/superbiz/load/LoadBean.java (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/java/org/superbiz/load/LoadBean.java Mon Sep 27 02:59:58 2010
@@ -18,19 +18,13 @@ package org.superbiz.load;
 
 import javax.ejb.Remote;
 import javax.ejb.Stateless;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+
 
 
 @Remote
 @Stateless
 public class LoadBean implements Load {
-	public String nodename =System.getProperty("node.name");
+    public String nodename =System.getProperty("node.name");
     public void ping() {
     System.out.println("pinging...." + nodename);
         // do nothing
@@ -51,6 +45,6 @@ public class LoadBean implements Load {
     }
     
     public String getNodeName() {
-    	return nodename;
+        return nodename;
     }
 }

Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml?rev=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml Mon Sep 27 02:59:58 2010
@@ -18,12 +18,12 @@ specific language governing permissions 
 under the License.
 -->
 <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
-	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-		<dep:moduleId>
-			<dep:groupId>org.superbiz</dep:groupId>
-			<dep:artifactId>load-beans</dep:artifactId>
-			<dep:version>1.0</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-	</dep:environment>
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <dep:moduleId>
+            <dep:groupId>org.superbiz</dep:groupId>
+            <dep:artifactId>load-beans</dep:artifactId>
+            <dep:version>2.2.1-SNAPSHOT</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+    </dep:environment>
 </openejb-jar>

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml Mon Sep 27 02:59:58 2010
@@ -1,18 +1,18 @@
 <?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.1-SNAPSHOT</version>
-	</parent>
+    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.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>ejb-multicast</artifactId>
-	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multicast Tests</name>
+    <artifactId>ejb-multicast</artifactId>
+    <name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multicast Tests</name>
 
-	<description>
+    <description>
         EJB multicast test for the Geronimo cluster.
    </description>
    <dependencies>
@@ -20,226 +20,230 @@
      <groupId>org.superbiz.load</groupId>
      <artifactId>loadbean</artifactId>
      <version>${version}</version>
-     </dependency>    
+     </dependency>
+     <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-client</artifactId>
+     </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="${project.build.directory}" />
-								<property name="Project_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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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>
+    <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="${project.build.directory}" />
+                                <property name="Project_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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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>

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/src/test/java/org/apache/geronimo/testsuite/EJBMulticastTest.java Mon Sep 27 02:59:58 2010
@@ -35,7 +35,7 @@ public class EJBMulticastTest {
     /**
      * Rigourous Test :-)
      */
-	@Test
+    @Test
     public void testEJBMulticast()
     {
         //Remote lookup
@@ -46,31 +46,31 @@ public class EJBMulticastTest {
             //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();			}
+            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();
-			}
+                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();
+            }
             
     }
 }

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml Mon Sep 27 02:59:58 2010
@@ -1,253 +1,257 @@
 <?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.1-SNAPSHOT</version>
-	</parent>
+    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.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>ejb-multipoint</artifactId>
-	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multipoint Tests</name>
+    <artifactId>ejb-multipoint</artifactId>
+    <name>Geronimo TestSuite :: Cluster Testsuite :: EJB Multipoint Tests</name>
 
-	<description>
+    <description>
         EJB multipoint test for the Geronimo cluster.
    </description>
    <dependencies>
-   <dependency>
-     <groupId>org.superbiz.load</groupId>
-     <artifactId>loadbean</artifactId>
-     <version>${project.version}</version>
-     </dependency>    
+       <dependency>
+             <groupId>org.superbiz.load</groupId>
+             <artifactId>loadbean</artifactId>
+             <version>${project.version}</version>
+         </dependency>    
+         <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-client</artifactId>
+         </dependency>         
   </dependencies>
-	<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="${project.build.directory}" />
-								<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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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>
+    <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="${project.build.directory}" />
+                                <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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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>
+                    <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>

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/src/test/java/org/apache/geronimo/testsuite/EJBMultipointTest.java Mon Sep 27 02:59:58 2010
@@ -35,7 +35,7 @@ public class EJBMultipointTest {
     /**
      * Rigourous Test :-)
      */
-	@Test
+    @Test
     public void testEJBSinglepoint()
     {
         //Remote lookup
@@ -44,16 +44,16 @@ public class EJBMultipointTest {
             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();
-			}
+                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();
+            }
             
     }
 }

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml Mon Sep 27 02:59:58 2010
@@ -1,248 +1,252 @@
 <?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.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>ejb-singlepoint</artifactId>
-	<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Singlepoint Tests</name>
-	<description>
+    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.1-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>
-		<dependency>
-     <groupId>org.superbiz.load</groupId>
-     <artifactId>loadbean</artifactId>
-     <version>${project.version}</version>
+    <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>
+        <dependency>
+             <groupId>org.superbiz.load</groupId>
+             <artifactId>loadbean</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="${project.build.directory}" />
-								<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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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 -->
+     <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-client</artifactId>
+     </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="${project.build.directory}" />
+                                <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>${project.build.directory}/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>${project.build.directory}/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>../ejb-loadbean/target/loadbean-${version}.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>../ejb-loadbean/target/loadbean-${version}.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>
+                <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>
+                    <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>

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/slsb_sample.xml Mon Sep 27 02:59:58 2010
@@ -1,7 +1,7 @@
 <?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>
+    <environment>
        <moduleId>
            <groupId>org.superbiz</groupId>
            <artifactId>load-beans</artifactId>

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-1.xml Mon Sep 27 02:59:58 2010
@@ -21,53 +21,53 @@
 <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>
+             <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>
+        <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">

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/main/resources/var/config/overrides/server-overrides-2.xml Mon Sep 27 02:59:58 2010
@@ -21,53 +21,53 @@
 <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>
+             <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">

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/src/test/java/org/apache/geronimo/testsuite/EJBSinglepointTest.java Mon Sep 27 02:59:58 2010
@@ -35,7 +35,7 @@ public class EJBSinglepointTest {
     /**
      * Rigourous Test :-)
      */
-	@Test
+    @Test
     public void testEJBMultipoint()
     {
         //Remote lookup
@@ -44,16 +44,16 @@ public class EJBSinglepointTest {
             Load loadRemote = null;             
             p.setProperty(Context.PROVIDER_URL,"ejbd://127.0.0.1:4202");            
             try {
-            	Context context3 = new InitialContext(p);
-				loadRemote =(Load) context3.lookup("LoadBeanRemote");
-				Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"ejbd://127.0.0.1:4202");
-				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();
-			}
+                Context context3 = new InitialContext(p);
+                loadRemote =(Load) context3.lookup("LoadBeanRemote");
+                Assert.assertEquals(p.getProperty(Context.PROVIDER_URL),"ejbd://127.0.0.1:4202");
+                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();
+            }
             
     }
 }

Modified: 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=1001576&r1=1001575&r2=1001576&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml Mon Sep 27 02:59:58 2010
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>testsuite</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.2.1-SNAPSHOT</version>
   </parent>  
   
   <artifactId>cluster-testsuite</artifactId> 
@@ -22,11 +22,6 @@
      <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>             



Mime
View raw message