[jboss-cvs] JBossAS SVN: r81533 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 03:28:45 EST 2008
Author: ALRubinger
Date: 2008-11-25 03:28:45 -0500 (Tue, 25 Nov 2008)
New Revision: 81533
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/RemoteBindingProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/RemoteBindingMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
Log:
[JBMETA-146] Add "invokerName" to RemoteBindingMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/RemoteBindingProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/RemoteBindingProcessor.java 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/RemoteBindingProcessor.java 2008-11-25 08:28:45 UTC (rev 81533)
@@ -79,6 +79,7 @@
remote.setClientBindUrl(annotation.clientBindUrl());
remote.setInterceptorStack(annotation.interceptorStack());
remote.setProxyFactory(annotation.factory());
+ remote.setInvokerName(annotation.invokerName());
Descriptions descriptions = ProcessorUtils.getDescription(" @RemoteBinding for class " + type.getSimpleName());
remote.setDescriptions(descriptions);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/RemoteBindingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/RemoteBindingMetaData.java 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/RemoteBindingMetaData.java 2008-11-25 08:28:45 UTC (rev 81533)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="remote-bindingType", propOrder={"descriptions", "jndiName", "clientBindUrl", "interceptorStack", "proxyFactory"})
+ at XmlType(name="remote-bindingType", propOrder={"descriptions", "jndiName", "clientBindUrl", "interceptorStack", "proxyFactory", "invokerName"})
public class RemoteBindingMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
@@ -51,6 +51,9 @@
/** The proxy factory */
private String proxyFactory;
+ /** The invoker name */
+ private String invokerName;
+
/**
* Get the jndiName.
*
@@ -152,4 +155,27 @@
throw new IllegalArgumentException("Null proxyFactory");
this.proxyFactory = proxyFactory;
}
+
+ /**
+ * Get the invokerName
+ *
+ * @return the invokerName
+ */
+ public String getInvokerName()
+ {
+ return invokerName;
+ }
+
+ /**
+ * Set the invokerName
+ *
+ * @param invokerName
+ * @throws IllegalArgumentException for a null invokerName
+ */
+ public void setInvokerName(String invokerName)
+ {
+ if (invokerName == null)
+ throw new IllegalArgumentException("Null invokerName");
+ this.invokerName = invokerName;
+ }
}
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-25 08:28:45 UTC (rev 81533)
@@ -1287,7 +1287,18 @@
<xsd:restriction base="javaee:string"/>
</xsd:simpleContent>
</xsd:complexType>
+
+ <!-- **************************************************** -->
+ <xsd:complexType name="invoker-nameType">
+ <xsd:annotation>
+ <xsd:documentation> The name of the invoker (remoting Connector) to be used</xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="javaee:string"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
<!-- **************************************************** -->
<xsd:complexType name="interceptor-stackType">
@@ -1361,6 +1372,7 @@
<xsd:element name="client-bind-url" type="jboss:client-bind-urlType" minOccurs="0"/>
<xsd:element name="interceptor-stack" type="jboss:interceptor-stackType" minOccurs="0"/>
<xsd:element name="proxy-factory" type="jboss:proxy-factoryType" minOccurs="0"/>
+ <xsd:element name="invoker-name" type="jboss:invoker-nameType" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-11-25 08:28:45 UTC (rev 81533)
@@ -657,7 +657,7 @@
// @RemoteBindings
assertNotNull(bean.getRemoteBindings());
- assertEquals(3, bean.getRemoteBindings().size());
+ assertEquals(4, bean.getRemoteBindings().size());
RemoteBindingMetaData remoteBinding = bean.getRemoteBindings().get(0);
assertNotNull(remoteBinding);
assertEquals("jndiBind3", remoteBinding.getJndiName());
@@ -673,6 +673,8 @@
assertEquals("stack2", remoteBinding.getInterceptorStack());
assertEquals("factory2", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding2", remoteBinding.getJndiName());
+ remoteBinding = bean.getRemoteBindings().get(3);
+ assertEquals("invokerName1", remoteBinding.getInvokerName());
// @LocalHomeBinding
assertEquals("localHome", bean.getLocalHomeJndiName());
@@ -796,6 +798,7 @@
assertEquals("stack", remoteBinding.getInterceptorStack());
assertEquals("factory", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding", remoteBinding.getJndiName());
+ assertEquals("invokerName", remoteBinding.getInvokerName());
}
private void assertMyMDB(IEnterpriseBeanMetaData enterpriseBean)
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java 2008-11-25 08:28:45 UTC (rev 81533)
@@ -49,7 +49,7 @@
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateful(name="AnotherName")
@Remote(MyStateful.class)
@@ -57,7 +57,9 @@
@RemoteBindings(
value = {
@RemoteBinding(clientBindUrl = "clientBind1", interceptorStack = "stack1", factory = "factory1", jndiBinding = "RemoteBinding1"),
- @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", factory = "factory2", jndiBinding = "RemoteBinding2")
+ @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", factory = "factory2", jndiBinding = "RemoteBinding2"),
+ @RemoteBinding(invokerName="invokerName1", jndiBinding = "RemoteBinding3")
+
}
)
@RemoteBinding(jndiBinding = "jndiBind3")
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java 2008-11-25 08:26:18 UTC (rev 81532)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java 2008-11-25 08:28:45 UTC (rev 81533)
@@ -61,7 +61,7 @@
@Stateless
@TransactionAttribute(TransactionAttributeType.NEVER)
@LocalBinding(jndiBinding = "LocalJndiBinding")
- at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", factory = "factory", jndiBinding = "RemoteBinding")
+ at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", factory = "factory", jndiBinding = "RemoteBinding", invokerName = "invokerName")
@Resources({
@Resource(description="url-resource-ref", name="googleHome", type=java.net.URL.class, mappedName="http://www.google.com"),
@Resource(description="DataSource-resource-ref", name="jdbc/ds", type=DataSource.class, mappedName="java:/DefaultDS")
More information about the jboss-cvs-commits
mailing list