[jboss-cvs] JBossAS SVN: r100064 - in projects/metadata/trunk: src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 28 12:41:16 EST 2010
Author: ALRubinger
Date: 2010-01-28 12:41:14 -0500 (Thu, 28 Jan 2010)
New Revision: 100064
Modified:
projects/metadata/trunk/pom.xml
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/main/resources/schema/jboss_5_1.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
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatefulBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss51Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
Log:
[JBMETA-250][EJBTHREE-1640] Remove metadata support for @RemoteBinding.factory
Modified: projects/metadata/trunk/pom.xml
===================================================================
--- projects/metadata/trunk/pom.xml 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/pom.xml 2010-01-28 17:41:14 UTC (rev 100064)
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/RemoteBindingProcessor.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -78,7 +78,6 @@
remote.setJndiName(annotation.jndiBinding());
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());
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/RemoteBindingMetaData.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -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", "invokerName"})
+ at XmlType(name="remote-bindingType", propOrder={"descriptions", "jndiName", "clientBindUrl", "interceptorStack", "invokerName"})
public class RemoteBindingMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
@@ -48,9 +48,6 @@
/** The interceptor stack */
private String interceptorStack;
- /** The proxy factory */
- private String proxyFactory;
-
/** The invoker name */
private String invokerName;
@@ -134,29 +131,6 @@
}
/**
- * Get the proxyFactory.
- *
- * @return the proxyFactory.
- */
- public String getProxyFactory()
- {
- return proxyFactory;
- }
-
- /**
- * Set the proxyFactory.
- *
- * @param proxyFactory the proxyFactory.
- * @throws IllegalArgumentException for a null proxyFactory
- */
- public void setProxyFactory(String proxyFactory)
- {
- if (proxyFactory == null)
- throw new IllegalArgumentException("Null proxyFactory");
- this.proxyFactory = proxyFactory;
- }
-
- /**
* Get the invokerName
*
* @return the invokerName
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2010-01-28 17:41:14 UTC (rev 100064)
@@ -1272,17 +1272,6 @@
<xsd:restriction base="javaee:string"/>
</xsd:simpleContent>
</xsd:complexType>
-
- <!-- **************************************************** -->
-
- <xsd:complexType name="proxy-factoryType">
- <xsd:annotation>
- <xsd:documentation> The fully qualified name of the proxy factory class</xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="javaee:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
<!-- **************************************************** -->
@@ -1368,7 +1357,6 @@
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<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:attribute name="id" type="xsd:ID"/>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2010-01-28 17:41:14 UTC (rev 100064)
@@ -1109,17 +1109,6 @@
<xsd:restriction base="javaee:string"/>
</xsd:simpleContent>
</xsd:complexType>
-
- <!-- **************************************************** -->
-
- <xsd:complexType name="proxy-factoryType">
- <xsd:annotation>
- <xsd:documentation> The fully qualified name of the proxy factory class</xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="javaee:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
<!-- **************************************************** -->
@@ -1192,7 +1181,6 @@
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<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:attribute name="id" type="xsd:ID" />
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -643,13 +643,11 @@
assertNotNull(remoteBinding);
assertEquals("clientBind1", remoteBinding.getClientBindUrl());
assertEquals("stack1", remoteBinding.getInterceptorStack());
- assertEquals("factory1", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding1", remoteBinding.getJndiName());
remoteBinding = bean.getRemoteBindings().get(2);
assertNotNull(remoteBinding);
assertEquals("clientBind2", remoteBinding.getClientBindUrl());
assertEquals("stack2", remoteBinding.getInterceptorStack());
- assertEquals("factory2", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding2", remoteBinding.getJndiName());
remoteBinding = bean.getRemoteBindings().get(3);
assertEquals("invokerName1", remoteBinding.getInvokerName());
@@ -774,7 +772,6 @@
assertNotNull(remoteBinding);
assertEquals("clientBind", remoteBinding.getClientBindUrl());
assertEquals("stack", remoteBinding.getInterceptorStack());
- assertEquals("factory", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding", remoteBinding.getJndiName());
assertEquals("invokerName", remoteBinding.getInvokerName());
}
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -56,8 +56,8 @@
@RemoteHome(MyStatefulHome.class)
@RemoteBindings(
value = {
- @RemoteBinding(clientBindUrl = "clientBind1", interceptorStack = "stack1", factory = "factory1", jndiBinding = "RemoteBinding1"),
- @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", factory = "factory2", jndiBinding = "RemoteBinding2"),
+ @RemoteBinding(clientBindUrl = "clientBind1", interceptorStack = "stack1", jndiBinding = "RemoteBinding1"),
+ @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", jndiBinding = "RemoteBinding2"),
@RemoteBinding(invokerName="invokerName1", jndiBinding = "RemoteBinding3")
}
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -61,7 +61,7 @@
@Stateless
@TransactionAttribute(TransactionAttributeType.NEVER)
@LocalBinding(jndiBinding = "LocalJndiBinding")
- at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", factory = "factory", jndiBinding = "RemoteBinding", invokerName = "invokerName")
+ at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", 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")
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatefulBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatefulBean.java 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatefulBean.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -55,8 +55,8 @@
@RemoteHome(MyStatefulHome.class)
@RemoteBindings(
value = {
- @RemoteBinding(clientBindUrl = "clientBind1", interceptorStack = "stack1", factory = "factory1", jndiBinding = "RemoteBinding1"),
- @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", factory = "factory2", jndiBinding = "RemoteBinding2")
+ @RemoteBinding(clientBindUrl = "clientBind1", interceptorStack = "stack1", jndiBinding = "RemoteBinding1"),
+ @RemoteBinding(clientBindUrl = "clientBind2", interceptorStack = "stack2", jndiBinding = "RemoteBinding2")
}
)
@RemoteBinding(jndiBinding = "jndiBind3")
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -60,7 +60,7 @@
//@Stateless
@TransactionAttribute(TransactionAttributeType.NEVER)
@LocalBinding(jndiBinding = "LocalJndiBinding")
- at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", factory = "factory", jndiBinding = "RemoteBinding")
+ at RemoteBinding(clientBindUrl = "clientBind", interceptorStack = "stack", jndiBinding = "RemoteBinding")
@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")
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -332,13 +332,11 @@
assertNotNull(remoteBinding);
assertEquals("clientBind1", remoteBinding.getClientBindUrl());
assertEquals("stack1", remoteBinding.getInterceptorStack());
- assertEquals("factory1", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding1", remoteBinding.getJndiName());
remoteBinding = bean.getRemoteBindings().get(2);
assertNotNull(remoteBinding);
assertEquals("clientBind2", remoteBinding.getClientBindUrl());
assertEquals("stack2", remoteBinding.getInterceptorStack());
- assertEquals("factory2", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding2", remoteBinding.getJndiName());
// @LocalHomeBinding
@@ -459,7 +457,6 @@
assertNotNull(remoteBinding);
assertEquals("clientBind", remoteBinding.getClientBindUrl());
assertEquals("stack", remoteBinding.getInterceptorStack());
- assertEquals("factory", remoteBinding.getProxyFactory());
assertEquals("RemoteBinding", remoteBinding.getJndiName());
}
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 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2010-01-28 17:41:14 UTC (rev 100064)
@@ -1285,7 +1285,6 @@
assertEquals(prefix + "JndiName", remoteBinding.getJndiName());
assertEquals(prefix + "ClientBindUrl", remoteBinding.getClientBindUrl());
assertEquals(prefix + "InterceptorStack", remoteBinding.getInterceptorStack());
- assertEquals(prefix + "ProxyFactory", remoteBinding.getProxyFactory());
assertEquals(prefix + "InvokerName", remoteBinding.getInvokerName());
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss51Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss51Everything_testEverything.xml 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss51Everything_testEverything.xml 2010-01-28 17:41:14 UTC (rev 100064)
@@ -278,7 +278,6 @@
<jndi-name>session1RemoteBindingJndiName</jndi-name>
<client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
<invoker-name>session1RemoteBindingInvokerName</invoker-name>
</remote-binding>
@@ -667,7 +666,6 @@
<jndi-name>session2RemoteBindingJndiName</jndi-name>
<client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
<invoker-name>session2RemoteBindingInvokerName</invoker-name>
</remote-binding>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2010-01-28 17:40:20 UTC (rev 100063)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2010-01-28 17:41:14 UTC (rev 100064)
@@ -280,7 +280,6 @@
<jndi-name>session1RemoteBindingJndiName</jndi-name>
<client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
<invoker-name>session1RemoteBindingInvokerName</invoker-name>
</remote-binding>
@@ -744,7 +743,6 @@
<jndi-name>session2RemoteBindingJndiName</jndi-name>
<client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
<invoker-name>session2RemoteBindingInvokerName</invoker-name>
</remote-binding>
More information about the jboss-cvs-commits
mailing list