[jboss-cvs] JBossAS SVN: r104632 - in trunk/testsuite/src: resources/cluster/invokerha/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2010-05-10 16:32:48 -0400 (Mon, 10 May 2010)
New Revision: 104632

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java
   trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
Log:
[JBAS-7563] Remove JRMPInvokerHA test variants

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java	2010-05-10 20:18:54 UTC (rev 104631)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java	2010-05-10 20:32:48 UTC (rev 104632)
@@ -68,12 +68,6 @@
    {
       haProxyFailoverTest("jmx/HAServiceHttp");
    }
-
-   public void testJRMPHAProxyFailover()
-      throws Exception
-   {
-      haProxyFailoverTest("jmx/HAService");
-   }
    
    private void haProxyFailoverTest(String jndiName) throws Exception
    {

Modified: trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml	2010-05-10 20:18:54 UTC (rev 104631)
+++ trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml	2010-05-10 20:32:48 UTC (rev 104632)
@@ -2,51 +2,6 @@
 
 <server>
   
-   <!-- Create JRMPHA proxy for our service -->
-   <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
-      name="jboss.test:service=ProxyFactory,name=HAService,protocol=jrmpha">
-
-      <!-- Use the default partition -->
-      <attribute name="Partition"><inject bean="HAPartition"/></attribute>
-
-      <!-- Use the JRMPInvokerHA -->
-      <depends>jboss:service=invoker,type=jrmpha</depends>
-      <attribute name="InvokerName">jboss:service=invoker,type=jrmpha</attribute>
-
-      <!-- The load balancing policy -->
-      <attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</attribute>
-
-      <!-- The target MBean -->
-      <depends optional-attribute-name="TargetName">jboss.test:service=HAService</depends>
-      
-      <!--  Directly invoke the target method, not invoke() -->
-      <attribute name="InvokeTargetMethod">true</attribute>
-
-      <!-- Where to bind the proxy -->
-      <attribute name="JndiName">jmx/HAService</attribute>
-
-      <!-- The interface exposed to the client -->
-      <attribute name="ExportedInterface">org.jboss.test.cluster.invokerha.HAServiceRemote</attribute>
-
-      <!-- Client side behaviour -->
-      <attribute name="ClientInterceptors">
-          <interceptors>
-             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-          </interceptors>
-      </attribute>
-   </mbean>
-
-  <!-- Our service -->
-  <mbean code="org.jboss.test.cluster.invokerha.HAService" 
-         name="jboss.test:service=HAService">         
-         
-      <attribute name="SendRemoteLifecycleNotifications">false</attribute>  
-      <!-- Use the default partition -->
-      <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
-      <attribute name="ServiceHAName">jboss.test:service=HAService</attribute>
-  </mbean>
-  
   <!-- Unified version.  
        TODO We shouldn't need a separate service to expose a different
        proxy. We do because of ProxyFactoryHA bases the FamilyClusterInfo name