[jboss-cvs] JBossAS SVN: r72637 - in trunk/ejb3/src/main/org/jboss/ejb3: clientmodule and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 23 17:24:05 EDT 2008
Author: ALRubinger
Date: 2008-04-23 17:24:05 -0400 (Wed, 23 Apr 2008)
New Revision: 72637
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASDepdencyPolicy.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/DeploymentEjbResolver.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/EjbModuleEjbResolver.java
trunk/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
Log:
[EJBTHREE-1269] Refactored alongside changes to EJB3 dev/ejbthree1269 branch
Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -52,13 +52,11 @@
import org.jboss.injection.InjectionUtil;
import org.jboss.injection.Injector;
import org.jboss.injection.JndiInjectHandler;
-import org.jboss.injection.PersistenceContextHandler;
import org.jboss.injection.PersistenceUnitHandler;
import org.jboss.injection.ResourceHandler;
import org.jboss.injection.WebServiceRefHandler;
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -32,9 +31,6 @@
import javax.naming.NamingException;
import org.jboss.client.AppClientLauncher;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
-import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.util.NotImplementedException;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -44,7 +44,6 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.Ejb3Module;
-import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
import org.jboss.ejb3.deployers.JBoss5DeploymentScope;
import org.jboss.ejb3.deployers.JBoss5DeploymentUnit;
import org.jboss.ejb3.deployers.JBossASDepdencyPolicy;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -23,7 +23,6 @@
import javax.naming.NameNotFoundException;
-//import org.jboss.ejb3.EAR;
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.enc.DeploymentEjbResolver;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
+
import javax.management.MBeanServer;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -38,7 +39,6 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.MCKernelAbstraction;
import org.jboss.ejb3.clientmodule.ClientENCInjectionContainer;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -21,7 +21,6 @@
*/
package org.jboss.ejb3.deployers;
-import java.util.LinkedHashMap;
import java.util.Properties;
import java.util.Set;
@@ -39,7 +38,7 @@
import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
-import org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry;
+import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -28,7 +28,6 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.MCKernelAbstraction;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.kernel.Kernel;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -22,7 +22,6 @@
package org.jboss.ejb3.deployers;
import java.util.Collection;
-import java.util.LinkedHashMap;
import java.util.concurrent.ConcurrentHashMap;
import javax.management.ObjectName;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASDepdencyPolicy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASDepdencyPolicy.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASDepdencyPolicy.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -30,7 +30,6 @@
import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.dependency.EjbLinkDemandMetaData;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -34,13 +34,11 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import javax.management.RuntimeMBeanException;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/DeploymentEjbResolver.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/DeploymentEjbResolver.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/DeploymentEjbResolver.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -21,17 +21,18 @@
*/
package org.jboss.ejb3.deployers.tmp;
+import java.util.Iterator;
+
+import javax.naming.NameNotFoundException;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.Ejb3Registry;
-import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
import org.jboss.logging.Logger;
-import javax.naming.NameNotFoundException;
-import java.util.Iterator;
-
/**
* Class to resolve EJB containers from ejb-ref or @EJB metadata
* This class is overriden for specific behaviors, specifically whether or not
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/EjbModuleEjbResolver.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/EjbModuleEjbResolver.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/tmp/EjbModuleEjbResolver.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -21,14 +21,14 @@
*/
package org.jboss.ejb3.deployers.tmp;
+import java.util.Map;
+
+import javax.naming.NameNotFoundException;
+
+import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.DeploymentScope;
-import javax.naming.NameNotFoundException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
/**
* Resolve EJBs.
*
Modified: trunk/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -30,8 +30,6 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.session.SessionContainer;
-import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.iiop.CorbaORB;
import org.jboss.iiop.csiv2.SASCurrent;
import org.jboss.iiop.rmi.AttributeAnalysis;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2008-04-23 20:41:05 UTC (rev 72636)
+++ trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2008-04-23 21:24:05 UTC (rev 72637)
@@ -26,6 +26,7 @@
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
+import javax.ejb.Handle;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.naming.Context;
@@ -35,10 +36,13 @@
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.NonSerializableFactory;
-import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.annotation.IIOP;
import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.remoting.RemoteProxyFactory;
+import org.jboss.ejb3.proxy.factory.BaseSessionProxyFactory;
+import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
+import org.jboss.ejb3.proxy.factory.RemoteProxyFactory;
+import org.jboss.ejb3.proxy.factory.SessionProxyFactory;
+import org.jboss.ejb3.session.ProxyAccessType;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.iiop.CorbaORBService;
import org.jboss.iiop.codebase.CodebasePolicy;
@@ -80,8 +84,8 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision$
*/
-public class IORFactory
- implements RemoteProxyFactory
+public class IORFactory extends BaseSessionProxyFactory
+ implements RemoteProxyFactory, SessionProxyFactory
{
private static final Logger log = Logger.getLogger(IORFactory.class);
@@ -189,10 +193,10 @@
return defaultIIOP;
}
- private String getJndiName()
- {
- return ProxyFactoryHelper.getDefaultRemoteBusinessJndiName(container);
- }
+// private String getJndiName()
+// {
+// return ProxyFactoryHelper.getDefaultRemoteBusinessJndiName(container);
+// }
private String getServantName()
{
@@ -443,4 +447,39 @@
{
throw new NotImplementedException();
}
+
+ @Override
+ protected boolean bindHomeAndBusinessTogether()
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ protected Handle createHandle()
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ protected Class<?> getHomeType()
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ protected ProxyAccessType getProxyAccessType()
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ protected void validateEjb21Views()
+ {
+ throw new NotImplementedException();
+ }
+
+ public Object createProxyBusiness(String arg0)
+ {
+ throw new NotImplementedException();
+ }
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list