[jboss-cvs] JBossAS SVN: r84219 - 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: 2009-02-14 22:23:44 -0500 (Sat, 14 Feb 2009)
New Revision: 84219

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:
Include HA HttpInvoker in test

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	2009-02-14 21:57:04 UTC (rev 84218)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java	2009-02-15 03:23:44 UTC (rev 84219)
@@ -69,6 +69,12 @@
       haProxyFailoverTest("jmx/HAServicePooled");
    }
 
+   public void testHttpHAProxyFailover()
+      throws Exception
+   {
+      haProxyFailoverTest("jmx/HAServiceHttp");
+   }
+
    public void testJRMPHAProxyFailover()
       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	2009-02-14 21:57:04 UTC (rev 84218)
+++ trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml	2009-02-15 03:23:44 UTC (rev 84219)
@@ -128,5 +128,46 @@
       <attribute name="ServiceHAName">jboss.test:service=HAService,type=pooledha</attribute>
       
   </mbean>
+  
+  <!-- Pooled version.  
+       TODO We shouldn't need a separate service to expose a different
+       proxy. We do because of ProxyFactoryHA bases the FamilyClusterInfo name
+       on the service name. -->
+       
+   <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
+      name="jboss.test:service=ProxyFactory,name=HAService,protocol=httpha">
+
+      <attribute name="Partition"><inject bean="HAPartition"/></attribute>
+
+      <depends>jboss:service=invoker,type=httpHA</depends>
+      <attribute name="InvokerName">jboss:service=invoker,type=httpHA</attribute>
+
+      <attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</attribute>
+
+      <depends optional-attribute-name="TargetName">jboss.test:service=HAService,type=httpha</depends>
+      
+      <!--  Directly invoke the target method, not invoke() -->
+      <attribute name="InvokeTargetMethod">true</attribute>
+
+      <attribute name="JndiName">jmx/HAServiceHttp</attribute>
+
+      <attribute name="ExportedInterface">org.jboss.test.cluster.invokerha.HAServiceRemote</attribute>
+
+      <attribute name="ClientInterceptors">
+          <interceptors>
+             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+          </interceptors>
+      </attribute>
+   </mbean>
+  
+  <mbean code="org.jboss.test.cluster.invokerha.HAService" 
+         name="jboss.test:service=HAService,type=httpha">         
+         
+      <attribute name="SendRemoteLifecycleNotifications">false</attribute>  
+      <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+      <attribute name="ServiceHAName">jboss.test:service=HAService,type=httpha</attribute>
+      
+  </mbean>
    
 </server>