[jboss-cvs] JBossAS SVN: r69194 - 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: 2008-01-22 10:38:05 -0500 (Tue, 22 Jan 2008)
New Revision: 69194

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAService.java
   trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAServiceMBean.java
   trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
Log:
Fix the HAInvokerUnitTestCase

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAService.java	2008-01-22 15:36:21 UTC (rev 69193)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAService.java	2008-01-22 15:38:05 UTC (rev 69194)
@@ -89,6 +89,8 @@
    public Object invoke(Invocation invocation)
       throws Exception
    {
+      log.info("Invoked");
+      
       // Invoked remotely, inject method resolution
       if (invocation instanceof MarshalledInvocation)
       {
@@ -98,7 +100,7 @@
       Method method = invocation.getMethod();
       Object[] args = invocation.getArguments();
       
-      log.debug("Invocation of " + method);
+      log.info("Invocation of " + method);
 
       // Setup any security context (only useful if something checks it, this impl doesn't)
       Principal principal = invocation.getPrincipal();

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAServiceMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAServiceMBean.java	2008-01-22 15:36:21 UTC (rev 69193)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/HAServiceMBean.java	2008-01-22 15:38:05 UTC (rev 69194)
@@ -34,4 +34,7 @@
    
    boolean getSendRemoteLifecycleNotifications();
    void setSendRemoteLifecycleNotifications(boolean send);
+   
+   String getServiceHAName();
+   void setServiceHAName(String name);
 }

Modified: trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml	2008-01-22 15:36:21 UTC (rev 69193)
+++ trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml	2008-01-22 15:38:05 UTC (rev 69194)
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <server>
-
-  <!-- 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>
-      
-  </mbean>
   
    <!-- Create JRMPHA proxy for our service -->
    <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
@@ -43,19 +33,22 @@
           </interceptors>
       </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
-       on the service name. 
-  
+
+  <!-- Our service -->
   <mbean code="org.jboss.test.cluster.invokerha.HAService" 
-         name="jboss.test:service=HAService,type=unifiedha">         
+         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
+       on the service name. -->
+       
    <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
       name="jboss.test:service=ProxyFactory,name=HAService,protocol=unifiedha">
 
@@ -79,20 +72,21 @@
           </interceptors>
       </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.test.cluster.invokerha.HAService" 
-         name="jboss.test:service=HAService,type=pooledha">         
+         name="jboss.test:service=HAService,type=unifiedha">         
          
       <attribute name="SendRemoteLifecycleNotifications">false</attribute>  
       <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+      <attribute name="ServiceHAName">jboss.test:service=HAService,type=unifiedha</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=pooledha">
 
@@ -116,6 +110,14 @@
           </interceptors>
       </attribute>
    </mbean>
-   -->
+  
+  <mbean code="org.jboss.test.cluster.invokerha.HAService" 
+         name="jboss.test:service=HAService,type=pooledha">         
+         
+      <attribute name="SendRemoteLifecycleNotifications">false</attribute>  
+      <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+      <attribute name="ServiceHAName">jboss.test:service=HAService,type=pooledha</attribute>
+      
+  </mbean>
    
 </server>