[jboss-cvs] JBossAS SVN: r100065 - in projects/ejb3/trunk: core and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 28 12:42:36 EST 2010
Author: ALRubinger
Date: 2010-01-28 12:42:35 -0500 (Thu, 28 Jan 2010)
New Revision: 100065
Removed:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/proxy/factory/RemoteProxyFactoryRegistry.java
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/ProxyDeployer.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/MyStatefulBean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
Log:
[EJBTHREE-1640] Remove support for @RemoteBinding.factory in EJB3 Core; update to latest ext-api and jboss-metadata
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/build/pom.xml 2010-01-28 17:42:35 UTC (rev 100065)
@@ -336,7 +336,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
- <version>1.0.0.CR16</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/pom.xml 2010-01-28 17:42:35 UTC (rev 100065)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.8</version>
+ <version>1.0.10-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -404,13 +404,13 @@
<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>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api-impl</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -57,7 +57,6 @@
import org.jboss.ejb3.metadata.JBossSessionGenericWrapper;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
-import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
import org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver;
import org.jboss.ejb3.resolvers.MessageDestinationReferenceResolver;
import org.jboss.injection.InjectionHandler;
@@ -216,19 +215,6 @@
this.cacheFactoryRegistry = registry;
}
- @Deprecated
- public RemoteProxyFactoryRegistry getRemoteProxyFactoryRegistry()
- {
- log.warn("[EJBTHREE-1641] NoOp getRemoteProxyFactoryRegistry; developers may ignore this message; it will be removed when backwards-compatibility between EJB3 and AS is resolved");
- return null;
- }
-
- @Deprecated
- public void setRemoteProxyFactoryRegistry(RemoteProxyFactoryRegistry registry)
- {
- log.warn("[EJBTHREE-1641] NoOp setRemoteProxyFactoryRegistry; developers may ignore this message; it will be removed when backwards-compatibility between EJB3 and AS is resolved");
- }
-
public PersistenceManagerFactoryRegistry getPersistenceManagerFactoryRegistry()
{
return persistenceManagerFactoryRegistry;
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -1828,9 +1828,6 @@
if (binding.getInterceptorStack() != null)
bindingAnnotation.setStack(binding.getInterceptorStack());
- if (binding.getProxyFactory() != null)
- bindingAnnotation.setFactory(binding.getProxyFactory());
-
bindingAnnotationsList.add(bindingAnnotation);
}
Deleted: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/proxy/factory/RemoteProxyFactoryRegistry.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/proxy/factory/RemoteProxyFactoryRegistry.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/proxy/factory/RemoteProxyFactoryRegistry.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.proxy.factory;
-
-
-/**
- * Registry for all configured Remote Proxy Factory implementations
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
- at Deprecated
-public class RemoteProxyFactoryRegistry
-{
-
- /*
- * EJBTHREE-1641
- *
- * This is in place as a dummy class until this reference may be removed
- * safely from AS Ejb3Deployer.
- *
- * ejb3-plugin must always be compatible with the last release of AS,
- * at time of this writing this is AS 5.0.0.GA.
- */
-
-}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/ProxyDeployer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/ProxyDeployer.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/ProxyDeployer.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -29,7 +29,6 @@
import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.annotation.RemoteBindings;
-import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.ejb3.annotation.impl.LocalBindingImpl;
import org.jboss.ejb3.annotation.impl.RemoteBindingImpl;
import org.jboss.ejb3.annotation.impl.RemoteBindingsImpl;
@@ -129,7 +128,7 @@
if(binding.jndiBinding().length() == 0)
{
return new RemoteBindingImpl(ProxyFactoryHelper.getDefaultRemoteBusinessJndiName(container), binding
- .interceptorStack(), binding.clientBindUrl(), binding.factory());
+ .interceptorStack(), binding.clientBindUrl(), "");
}
return binding;
}
@@ -150,7 +149,7 @@
String jndiName = container.getMetaData().getJndiName();
log.debug("default remote binding has jndiName of " + jndiName);
String uri = ""; // use the default
- RemoteBinding[] list = {new RemoteBindingImpl(jndiName, "", uri, RemoteBindingDefaults.PROXY_FACTORY_DEFAULT)};
+ RemoteBinding[] list = {new RemoteBindingImpl(jndiName, "", uri, "")};
remoteBindings = new RemoteBindingsImpl(list);
container.getAnnotations().addClassAnnotation(RemoteBindings.class, remoteBindings);
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/MyStatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/MyStatefulBean.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/MyStatefulBean.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -24,14 +24,13 @@
import javax.ejb.Stateful;
import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
/**
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision: $
*/
@Stateful
- at RemoteBinding(clientBindUrl="socket://127.0.0.1:3875", factory = RemoteBindingDefaults.PROXY_FACTORY_STATEFUL_REMOTE)
+ at RemoteBinding(clientBindUrl="socket://127.0.0.1:3875")
public class MyStatefulBean implements MyStateful
{
private String name;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java 2010-01-28 17:41:14 UTC (rev 100064)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java 2010-01-28 17:42:35 UTC (rev 100065)
@@ -97,7 +97,7 @@
{
AbstractEJB3TestCase.beforeClass();
- deploy("org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml");
+// deploy("org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml");
}
@AfterClass
More information about the jboss-cvs-commits
mailing list