You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2010/09/14 09:45:29 UTC
svn commit: r996776 - in /geronimo/server/trunk/plugins:
axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/
corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/
corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/ut...
Author: dblevins
Date: Tue Sep 14 07:45:28 2010
New Revision: 996776
URL: http://svn.apache.org/viewvc?rev=996776&view=rev
Log:
Updates corresponding to OPENEJB-1354: Internal CoreDeploymentInfo class renamed to BeanContext
Modified:
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java
geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainer.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCache.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/deployment/ClusteredStatefulDeployment.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EJBServerPortlet.java
geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Tue Sep 14 07:45:28 2010
@@ -38,10 +38,10 @@ import org.apache.axis2.jaxws.handler.So
import org.apache.axis2.jaxws.i18n.Messages;
import org.apache.axis2.jaxws.util.Constants;
import org.apache.axis2.util.ThreadContextMigratorUtil;
+import org.apache.openejb.BeanContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.openejb.ApplicationException;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.RpcContainer;
@@ -49,14 +49,14 @@ public class EJBMessageReceiver implemen
{
private static final Logger LOG = LoggerFactory.getLogger(EJBMessageReceiver.class);
- private DeploymentInfo deploymentInfo;
+ private BeanContext beanContext;
private Class serviceImplClass;
private EJBWebServiceContainer container;
- public EJBMessageReceiver(EJBWebServiceContainer container, Class serviceImplClass, DeploymentInfo deploymentInfo) {
+ public EJBMessageReceiver(EJBWebServiceContainer container, Class serviceImplClass, BeanContext beanContext) {
this.container = container;
this.serviceImplClass = serviceImplClass;
- this.deploymentInfo = deploymentInfo;
+ this.beanContext = beanContext;
}
public void receive(org.apache.axis2.context.MessageContext axisMsgCtx) throws AxisFault {
@@ -87,9 +87,9 @@ public class EJBMessageReceiver implemen
EJBAddressingSupport wsaSupport = new EJBAddressingSupport(jaxwsContext);
Object[] arguments = { jaxwsContext, interceptor, wsaSupport };
- RpcContainer container = (RpcContainer) this.deploymentInfo.getContainer();
+ RpcContainer container = (RpcContainer) this.beanContext.getContainer();
- Class callInterface = this.deploymentInfo.getServiceEndpointInterface();
+ Class callInterface = this.beanContext.getServiceEndpointInterface();
method = getMostSpecificMethod(method, callInterface);
@@ -97,7 +97,7 @@ public class EJBMessageReceiver implemen
ThreadContextMigratorUtil.performMigrationToThread(Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID,
axisMsgCtx);
try {
- Object res = container.invoke(this.deploymentInfo.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
+ Object res = container.invoke(this.beanContext.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
// TODO: update response message with new response value?
} catch (ApplicationException e) {
if (e.getCause() instanceof AxisFault) {
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java Tue Sep 14 07:45:28 2010
@@ -31,7 +31,7 @@ import org.apache.geronimo.jaxws.JAXWSAn
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.osgi.framework.Bundle;
/**
@@ -39,13 +39,13 @@ import org.osgi.framework.Bundle;
*/
public class EJBWebServiceContainer extends Axis2WebServiceContainer {
- private DeploymentInfo deploymnetInfo;
+ private BeanContext deploymnetInfo;
public EJBWebServiceContainer(PortInfo portInfo,
String endpointClassName,
Bundle bundle,
Context context,
- DeploymentInfo deploymnetInfo) {
+ BeanContext deploymnetInfo) {
super(portInfo, endpointClassName, bundle, context);
this.deploymnetInfo = deploymnetInfo;
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java Tue Sep 14 07:45:28 2010
@@ -34,7 +34,7 @@ import org.apache.geronimo.kernel.Kernel
import org.apache.geronimo.openejb.EjbDeployment;
import org.apache.geronimo.security.jaas.ConfigurationFactory;
import org.apache.geronimo.webservices.SoapHandler;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.osgi.framework.Bundle;
/**
@@ -71,7 +71,7 @@ public class EJBWebServiceGBean implemen
String beanClassName = ejbDeploymentContext.getBeanClass().getName();
ClassLoader classLoader = ejbDeploymentContext.getClassLoader();
- DeploymentInfo deploymnetInfo = ejbDeploymentContext.getDeploymentInfo();
+ BeanContext deploymnetInfo = ejbDeploymentContext.getDeploymentInfo();
Context context = deploymnetInfo.getJndiEnc();
this.container = new EJBWebServiceContainer(portInfo, beanClassName, bundle, context, deploymnetInfo);
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java Tue Sep 14 07:45:28 2010
@@ -28,7 +28,7 @@ import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.ContainerType;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.spi.ApplicationServer;
/**
@@ -37,7 +37,7 @@ import org.apache.openejb.spi.Applicatio
public class CorbaApplicationServer implements ApplicationServer {
public EJBObject getEJBObject(ProxyInfo proxyInfo) {
try {
- RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getDeploymentInfo().getDeploymentID());
+ RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getBeanContext().getDeploymentID());
org.omg.CORBA.Object object = refGenerator.genObjectReference(proxyInfo.getPrimaryKey());
EJBObject ejbObject = (EJBObject) PortableRemoteObject.narrow(object, EJBObject.class);
return ejbObject;
@@ -52,7 +52,7 @@ public class CorbaApplicationServer impl
*/
public Object getBusinessObject(ProxyInfo proxyInfo) {
try {
- RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getDeploymentInfo().getDeploymentID());
+ RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getBeanContext().getDeploymentID());
org.omg.CORBA.Object object = refGenerator.genObjectReference(proxyInfo.getPrimaryKey());
return object;
} catch (Throwable e) {
@@ -62,7 +62,7 @@ public class CorbaApplicationServer impl
public EJBHome getEJBHome(ProxyInfo proxyInfo) {
try {
- RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getDeploymentInfo().getDeploymentID());
+ RefGenerator refGenerator = AdapterWrapper.getRefGenerator((String) proxyInfo.getBeanContext().getDeploymentID());
org.omg.CORBA.Object home = refGenerator.genHomeReference();
EJBHome ejbHome = (EJBHome) PortableRemoteObject.narrow(home, EJBHome.class);
return ejbHome;
@@ -101,12 +101,12 @@ public class CorbaApplicationServer impl
throw new IllegalArgumentException("Unknown component type: " + componentType);
}
- DeploymentInfo deploymentInfo = proxyInfo.getDeploymentInfo();
+ BeanContext beanContext = proxyInfo.getBeanContext();
CORBAEJBMetaData ejbMetaData = new CORBAEJBMetaData(getEJBHome(proxyInfo),
ejbType,
- deploymentInfo.getHomeInterface(),
- deploymentInfo.getRemoteInterface(),
- deploymentInfo.getPrimaryKeyClass());
+ beanContext.getHomeInterface(),
+ beanContext.getRemoteInterface(),
+ beanContext.getPrimaryKeyClass());
return ejbMetaData;
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java Tue Sep 14 07:45:28 2010
@@ -37,8 +37,8 @@ import org.apache.geronimo.corba.Adapter
import org.apache.geronimo.corba.CORBAException;
import org.apache.geronimo.corba.RefGenerator;
import org.apache.geronimo.corba.StandardServant;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.BaseEjbProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
@@ -243,8 +243,8 @@ public final class UtilDelegateImpl impl
}
BaseEjbProxyHandler ejbProxyHandler = (BaseEjbProxyHandler) invocationHandler;
- DeploymentInfo deploymentInfo = ejbProxyHandler.getDeploymentInfo();
- String deploymentId = (String) deploymentInfo.getDeploymentID();
+ BeanContext beanContext = ejbProxyHandler.getBeanContext();
+ String deploymentId = (String) beanContext.getDeploymentID();
try {
RefGenerator refGenerator = AdapterWrapper.getRefGenerator(deploymentId);
if (refGenerator == null) {
@@ -254,11 +254,11 @@ public final class UtilDelegateImpl impl
return refGenerator.genHomeReference();
} else if (proxy instanceof EJBObject) {
Object primaryKey = null;
- if (deploymentInfo.getComponentType() == BeanType.STATEFUL) {
+ if (beanContext.getComponentType() == BeanType.STATEFUL) {
RegistryId id = (RegistryId)((EjbObjectProxyHandler)ejbProxyHandler).getRegistryId();
primaryKey = id.getPrimaryKey();
}
- else if (deploymentInfo.getComponentType() != BeanType.STATELESS) {
+ else if (beanContext.getComponentType() != BeanType.STATELESS) {
EJBObject ejbObject = (EJBObject) proxy;
primaryKey = ejbObject.getPrimaryKey();
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java Tue Sep 14 07:45:28 2010
@@ -40,7 +40,7 @@ import org.apache.geronimo.cxf.CXFServic
import org.apache.geronimo.cxf.GeronimoJaxWsImplementorInfo;
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.JNDIResolver;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.osgi.framework.Bundle;
public class EJBEndpoint extends CXFEndpoint {
@@ -83,10 +83,10 @@ public class EJBEndpoint extends CXFEndp
throw new WebServiceException("Error configuring handlers", e);
}
- DeploymentInfo deploymentInfo =
- bus.getExtension(DeploymentInfo.class);
+ BeanContext beanContext =
+ bus.getExtension(BeanContext.class);
- service.setInvoker(new EJBMethodInvoker(this, this.bus, deploymentInfo));
+ service.setInvoker(new EJBMethodInvoker(this, this.bus, beanContext));
Endpoint endpoint = getEndpoint();
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java Tue Sep 14 07:45:28 2010
@@ -34,7 +34,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.invoker.Factory;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.RpcContainer;
import org.slf4j.Logger;
@@ -47,15 +47,15 @@ public class EJBMethodInvoker extends Ab
private static final String HANDLER_PROPERTIES =
"HandlerProperties";
- private DeploymentInfo deploymentInfo;
+ private BeanContext beanContext;
private Bus bus;
private EJBEndpoint endpoint;
- public EJBMethodInvoker(EJBEndpoint endpoint, Bus bus, DeploymentInfo deploymentInfo) {
+ public EJBMethodInvoker(EJBEndpoint endpoint, Bus bus, BeanContext beanContext) {
super((Factory)null);
this.endpoint = endpoint;
this.bus = bus;
- this.deploymentInfo = deploymentInfo;
+ this.beanContext = beanContext;
}
@Override
@@ -121,11 +121,11 @@ public class EJBMethodInvoker extends Ab
EJBInterceptor interceptor = new EJBInterceptor(params, method, this.endpoint, this.bus, exchange);
Object[] arguments = { ctx, interceptor, ctx };
- RpcContainer container = (RpcContainer) this.deploymentInfo.getContainer();
+ RpcContainer container = (RpcContainer) this.beanContext.getContainer();
- Class callInterface = this.deploymentInfo.getServiceEndpointInterface();
+ Class callInterface = this.beanContext.getServiceEndpointInterface();
method = getMostSpecificMethod(method, callInterface);
- Object res = container.invoke(this.deploymentInfo.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
+ Object res = container.invoke(this.beanContext.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
if (exchange.isOneWay()) {
return null;
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java Tue Sep 14 07:45:28 2010
@@ -40,8 +40,7 @@ import org.apache.geronimo.kernel.Kernel
import org.apache.geronimo.openejb.EjbDeployment;
import org.apache.geronimo.security.jaas.ConfigurationFactory;
import org.apache.geronimo.webservices.SoapHandler;
-import org.apache.openejb.DeploymentInfo;
-import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.osgi.framework.Bundle;
@GBean(j2eeType = NameFactory.WEB_SERVICE_LINK)
@@ -72,13 +71,13 @@ public class EJBWebServiceGBean implemen
assert this.location != null : "null location received";
Class beanClass = ejbDeploymentContext.getBeanClass();
- CoreDeploymentInfo deploymentInfo = ejbDeploymentContext.getDeploymentInfo();
+ BeanContext deploymentInfo = ejbDeploymentContext.getDeploymentInfo();
Context context = deploymentInfo.getJndiEnc();
Bus bus = CXFWebServiceContainer.getBus();
bus.setExtension(new ServerJNDIResolver(context), JNDIResolver.class);
bus.setExtension(portInfo, PortInfo.class);
- bus.setExtension(deploymentInfo, DeploymentInfo.class);
+ bus.setExtension(deploymentInfo, BeanContext.class);
ClassLoader classLoader = ejbDeploymentContext.getClassLoader();
Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml Tue Sep 14 07:45:28 2010
@@ -26,29 +26,4 @@
<artifactId>geronimo-jetty8-builder</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.4_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-locator</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Tue Sep 14 07:45:28 2010
@@ -60,7 +60,7 @@ import org.apache.geronimo.security.depl
import org.apache.geronimo.security.deployment.SecurityConfiguration;
import org.apache.geronimo.security.jacc.ComponentPermissions;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
@@ -271,7 +271,7 @@ public class EjbDeploymentBuilder {
securityBuilder.addToPermissions(new PermissionCollectionAdapter(componentPermissions.getUncheckedPermissions()),
remoteBean.getEjbName(),
EjbInterface.HOME.getJaccInterfaceName(),
- DeploymentInfo.BusinessRemoteHome.class.getName(),
+ BeanContext.BusinessRemoteHome.class.getName(),
ejbModule.getClassLoader());
}
if (remoteBean.getBusinessLocal() != null && !remoteBean.getBusinessLocal().isEmpty()) {
@@ -285,7 +285,7 @@ public class EjbDeploymentBuilder {
securityBuilder.addToPermissions(new PermissionCollectionAdapter(componentPermissions.getUncheckedPermissions()),
remoteBean.getEjbName(),
EjbInterface.LOCAL_HOME.getJaccInterfaceName(),
- DeploymentInfo.BusinessLocalHome.class.getName(),
+ BeanContext.BusinessLocalHome.class.getName(),
ejbModule.getClassLoader());
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainer.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainer.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainer.java Tue Sep 14 07:45:28 2010
@@ -29,8 +29,8 @@ import org.apache.geronimo.clustering.wa
import org.apache.geronimo.openejb.cluster.infra.NetworkConnectorTracker;
import org.apache.geronimo.openejb.cluster.infra.NetworkConnectorTrackerException;
import org.apache.geronimo.openejb.cluster.infra.SessionManagerTracker;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.ClusteredRPCContainer;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.stateful.StatefulContainer;
import org.apache.openejb.spi.SecurityService;
import org.codehaus.wadi.core.manager.Manager;
@@ -87,8 +87,8 @@ public class ClusteredStatefulContainer
}
}
- public URI[] getLocations(DeploymentInfo deploymentInfo) {
- Object deploymentID = deploymentInfo.getDeploymentID();
+ public URI[] getLocations(BeanContext beanContext) {
+ Object deploymentID = beanContext.getDeploymentID();
NetworkConnectorTracker networkConnectorTracker;
synchronized (deploymentIdToNetworkConnectorTracker) {
networkConnectorTracker = deploymentIdToNetworkConnectorTracker.get(deploymentID);
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCache.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCache.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCache.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCache.java Tue Sep 14 07:45:28 2010
@@ -110,7 +110,7 @@ public class WadiCache implements Cache<
}
try {
- Object deploymentId = instance.deploymentInfo.getDeploymentID();
+ Object deploymentId = instance.beanContext.getDeploymentID();
Session session = getSessionManager(deploymentId).createSession(primaryKey.toString());
localInstances.put(primaryKey, new WadiInstance(instance, session));
} catch (SessionAlreadyExistException e) {
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/deployment/ClusteredStatefulDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/deployment/ClusteredStatefulDeployment.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/deployment/ClusteredStatefulDeployment.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/deployment/ClusteredStatefulDeployment.java Tue Sep 14 07:45:28 2010
@@ -38,8 +38,8 @@ import org.apache.geronimo.openejb.clust
import org.apache.geronimo.security.SecurityNames;
import org.apache.geronimo.security.jacc.RunAsSource;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.osgi.framework.Bundle;
/**
@@ -108,7 +108,7 @@ public class ClusteredStatefulDeployment
}
@Override
- protected EjbDeployment initialize(CoreDeploymentInfo deploymentInfo) {
+ protected EjbDeployment initialize(BeanContext deploymentInfo) {
super.initialize(deploymentInfo);
Container container = deploymentInfo.getContainer();
@@ -127,7 +127,7 @@ public class ClusteredStatefulDeployment
@Override
protected void destroy() {
- CoreDeploymentInfo info = deploymentInfo.get();
+ BeanContext info = deploymentInfo.get();
if (null != info) {
Container container = info.getContainer();
if (null != container) {
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java Tue Sep 14 07:45:28 2010
@@ -24,10 +24,9 @@ import java.util.Collections;
import com.agical.rmock.extension.junit.RMockTestCase;
import org.apache.geronimo.clustering.wadi.WADISessionManager;
import org.apache.geronimo.openejb.cluster.infra.NetworkConnectorTracker;
-import org.apache.openejb.assembler.classic.JndiEncBuilder;
-import org.apache.openejb.core.AppContext;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.ModuleContext;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.AppContext;
+import org.apache.openejb.ModuleContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.SecurityService;
import org.codehaus.wadi.servicespace.ServiceRegistry;
@@ -40,7 +39,7 @@ public class ClusteredStatefulContainerT
private WADISessionManager sessionManager;
private ClusteredStatefulContainer container;
- private CoreDeploymentInfo deploymentInfo;
+ private BeanContext deploymentInfo;
private String deploymentId;
private NetworkConnectorTracker tracker;
@@ -66,7 +65,7 @@ public class ClusteredStatefulContainerT
container = (ClusteredStatefulContainer) intercept(ClusteredStatefulContainer.class, new Object[] {"id",
securityService});
deploymentId = "deploymentId";
- deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null, false), null),
+ deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null, false), null),
SFSB.class,
null,
null,
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java Tue Sep 14 07:45:28 2010
@@ -35,9 +35,9 @@ import org.apache.geronimo.clustering.Se
import org.apache.geronimo.clustering.SessionListener;
import org.apache.geronimo.clustering.wadi.WADISessionManager;
import org.apache.geronimo.openejb.cluster.stateful.container.ClusteredStatefulContainerTest.SFSB;
-import org.apache.openejb.core.AppContext;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.ModuleContext;
+import org.apache.openejb.AppContext;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.ModuleContext;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.stateful.Cache.CacheListener;
import org.apache.openejb.core.stateful.Instance;
@@ -50,7 +50,7 @@ public class WadiCacheTest extends RMock
private WadiCache manager;
private String deploymentId;
- private CoreDeploymentInfo deploymentInfo;
+ private BeanContext deploymentInfo;
private VMID primKey;
private ThreadContext threadContext;
private WADISessionManager sessionManager;
@@ -70,7 +70,7 @@ public class WadiCacheTest extends RMock
});
deploymentId = "deploymentId";
- deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null, false), null),
+ deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null, false), null),
SFSB.class,
null,
null,
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java Tue Sep 14 07:45:28 2010
@@ -43,10 +43,10 @@ import org.apache.geronimo.naming.enc.En
import org.apache.geronimo.security.SecurityNames;
import org.apache.geronimo.security.jacc.RunAsSource;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.Container;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.core.transaction.TransactionType;
import org.apache.xbean.naming.context.ImmutableFederatedContext;
@@ -81,7 +81,7 @@ public class EjbDeployment implements EJ
protected final OpenEjbSystem openEjbSystem;
- protected AtomicReference<CoreDeploymentInfo> deploymentInfo = new AtomicReference<CoreDeploymentInfo>();
+ protected AtomicReference<BeanContext> deploymentInfo = new AtomicReference<BeanContext>();
public EjbDeployment(@ParamSpecial(type = SpecialAttributeType.objectName) String objectName,
@ParamAttribute(name = "deploymentId") String deploymentId,
@@ -135,7 +135,7 @@ public class EjbDeployment implements EJ
this.openEjbSystem = openEjbSystem;
}
- public CoreDeploymentInfo getDeploymentInfo() {
+ public BeanContext getDeploymentInfo() {
return deploymentInfo.get();
}
@@ -287,7 +287,7 @@ public class EjbDeployment implements EJ
return true;
}
- protected EjbDeployment initialize(CoreDeploymentInfo deploymentInfo) {
+ protected EjbDeployment initialize(BeanContext deploymentInfo) {
try {
ImmutableFederatedContext federatedContext = (ImmutableFederatedContext) ((DeepBindableContext.ContextWrapper)deploymentInfo.getJndiEnc()).getRootContext();
federatedContext.federateContext(componentContext);
@@ -305,7 +305,7 @@ public class EjbDeployment implements EJ
}
protected void destroy() {
- CoreDeploymentInfo info = deploymentInfo.getAndSet(null);
+ BeanContext info = deploymentInfo.getAndSet(null);
if (info != null) {
info.set(EjbDeployment.class, null);
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Tue Sep 14 07:45:28 2010
@@ -42,11 +42,10 @@ import org.apache.geronimo.management.EJ
import org.apache.geronimo.management.EJBModule;
import org.apache.geronimo.management.J2EEApplication;
import org.apache.geronimo.management.J2EEServer;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.NoSuchApplicationException;
import org.apache.openejb.UndeployException;
import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -171,8 +170,8 @@ public class EjbModuleImpl implements EJ
public void doStart() throws Exception {
openEjbSystem.createApplication(appInfo, classLoader);
for (String deploymentId: ejbs.keySet()) {
- DeploymentInfo deploymentInfo = openEjbSystem.getDeploymentInfo(deploymentId);
- GeronimoThreadContextListener.get().getEjbDeployment((CoreDeploymentInfo) deploymentInfo);
+ BeanContext beanContext = openEjbSystem.getDeploymentInfo(deploymentId);
+ GeronimoThreadContextListener.get().getEjbDeployment((BeanContext) beanContext);
}
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java Tue Sep 14 07:45:28 2010
@@ -32,8 +32,8 @@ import javax.security.jacc.EJBRoleRefPer
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.SubjectId;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.security.jaas.UsernamePasswordCallbackHandler;
import org.apache.openejb.spi.SecurityService;
@@ -83,7 +83,7 @@ public class GeronimoSecurityService imp
ThreadContext threadContext = ThreadContext.getThreadContext();
try {
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ BeanContext deploymentInfo = threadContext.getBeanContext();
// if security is not enabled we are autorized
EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
@@ -114,7 +114,7 @@ public class GeronimoSecurityService imp
ThreadContext threadContext = ThreadContext.getThreadContext();
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ BeanContext deploymentInfo = threadContext.getBeanContext();
// if security is not enabled we are not in that role
EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
@@ -136,7 +136,7 @@ public class GeronimoSecurityService imp
public Principal getCallerPrincipal() {
// if security is not enabled, we don't have a principal
ThreadContext threadContext = ThreadContext.getThreadContext();
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ BeanContext deploymentInfo = threadContext.getBeanContext();
EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
if (ejbDeployment == null || !ejbDeployment.isSecurityEnabled()) {
return null;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java Tue Sep 14 07:45:28 2010
@@ -22,6 +22,7 @@ import javax.resource.ResourceException;
import javax.security.auth.Subject;
import javax.security.jacc.PolicyContext;
+import org.apache.openejb.BeanContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
@@ -30,7 +31,6 @@ import org.apache.geronimo.connector.out
import org.apache.geronimo.naming.java.RootContext;
import org.apache.geronimo.security.Callers;
import org.apache.geronimo.security.ContextManager;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.ThreadContextListener;
@@ -76,7 +76,7 @@ public class GeronimoThreadContextListen
this.ejbs.remove(id);
}
- EjbDeployment getEjbDeployment(CoreDeploymentInfo deploymentInfo) {
+ EjbDeployment getEjbDeployment(BeanContext deploymentInfo) {
Deployment deployment = ejbs.get(deploymentInfo.getDeploymentID());
if (deployment == null) return null;
@@ -86,7 +86,7 @@ public class GeronimoThreadContextListen
public void contextEntered(ThreadContext oldContext, ThreadContext newContext) {
- CoreDeploymentInfo deploymentInfo = newContext.getDeploymentInfo();
+ BeanContext deploymentInfo = newContext.getBeanContext();
if (deploymentInfo == null) return;
EjbDeployment ejbDeployment = getEjbDeployment(deploymentInfo);
@@ -120,7 +120,7 @@ public class GeronimoThreadContextListen
// set the policy (security) context id
geronimoCallContext.contextID = PolicyContext.getContextID();
- String moduleID = newContext.getDeploymentInfo().getModuleID();
+ String moduleID = newContext.getBeanContext().getModuleID();
PolicyContext.setContextID(moduleID);
// set the default subject if needed
@@ -141,7 +141,7 @@ public class GeronimoThreadContextListen
}
public void contextExited(ThreadContext exitedContext, ThreadContext reenteredContext) {
- CoreDeploymentInfo deploymentInfo = exitedContext.getDeploymentInfo();
+ BeanContext deploymentInfo = exitedContext.getBeanContext();
if (deploymentInfo == null) return;
EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
@@ -184,7 +184,7 @@ public class GeronimoThreadContextListen
this.geronimoDeployment = geronimoDeployment;
}
- public EjbDeployment get(final CoreDeploymentInfo openejbDeployment) {
+ public EjbDeployment get(final BeanContext openejbDeployment) {
try {
// Has the deployment been initialized yet?
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java Tue Sep 14 07:45:28 2010
@@ -20,11 +20,9 @@ import java.io.IOException;
import java.util.Properties;
import javax.ejb.spi.HandleDelegate;
import javax.naming.NamingException;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.UndeployException;
import org.apache.openejb.NoSuchApplicationException;
@@ -53,7 +51,7 @@ public interface OpenEjbSystem {
void createClient(ClientInfo clientInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException;
- DeploymentInfo getDeploymentInfo(String deploymentId);
+ BeanContext getDeploymentInfo(String deploymentId);
void createApplication(AppInfo appInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Tue Sep 14 07:45:28 2010
@@ -30,7 +30,6 @@ import javax.management.ObjectName;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.resource.spi.ResourceAdapter;
-import javax.transaction.TransactionManager;
import org.apache.geronimo.connector.ResourceAdapterWrapper;
import org.apache.geronimo.gbean.AbstractName;
@@ -48,8 +47,8 @@ import org.apache.geronimo.kernel.GBeanN
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.persistence.PersistenceUnitGBean;
import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.NoSuchApplicationException;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.UndeployException;
@@ -438,8 +437,8 @@ public class OpenEjbSystemGBean implemen
assembler.destroyApplication(appInfo.path);
}
- public DeploymentInfo getDeploymentInfo(String deploymentId) {
- return getContainerSystem().getDeploymentInfo(deploymentId);
+ public BeanContext getDeploymentInfo(String deploymentId) {
+ return getContainerSystem().getBeanContext(deploymentId);
}
public void setORBContext(ORB orb, HandleDelegate handleDelegate) {
Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Tue Sep 14 07:45:28 2010
@@ -31,9 +31,4 @@
<artifactId>openejb-osgi-core</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EJBServerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EJBServerPortlet.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EJBServerPortlet.java (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EJBServerPortlet.java Tue Sep 14 07:45:28 2010
@@ -23,7 +23,6 @@ import java.util.StringTokenizer;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
@@ -32,19 +31,6 @@ import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.openejb.EjbDeployment;
-import org.apache.openejb.assembler.classic.ContainerInfo;
-import org.apache.openejb.assembler.classic.ServiceInfo;
-import org.apache.openejb.assembler.classic.ContainerSystemInfo;
-import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
-import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
public class EJBServerPortlet extends BasePortlet {
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java?rev=996776&r1=996775&r2=996776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java Tue Sep 14 07:45:28 2010
@@ -47,9 +47,9 @@ import org.apache.geronimo.kernel.config
import org.apache.geronimo.kernel.config.ManageableAttributeStore;
import org.apache.geronimo.openejb.EjbContainer;
import org.apache.geronimo.openejb.OpenEjbSystem;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
import org.apache.openejb.ContainerType;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.assembler.classic.ContainerInfo;
import org.apache.openejb.assembler.classic.ContainerSystemInfo;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
@@ -150,7 +150,7 @@ public class EjbHelper extends BaseRemot
containersEntry.setName(containerInfo.id);
containersEntry.setValues(new String[]{containerInfo.id});
- DeploymentInfo[] deployments = container.deployments();
+ BeanContext[] deployments = container.getBeanContexts();
containersEntry.setChildren(getDeployments(deployments));
containers.add(containersEntry);
}
@@ -158,10 +158,10 @@ public class EjbHelper extends BaseRemot
return tree;
}
- public List<TreeEntry> getDeployments(DeploymentInfo[] deploymentInfos) {
+ public List<TreeEntry> getDeployments(BeanContext[] beanContexts) {
List<TreeEntry> deployments = new ArrayList<TreeEntry>();
TreeEntry deploymentsEntry = null;
- for (DeploymentInfo deployment : deploymentInfos) {
+ for (BeanContext deployment : beanContexts) {
deploymentsEntry = new TreeEntry();
deploymentsEntry.setName(deployment.getEjbName());
deploymentsEntry.setValues(new String[]{
@@ -380,25 +380,25 @@ public class EjbHelper extends BaseRemot
public List<EjbInformation> getDeploymentInfo(String containerId,
String deploymentId, HttpServletRequest request) {
Container container = containerSystem.getContainer(containerId);
- DeploymentInfo deploymentInfo = container
- .getDeploymentInfo(deploymentId);
+ BeanContext beanContext = container
+ .getBeanContext(deploymentId);
List<EjbInformation> informations = new ArrayList<EjbInformation>();
EjbInformation information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, BEANCLASSNAME_KEY));
- information.setValue(deploymentInfo.getBeanClass().getName());
+ information.setValue(beanContext.getBeanClass().getName());
informations.add(information);
- if (deploymentInfo.getBusinessLocalInterface() != null) {
+ if (beanContext.getBusinessLocalInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, BLI_KEY));
- information.setValue(appendMultipleInterfaces(deploymentInfo
+ information.setValue(appendMultipleInterfaces(beanContext
.getBusinessLocalInterfaces()));
informations.add(information);
}
- if (deploymentInfo.getBusinessRemoteInterface() != null) {
+ if (beanContext.getBusinessRemoteInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, BRI_KEY));
- information.setValue(appendMultipleInterfaces(deploymentInfo
+ information.setValue(appendMultipleInterfaces(beanContext
.getBusinessRemoteInterfaces()));
informations.add(information);
}
@@ -408,11 +408,11 @@ public class EjbHelper extends BaseRemot
informations.add(information);
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, EJBNAME_KEY));
- information.setValue(deploymentInfo.getEjbName());
+ information.setValue(beanContext.getEjbName());
informations.add(information);
- if (deploymentInfo.getHomeInterface() != null) {
+ if (beanContext.getHomeInterface() != null) {
information = new EjbInformation();
- information.setValue(deploymentInfo.getHomeInterface().getName());
+ information.setValue(beanContext.getHomeInterface().getName());
information.setName(getLocalizedString(request, BUNDLE_NAME, EJBHOMEI_KEY));
informations.add(information);
}
@@ -422,7 +422,7 @@ public class EjbHelper extends BaseRemot
try {
cls = Class.forName("org.apache.openejb.assembler.classic.JndiBuilder$Bindings");
Method method = cls.getMethod("getBindings");
- List<String> jndiNames = (List) method.invoke(deploymentInfo.get(cls));
+ List<String> jndiNames = (List) method.invoke(beanContext.get(cls));
StringBuffer names = new StringBuffer();
for (String jndiName : jndiNames) {
if (jndiName.startsWith("openejb/local/")) {
@@ -437,46 +437,46 @@ public class EjbHelper extends BaseRemot
information.setName(getLocalizedString(request, BUNDLE_NAME, JNDINAMES_KEY));
informations.add(information);
}
- if (deploymentInfo.getLocalHomeInterface() != null) {
+ if (beanContext.getLocalHomeInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, LHI_KEY));
- information.setValue(deploymentInfo.getLocalHomeInterface()
+ information.setValue(beanContext.getLocalHomeInterface()
.getName());
informations.add(information);
}
- if (deploymentInfo.getLocalInterface() != null) {
+ if (beanContext.getLocalInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, LI_KEY));
- information.setValue(deploymentInfo.getLocalInterface().getName());
+ information.setValue(beanContext.getLocalInterface().getName());
informations.add(information);
}
- if (deploymentInfo.getRemoteInterface() != null) {
+ if (beanContext.getRemoteInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, RI_KEY));
- information.setValue(deploymentInfo.getRemoteInterface().getName());
+ information.setValue(beanContext.getRemoteInterface().getName());
informations.add(information);
}
- if (deploymentInfo.getPrimaryKeyClass() != null) {
+ if (beanContext.getPrimaryKeyClass() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, PKC_KEY));
- information.setValue(deploymentInfo.getPrimaryKeyClass().getName());
+ information.setValue(beanContext.getPrimaryKeyClass().getName());
informations.add(information);
}
- if (deploymentInfo.getPrimaryKeyField() != null) {
+ if (beanContext.getPrimaryKeyField() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, PKF_KEY));
- information.setValue(deploymentInfo.getPrimaryKeyField());
+ information.setValue(beanContext.getPrimaryKeyField());
informations.add(information);
}
- if (deploymentInfo.getServiceEndpointInterface() != null) {
+ if (beanContext.getServiceEndpointInterface() != null) {
information = new EjbInformation();
information.setName(getLocalizedString(request, BUNDLE_NAME, SEI_KEY));
- information.setValue(deploymentInfo.getServiceEndpointInterface()
+ information.setValue(beanContext.getServiceEndpointInterface()
.getName());
informations.add(information);
}