[jboss-cvs] JBossAS SVN: r66476 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 26 04:21:15 EDT 2007
Author: wolfc
Date: 2007-10-26 04:21:15 -0400 (Fri, 26 Oct 2007)
New Revision: 66476
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRemoteBindings.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
Log:
JBAS-4506: fixed remote bindings cardinality
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-26 07:43:37 UTC (rev 66475)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-26 08:21:15 UTC (rev 66476)
@@ -21,6 +21,9 @@
*/
package org.jboss.metadata.ejb.jboss;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
@@ -102,8 +105,8 @@
/** Whether to call by value */
private boolean callByValue;
- /** The remote binding */
- private RemoteBindingMetaData remoteBinding;
+ /** The remote bindings */
+ private List<RemoteBindingMetaData> remoteBindings;
/** Whether this bean is clustered */
private boolean clustered;
@@ -764,9 +767,9 @@
*
* @return the remoteBinding.
*/
- public RemoteBindingMetaData getRemoteBinding()
+ public List<RemoteBindingMetaData> getRemoteBindings()
{
- return remoteBinding;
+ return remoteBindings;
}
/**
@@ -775,11 +778,12 @@
* @param remoteBinding the remoteBinding.
* @throws IllegalArgumentException for a null remoteBinding
*/
- public void setRemoteBinding(RemoteBindingMetaData remoteBinding)
+ @XmlElement(name="remote-binding", required=false)
+ public void setRemoteBindings(List<RemoteBindingMetaData> remoteBindings)
{
- if (remoteBinding == null)
+ if (remoteBindings == null)
throw new IllegalArgumentException("Null remoteBinding");
- this.remoteBinding = remoteBinding;
+ this.remoteBindings = remoteBindings;
}
@Override
@@ -874,9 +878,9 @@
// clustered
if(joverride != null)
clustered = joverride.clustered;
- // remoteBinding
- if(joverride != null && joverride.remoteBinding != null)
- remoteBinding = joverride.remoteBinding;
+ // remoteBindings
+ if(joverride != null && joverride.remoteBindings != null)
+ remoteBindings = joverride.remoteBindings;
// clusterConfig
if(joverride != null && joverride.clusterConfig != null)
clusterConfig = joverride.clusterConfig;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-26 07:43:37 UTC (rev 66475)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-26 08:21:15 UTC (rev 66476)
@@ -22,6 +22,7 @@
package org.jboss.test.metadata.ejb;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
@@ -1257,6 +1258,16 @@
assertEquals(prefix + "ProxyFactory", remoteBinding.getProxyFactory());
}
+ protected void assertRemoteBindings(String ejbName, List<RemoteBindingMetaData> remoteBindings)
+ {
+ assertNotNull(ejbName, remoteBindings);
+ assertEquals(1, remoteBindings.size());
+ for(RemoteBindingMetaData remoteBinding : remoteBindings)
+ {
+ assertRemoteBinding(ejbName, remoteBinding);
+ }
+ }
+
protected void assertMethodAttributes(String ejbName, MethodAttributesMetaData methodAttributes)
{
assertNotNull(ejbName, methodAttributes);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-26 07:43:37 UTC (rev 66475)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-26 08:21:15 UTC (rev 66476)
@@ -48,6 +48,7 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.MessagePropertiesMetaData;
import org.jboss.metadata.ejb.jboss.ProducerMetaData;
+import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
@@ -311,6 +312,24 @@
}
/**
+ * Test the cardinality of remote bindings
+ */
+ public void testRemoteBindings() throws Exception
+ {
+ JBossMetaData jboss = unmarshal();
+
+ assertEquals(1, jboss.getEnterpriseBeans().size());
+
+ JBossSessionBeanMetaData sessionBean = (JBossSessionBeanMetaData) jboss.getEnterpriseBean("StatefulBean");
+ for(int i = 0; i < 2; i++)
+ {
+ RemoteBindingMetaData remoteBinding = sessionBean.getRemoteBindings().get(i);
+ assertEquals("jndiName" + (i + 1), remoteBinding.getJndiName());
+ assertEquals("clientBindUrl" + (i + 1), remoteBinding.getClientBindUrl());
+ }
+ }
+
+ /**
* A test for resource-adapter-name (ejb3 jca/inflow unit test)
*/
public void testResourceAdapterName() throws Exception
@@ -430,8 +449,9 @@
assertEquals("object name", bean.getObjectName());
assertEquals("org.jboss.ejb3.test.service.ServiceSixManagement", bean.getManagement());
assertEquals("xmbean", bean.getXmbean());
- assertNotNull(bean.getRemoteBinding());
- assertEquals("client bind url", bean.getRemoteBinding().getClientBindUrl());
+ assertEquals(1, bean.getRemoteBindings().size());
+ RemoteBindingMetaData remoteBinding = bean.getRemoteBindings().get(0);
+ assertEquals("client bind url", remoteBinding.getClientBindUrl());
assertEquals("serviceSix/remote", bean.getJndiName());
assertEquals("serviceSix/local", bean.getLocalJndiName());
assertEquals("security domain", bean.getSecurityDomain());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-26 07:43:37 UTC (rev 66475)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-26 08:21:15 UTC (rev 66476)
@@ -395,7 +395,7 @@
assertId(prefix, session);
assertDescriptionGroup(prefix, session.getDescriptionGroup());
- assertRemoteBinding(prefix, session.getRemoteBinding());
+ assertRemoteBindings(prefix, session.getRemoteBindings());
assertEquals(prefix + "JndiName", session.getJndiName());
assertEquals(prefix + "LocalJndiName", session.getLocalJndiName());
@@ -466,7 +466,7 @@
assertNull(session.getId());
assertNull(session.getDescriptionGroup());
- assertNull(session.getRemoteBinding());
+ assertNull(session.getRemoteBindings());
assertNull(session.getJndiName());
assertNull(session.getLocalJndiName());
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRemoteBindings.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRemoteBindings.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRemoteBindings.xml 2007-10-26 08:21:15 UTC (rev 66476)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulBean</ejb-name>
+ <remote-binding>
+ <jndi-name>jndiName1</jndi-name>
+ <client-bind-url>clientBindUrl1</client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>jndiName2</jndi-name>
+ <client-bind-url>clientBindUrl2</client-bind-url>
+ </remote-binding>
+ </session>
+ </enterprise-beans>
+</jboss>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRemoteBindings.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list