You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/09/14 09:43:45 UTC
svn commit: r996774 [1/8] - in /openejb/trunk/openejb3:
assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/
assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/
assembl...
Author: dblevins
Date: Tue Sep 14 07:43:38 2010
New Revision: 996774
URL: http://svn.apache.org/viewvc?rev=996774&view=rev
Log:
OPENEJB-1354: Internal CoreDeploymentInfo class renamed to BeanContext
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/AppContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/DeploymentContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ModuleContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java (contents, props changed)
- copied, changed from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/WebDeploymentInfo.java
Removed:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/AppContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreWebDeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/DeploymentContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ModuleContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/WebDeploymentInfo.java
Modified:
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/JettySecurityService.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContext.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiSupport.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/viewejb.jsp
openejb/trunk/openejb3/assembly/openejb-webapp/src/main/webapp/viewejb.jsp
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClusteredRPCContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/InstanceContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/EjbSelect.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedHomeHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbHomeHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulUserTransaction.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerHandleImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/cdi/tck/ServiceProviders.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/EjbDeploymentPropertiesTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbContainerProvider.java
openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/Axis2Service.java
openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbMessageReceiver.java
openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbWsContainer.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbEndpoint.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandler.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClusterableRequestHandler.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/DeploymentIndex.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
openejb/trunk/openejb3/server/openejb-telnet/src/main/java/org/apache/openejb/server/telnet/Ls.java
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/clienttools/ViewEjbBean.java
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
Modified: openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/JettySecurityService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/JettySecurityService.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/JettySecurityService.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/JettySecurityService.java Tue Sep 14 07:43:38 2010
@@ -16,14 +16,11 @@
*/
package org.apache.openejb.jetty.common;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.core.security.SecurityServiceImpl;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.DeploymentInfo;
-import org.eclipse.jetty.plus.jaas.JAASUserPrincipal;
import org.eclipse.jetty.server.Authentication;
import javax.security.auth.Subject;
-import java.security.Principal;
import java.util.LinkedList;
public class JettySecurityService extends SecurityServiceImpl {
@@ -60,8 +57,8 @@ public class JettySecurityService extend
}
}
- protected Subject getRunAsSubject(DeploymentInfo callingDeploymentInfo) {
- Subject runAsSubject = super.getRunAsSubject(callingDeploymentInfo);
+ protected Subject getRunAsSubject(BeanContext callingBeanContext) {
+ Subject runAsSubject = super.getRunAsSubject(callingBeanContext);
if (runAsSubject != null) return runAsSubject;
LinkedList<Subject> stack = runAsStack.get();
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContext.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContext.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContext.java Tue Sep 14 07:43:38 2010
@@ -254,7 +254,7 @@ public class OpenEJBContext implements C
*/
private Context getThreadContext() throws NamingException {
ThreadContext threadContext = ThreadContext.getThreadContext();
- Context context = threadContext.getDeploymentInfo().getJndiEnc();
+ Context context = threadContext.getBeanContext().getJndiEnc();
return context;
}
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiSupport.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiSupport.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiSupport.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiSupport.java Tue Sep 14 07:43:38 2010
@@ -16,10 +16,9 @@
*/
package org.apache.openejb.tomcat.catalina;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.RpcContainer;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.RpcContainerWrapper;
import javax.naming.Context;
@@ -47,10 +46,9 @@ public class TomcatJndiSupport extends R
} catch (NoSuchMethodException e) {
throw new OpenEJBException("Unable to setup Tomcat JNDI support. Method of org.apache.naming.ContextBindings was not found:" + e.getMessage());
}
- DeploymentInfo[] deploymentInfos = container.deployments();
- for (DeploymentInfo deploymentInfo : deploymentInfos) {
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) deploymentInfo;
- setupDeployment(deployment);
+ BeanContext[] beanContexts = container.getBeanContexts();
+ for (BeanContext beanContext : beanContexts) {
+ setupDeployment(beanContext);
}
}
@@ -58,14 +56,14 @@ public class TomcatJndiSupport extends R
public void init(Object containerId, HashMap deployments, Properties properties) throws OpenEJBException {
}
- public void deploy(DeploymentInfo info) throws OpenEJBException {
- super.deploy(info);
- setupDeployment((org.apache.openejb.core.CoreDeploymentInfo) info);
+ public void deploy(BeanContext beanContext) throws OpenEJBException {
+ super.deploy(beanContext);
+ setupDeployment(beanContext);
}
public static Map<Object, Context> contexts = new HashMap<Object, Context>();
- private void setupDeployment(org.apache.openejb.core.CoreDeploymentInfo deployment) {
+ private void setupDeployment(BeanContext deployment) {
deployment.setContainer(this);
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java Tue Sep 14 07:43:38 2010
@@ -22,7 +22,7 @@ import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.core.security.AbstractSecurityService;
import org.apache.openejb.spi.CallerPrincipal;
@@ -128,8 +128,8 @@ public class TomcatSecurityService exten
}
}
- protected Subject getRunAsSubject(DeploymentInfo callingDeploymentInfo) {
- Subject runAsSubject = super.getRunAsSubject(callingDeploymentInfo);
+ protected Subject getRunAsSubject(BeanContext callingBeanContext) {
+ Subject runAsSubject = super.getRunAsSubject(callingBeanContext);
if (runAsSubject != null) return runAsSubject;
LinkedList<Subject> stack = runAsStack.get();
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Tue Sep 14 07:43:38 2010
@@ -344,11 +344,11 @@ public class TomcatWebAppBuilder impleme
jndiBuilder.mergeJndi();
// add WebDeploymentInfo to ContainerSystem
- CoreWebDeploymentInfo webDeploymentInfo = new CoreWebDeploymentInfo();
- webDeploymentInfo.setId(webAppInfo.moduleId);
- webDeploymentInfo.setClassLoader(standardContext.getLoader().getClassLoader());
- webDeploymentInfo.getInjections().addAll(injections);
- getContainerSystem().addWebDeployment(webDeploymentInfo);
+ CoreWebDeploymentInfo webContext = new CoreWebDeploymentInfo();
+ webContext.setId(webAppInfo.moduleId);
+ webContext.setClassLoader(standardContext.getLoader().getClassLoader());
+ webContext.getInjections().addAll(injections);
+ getContainerSystem().addWebDeployment(webContext);
} catch (Exception e) {
logger.error("Error merging OpenEJB JNDI entries in to war " + standardContext.getPath() + ": Exception: " + e.getMessage(), e);
}
@@ -414,9 +414,9 @@ public class TomcatWebAppBuilder impleme
// add context to WebDeploymentInfo
for (WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
if (("/" + webAppInfo.contextRoot).equals(standardContext.getPath()) || isRootApplication(standardContext)) {
- CoreWebDeploymentInfo webDeploymentInfo = (CoreWebDeploymentInfo) getContainerSystem().getWebDeploymentInfo(webAppInfo.moduleId);
- if (webDeploymentInfo != null) {
- webDeploymentInfo.setJndiEnc(comp);
+ CoreWebDeploymentInfo webContext = (CoreWebDeploymentInfo) getContainerSystem().getWebContext(webAppInfo.moduleId);
+ if (webContext != null) {
+ webContext.setJndiEnc(comp);
}
break;
}
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/viewejb.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/viewejb.jsp?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/viewejb.jsp (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/viewejb.jsp Tue Sep 14 07:43:38 2010
@@ -21,7 +21,7 @@
<%@ page import="
org.apache.openejb.BeanType,
-org.apache.openejb.DeploymentInfo,
+org.apache.openejb.BeanContext,
org.apache.openejb.loader.SystemInstance,
org.apache.openejb.spi.ContainerSystem,
javax.naming.Context,
@@ -116,10 +116,10 @@ javax.naming.InitialContext
</html>
<%!
- private DeploymentInfo getDeployment(String deploymentID) {
+ private BeanContext getDeployment(String deploymentID) {
try {
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- DeploymentInfo ejb = containerSystem.getDeploymentInfo(deploymentID);
+ BeanContext ejb = containerSystem.getBeanContext(deploymentID);
return ejb;
} catch (Exception e) {
return null;
@@ -130,7 +130,7 @@ javax.naming.InitialContext
public void printEjb(String name,String jndiName, String contextID, javax.servlet.jsp.JspWriter out, HttpSession session) throws Exception {
String id = (name.startsWith("/")) ? name.substring(1, name.length()) : name;
- DeploymentInfo ejb = getDeployment(id);
+ BeanContext ejb = getDeployment(id);
if (ejb == null) {
out.print("No such EJB: " + id);
Modified: openejb/trunk/openejb3/assembly/openejb-webapp/src/main/webapp/viewejb.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-webapp/src/main/webapp/viewejb.jsp?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-webapp/src/main/webapp/viewejb.jsp (original)
+++ openejb/trunk/openejb3/assembly/openejb-webapp/src/main/webapp/viewejb.jsp Tue Sep 14 07:43:38 2010
@@ -21,7 +21,7 @@
<%@ page import="
org.apache.openejb.BeanType,
-org.apache.openejb.DeploymentInfo,
+org.apache.openejb.BeanContext,
org.apache.openejb.loader.SystemInstance,
org.apache.openejb.spi.ContainerSystem,
javax.naming.Context,
@@ -116,10 +116,10 @@ javax.naming.InitialContext
</html>
<%!
- private DeploymentInfo getDeployment(String deploymentID) {
+ private BeanContext getDeployment(String deploymentID) {
try {
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- DeploymentInfo ejb = containerSystem.getDeploymentInfo(deploymentID);
+ BeanContext ejb = containerSystem.getBeanContext(deploymentID);
return ejb;
} catch (Exception e) {
return null;
@@ -130,7 +130,7 @@ javax.naming.InitialContext
public void printEjb(String name,String jndiName, String contextID, javax.servlet.jsp.JspWriter out, HttpSession session) throws Exception {
String id = (name.startsWith("/")) ? name.substring(1, name.length()) : name;
- DeploymentInfo ejb = getDeployment(id);
+ BeanContext ejb = getDeployment(id);
if (ejb == null) {
out.print("No such EJB: " + id);
Copied: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java (from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/AppContext.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/AppContext.java&r1=996734&r2=996774&rev=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/AppContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java Tue Sep 14 07:43:38 2010
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.core;
+package org.apache.openejb;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.loader.Options;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.Context;
@@ -47,7 +45,7 @@ public class AppContext extends Deployme
private ExecutorService asynchPool;
// TODO perhaps to be deleted
- private final List<DeploymentInfo> deployments = new ArrayList<DeploymentInfo>();
+ private final List<BeanContext> deployments = new ArrayList<BeanContext>();
public AppContext(String id, SystemInstance systemInstance, ClassLoader classLoader, Context globalJndiContext, Context appJndiContext, boolean standaloneModule) {
super(id, systemInstance.getOptions());
@@ -82,7 +80,7 @@ public class AppContext extends Deployme
return classLoader;
}
- public List<DeploymentInfo> getDeployments() {
+ public List<BeanContext> getDeployments() {
return deployments;
}
Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java&r1=996734&r2=996774&rev=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java Tue Sep 14 07:43:38 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.core;
+package org.apache.openejb;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -41,14 +41,10 @@ import javax.ejb.Timer;
import javax.naming.Context;
import javax.persistence.EntityManagerFactory;
-import org.apache.openejb.BeanType;
-import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
-import org.apache.openejb.Injection;
-import org.apache.openejb.InjectionProcessor;
-import org.apache.openejb.InterfaceType;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.SystemException;
+import org.apache.openejb.core.ExceptionType;
+import org.apache.openejb.core.InstanceContext;
+import org.apache.openejb.core.Operation;
+import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.cmp.KeyGenerator;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.core.interceptor.InterceptorInstance;
@@ -67,8 +63,26 @@ import org.apache.webbeans.inject.OWBInj
import org.apache.xbean.recipe.ConstructionException;
-public class CoreDeploymentInfo extends DeploymentContext implements org.apache.openejb.DeploymentInfo {
+public class BeanContext extends DeploymentContext {
+ public interface BusinessLocalHome extends javax.ejb.EJBLocalHome {
+ Object create();
+ }
+
+ public interface BusinessLocalBeanHome extends javax.ejb.EJBLocalHome {
+ Object create();
+ }
+
+ public interface BusinessRemoteHome extends javax.ejb.EJBHome {
+ Object create();
+ }
+
+ public interface ServiceEndpoint {
+ }
+
+ public interface Timeout {
+ }
+
private final ModuleContext moduleContext;
private final Context jndiContext;
private Object containerData;
@@ -140,12 +154,12 @@ public class CoreDeploymentInfo extends
case EJB_LOCAL: return getLocalInterface();
case BUSINESS_LOCAL: return getBusinessLocalInterface();
case BUSINESS_REMOTE: return getBusinessRemoteInterface();
- case TIMEOUT : return DeploymentInfo.Timeout.class;
- case BUSINESS_REMOTE_HOME: return DeploymentInfo.BusinessRemoteHome.class;
- case BUSINESS_LOCAL_HOME: return DeploymentInfo.BusinessLocalHome.class;
+ case TIMEOUT : return BeanContext.Timeout.class;
+ case BUSINESS_REMOTE_HOME: return BeanContext.BusinessRemoteHome.class;
+ case BUSINESS_LOCAL_HOME: return BeanContext.BusinessLocalHome.class;
case SERVICE_ENDPOINT: return getServiceEndpointInterface();
case LOCALBEAN: return getBeanClass();
- case BUSINESS_LOCALBEAN_HOME: return DeploymentInfo.BusinessLocalBeanHome.class;
+ case BUSINESS_LOCALBEAN_HOME: return BeanContext.BusinessLocalBeanHome.class;
default: throw new IllegalStateException("Unexpected enum constant: " + interfaceType);
}
}
@@ -173,7 +187,7 @@ public class CoreDeploymentInfo extends
return null;
}
- public CoreDeploymentInfo(String id, Context jndiContext, ModuleContext moduleContext,
+ public BeanContext(String id, Context jndiContext, ModuleContext moduleContext,
Class beanClass, Class homeInterface,
Class remoteInterface,
Class localHomeInterface,
@@ -238,12 +252,12 @@ public class CoreDeploymentInfo extends
addInterface(getLocalHomeInterface(), InterfaceType.EJB_LOCAL_HOME);
addInterface(getLocalInterface(), InterfaceType.EJB_LOCAL);
- addInterface(DeploymentInfo.BusinessRemoteHome.class, InterfaceType.BUSINESS_REMOTE_HOME);
+ addInterface(BeanContext.BusinessRemoteHome.class, InterfaceType.BUSINESS_REMOTE_HOME);
for (Class businessRemote : this.businessRemotes) {
addInterface(businessRemote, InterfaceType.BUSINESS_REMOTE);
}
- addInterface(DeploymentInfo.BusinessLocalHome.class, InterfaceType.BUSINESS_LOCAL_HOME);
+ addInterface(BeanContext.BusinessLocalHome.class, InterfaceType.BUSINESS_LOCAL_HOME);
for (Class businessLocal : this.businessLocals) {
addInterface(businessLocal, InterfaceType.BUSINESS_LOCAL);
}
@@ -319,7 +333,7 @@ public class CoreDeploymentInfo extends
}
}
- public CoreDeploymentInfo(String id, Context jndiContext, ModuleContext moduleContext, Class beanClass, Class mdbInterface, Map<String, String> activationProperties) throws SystemException {
+ public BeanContext(String id, Context jndiContext, ModuleContext moduleContext, Class beanClass, Class mdbInterface, Map<String, String> activationProperties) throws SystemException {
super(id, moduleContext.getOptions());
this.jndiContext = jndiContext;
this.moduleContext = moduleContext;
@@ -1037,7 +1051,7 @@ public class CoreDeploymentInfo extends
}
public String toString() {
- return "DeploymentInfo(id="+getDeploymentID()+")";
+ return "BeanContext(id="+getDeploymentID()+")";
}
public boolean isLoadOnStartup() {
Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClusteredRPCContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClusteredRPCContainer.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClusteredRPCContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClusteredRPCContainer.java Tue Sep 14 07:43:38 2010
@@ -19,5 +19,5 @@ package org.apache.openejb;
import java.net.URI;
public interface ClusteredRPCContainer extends RpcContainer {
- URI[] getLocations(DeploymentInfo info);
+ URI[] getLocations(BeanContext info);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java Tue Sep 14 07:43:38 2010
@@ -22,16 +22,16 @@ public interface Container {
public Object getContainerID();
- public DeploymentInfo getDeploymentInfo(Object deploymentID);
+ public BeanContext getBeanContext(Object deploymentID);
- public DeploymentInfo [] deployments();
+ public BeanContext[] getBeanContexts();
- public void deploy(DeploymentInfo info) throws OpenEJBException;
+ public void deploy(BeanContext info) throws OpenEJBException;
- public void start(DeploymentInfo info) throws OpenEJBException;
+ public void start(BeanContext info) throws OpenEJBException;
- public void stop(DeploymentInfo info) throws OpenEJBException;
+ public void stop(BeanContext info) throws OpenEJBException;
- public void undeploy(DeploymentInfo info) throws OpenEJBException;
+ public void undeploy(BeanContext info) throws OpenEJBException;
}
Copied: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java (from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/DeploymentContext.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/DeploymentContext.java&r1=996734&r2=996774&rev=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/DeploymentContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java Tue Sep 14 07:43:38 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.core;
+package org.apache.openejb;
import org.apache.openejb.loader.Options;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java (from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java&r1=996734&r2=996774&rev=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java Tue Sep 14 07:43:38 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.core;
+package org.apache.openejb;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.core.transaction.TransactionType;
@@ -30,7 +30,7 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public class MethodContext {
- private final CoreDeploymentInfo beanContext;
+ private final BeanContext beanContext;
private final Method beanMethod;
private final List<ScheduleData> schedules = new ArrayList<ScheduleData>();
private final List<InterceptorData> interceptors = new ArrayList<InterceptorData>();
@@ -39,7 +39,7 @@ public class MethodContext {
private Duration accessTimeout;
private boolean asynchronous;
- public MethodContext(CoreDeploymentInfo beanContext, Method beanMethod) {
+ public MethodContext(BeanContext beanContext, Method beanMethod) {
this.beanContext = beanContext;
this.beanMethod = beanMethod;
}
@@ -52,7 +52,7 @@ public class MethodContext {
return accessTimeout;
}
- public CoreDeploymentInfo getBeanContext() {
+ public BeanContext getBeanContext() {
return beanContext;
}
Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java (from r996734, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ModuleContext.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ModuleContext.java&r1=996734&r2=996774&rev=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ModuleContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java Tue Sep 14 07:43:38 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.core;
+package org.apache.openejb;
import javax.naming.Context;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Tue Sep 14 07:43:38 2010
@@ -177,7 +177,7 @@ public final class OpenEJB {
logger.debug("startup.debugDeployments", containerSystem.deployments().length);
if (containerSystem.deployments().length > 0) {
logger.debug("startup.debugDeploymentsType");
- DeploymentInfo[] d = containerSystem.deployments();
+ BeanContext[] d = containerSystem.deployments();
for (int i = 0; i < d.length; i++) {
String entry = " ";
switch (d[i].getComponentType()) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Tue Sep 14 07:43:38 2010
@@ -17,12 +17,10 @@
package org.apache.openejb;
import java.io.File;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -37,14 +35,9 @@ import javax.naming.NameNotFoundExceptio
import javax.naming.NamingException;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.config.AnnotationDeployer;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.DeploymentsResolver;
-import org.apache.openejb.config.RequireDescriptors;
-import org.apache.openejb.core.AppContext;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.xbean.naming.context.ContextFlyweight;
/**
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java Tue Sep 14 07:43:38 2010
@@ -21,7 +21,7 @@ import java.util.ArrayList;
public class ProxyInfo {
- protected DeploymentInfo deploymentInfo;
+ protected BeanContext beanContext;
protected Object primaryKey;
protected List<Class> proxyInterfaces;
protected RpcContainer beanContainer;
@@ -31,12 +31,12 @@ public class ProxyInfo {
protected ProxyInfo() {
}
- public ProxyInfo(DeploymentInfo deploymentInfo, Object primaryKey, List<Class> interfaces, InterfaceType proxyType, Class mainInterface) {
- this.deploymentInfo = deploymentInfo;
+ public ProxyInfo(BeanContext beanContext, Object primaryKey, List<Class> interfaces, InterfaceType proxyType, Class mainInterface) {
+ this.beanContext = beanContext;
this.primaryKey = primaryKey;
this.proxyInterfaces = interfaces;
this.interfaceType = proxyType;
- this.beanContainer = (RpcContainer) deploymentInfo.getContainer();
+ this.beanContainer = (RpcContainer) beanContext.getContainer();
this.mainInterface = mainInterface;
}
@@ -49,7 +49,7 @@ public class ProxyInfo {
* @param depInfo
* @param pk
*/
- public ProxyInfo(DeploymentInfo depInfo, Object pk) {
+ public ProxyInfo(BeanContext depInfo, Object pk) {
this(depInfo, pk, new ArrayList<Class>(), InterfaceType.UNKNOWN, null);
}
@@ -57,8 +57,8 @@ public class ProxyInfo {
return interfaceType;
}
- public DeploymentInfo getDeploymentInfo() {
- return deploymentInfo;
+ public BeanContext getBeanContext() {
+ return beanContext;
}
public Object getPrimaryKey() {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Sep 14 07:43:38 2010
@@ -35,7 +35,6 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
-import java.util.Map.Entry;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
@@ -60,29 +59,27 @@ import javax.transaction.TransactionSync
import org.apache.geronimo.connector.work.GeronimoWorkManager;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.AppContext;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.ClassLoaderUtil;
import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.DuplicateDeploymentIdException;
import org.apache.openejb.Injection;
+import org.apache.openejb.MethodContext;
import org.apache.openejb.NoSuchApplicationException;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.UndeployException;
import org.apache.openejb.cdi.CdiBuilder;
-import org.apache.openejb.core.AppContext;
import org.apache.openejb.core.ConnectorReference;
import org.apache.openejb.core.CoreContainerSystem;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.JndiFactory;
-import org.apache.openejb.core.MethodContext;
import org.apache.openejb.core.SimpleTransactionSynchronizationRegistry;
import org.apache.openejb.core.TransactionSynchronizationRegistryWrapper;
import org.apache.openejb.core.ivm.naming.IvmContext;
import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
-import org.apache.openejb.core.singleton.SingletonContainer;
import org.apache.openejb.core.timer.EjbTimerServiceImpl;
import org.apache.openejb.core.timer.NullEjbTimerServiceImpl;
import org.apache.openejb.core.timer.ScheduleData;
@@ -484,7 +481,7 @@ public class Assembler extends Assembler
List<String> used = new ArrayList<String>();
for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
for (EnterpriseBeanInfo beanInfo : ejbJarInfo.enterpriseBeans) {
- if (containerSystem.getDeploymentInfo(beanInfo.ejbDeploymentId) != null) {
+ if (containerSystem.getBeanContext(beanInfo.ejbDeploymentId) != null) {
used.add(beanInfo.ejbDeploymentId);
}
}
@@ -553,22 +550,21 @@ public class Assembler extends Assembler
}
}
- List<DeploymentInfo> allDeployments = new ArrayList<DeploymentInfo>();
+ List<BeanContext> allDeployments = new ArrayList<BeanContext>();
// EJB
EjbJarBuilder ejbJarBuilder = new EjbJarBuilder(props, appContext);
for (EjbJarInfo ejbJar : appInfo.ejbJars) {
- HashMap<String, DeploymentInfo> deployments = ejbJarBuilder.build(ejbJar, appInjections);
+ HashMap<String, BeanContext> deployments = ejbJarBuilder.build(ejbJar, appInjections);
JaccPermissionsBuilder jaccPermissionsBuilder = new JaccPermissionsBuilder();
PolicyContext policyContext = jaccPermissionsBuilder.build(ejbJar, deployments);
jaccPermissionsBuilder.install(policyContext);
TransactionPolicyFactory transactionPolicyFactory = createTransactionPolicyFactory(ejbJar, classLoader);
- for (DeploymentInfo deploymentInfo : deployments.values()) {
- CoreDeploymentInfo coreDeploymentInfo = (CoreDeploymentInfo) deploymentInfo;
+ for (BeanContext beanContext : deployments.values()) {
- coreDeploymentInfo.setTransactionPolicyFactory(transactionPolicyFactory);
+ beanContext.setTransactionPolicyFactory(transactionPolicyFactory);
}
MethodTransactionBuilder methodTransactionBuilder = new MethodTransactionBuilder();
@@ -577,61 +573,60 @@ public class Assembler extends Assembler
MethodConcurrencyBuilder methodConcurrencyBuilder = new MethodConcurrencyBuilder();
methodConcurrencyBuilder.build(deployments, ejbJar.methodConcurrency);
- for (DeploymentInfo deploymentInfo : deployments.values()) {
- containerSystem.addDeployment(deploymentInfo);
+ for (BeanContext beanContext : deployments.values()) {
+ containerSystem.addDeployment(beanContext);
}
//bind ejbs into global jndi
jndiBuilder.build(ejbJar, deployments);
// setup timers/asynchronous methods - must be after transaction attributes are set
- for (DeploymentInfo deploymentInfo : deployments.values()) {
- CoreDeploymentInfo coreDeploymentInfo = (CoreDeploymentInfo) deploymentInfo;
- if (coreDeploymentInfo.getComponentType() != BeanType.STATEFUL) {
- Method ejbTimeout = coreDeploymentInfo.getEjbTimeout();
+ for (BeanContext beanContext : deployments.values()) {
+ if (beanContext.getComponentType() != BeanType.STATEFUL) {
+ Method ejbTimeout = beanContext.getEjbTimeout();
boolean timerServiceRequired = false;
if (ejbTimeout != null) {
// If user set the tx attribute to RequiresNew change it to Required so a new transaction is not started
- if (coreDeploymentInfo.getTransactionType(ejbTimeout) == TransactionType.RequiresNew) {
- coreDeploymentInfo.setMethodTransactionAttribute(ejbTimeout, TransactionType.Required);
+ if (beanContext.getTransactionType(ejbTimeout) == TransactionType.RequiresNew) {
+ beanContext.setMethodTransactionAttribute(ejbTimeout, TransactionType.Required);
}
timerServiceRequired = true;
}
- for (Iterator<Map.Entry<Method, MethodContext>> it = coreDeploymentInfo.iteratorMethodContext(); it.hasNext();) {
+ for (Iterator<Map.Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext();) {
Map.Entry<Method, MethodContext> entry = it.next();
MethodContext methodContext = entry.getValue();
if (methodContext.getSchedules().size() > 0) {
timerServiceRequired = true;
Method method = entry.getKey();
//TODO Need ?
- if (coreDeploymentInfo.getTransactionType(method) == TransactionType.RequiresNew) {
- coreDeploymentInfo.setMethodTransactionAttribute(method, TransactionType.Required);
+ if (beanContext.getTransactionType(method) == TransactionType.RequiresNew) {
+ beanContext.setMethodTransactionAttribute(method, TransactionType.Required);
}
}
}
if (timerServiceRequired) {
// Create the timer
- EjbTimerServiceImpl timerService = new EjbTimerServiceImpl(coreDeploymentInfo);
+ EjbTimerServiceImpl timerService = new EjbTimerServiceImpl(beanContext);
//Load auto-start timers
TimerStore timerStore = timerService.getTimerStore();
- for (Iterator<Map.Entry<Method, MethodContext>> it = coreDeploymentInfo.iteratorMethodContext(); it.hasNext();) {
+ for (Iterator<Map.Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext();) {
Map.Entry<Method, MethodContext> entry = it.next();
MethodContext methodContext = entry.getValue();
for(ScheduleData scheduleData : methodContext.getSchedules()) {
- timerStore.createCalendarTimer(timerService, (String) deploymentInfo.getDeploymentID(), null, entry.getKey(), scheduleData.getExpression(), scheduleData.getConfig());
+ timerStore.createCalendarTimer(timerService, (String) beanContext.getDeploymentID(), null, entry.getKey(), scheduleData.getExpression(), scheduleData.getConfig());
}
}
- coreDeploymentInfo.setEjbTimerService(timerService);
+ beanContext.setEjbTimerService(timerService);
} else {
- coreDeploymentInfo.setEjbTimerService(new NullEjbTimerServiceImpl());
+ beanContext.setEjbTimerService(new NullEjbTimerServiceImpl());
}
}
//set asynchronous methods transaction
//TODO ???
- for (Iterator<Entry<Method, MethodContext>> it = coreDeploymentInfo.iteratorMethodContext(); it.hasNext();) {
+ for (Iterator<Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext();) {
Entry<Method, MethodContext> entry = it.next();
- if (entry.getValue().isAsynchronous() && coreDeploymentInfo.getTransactionType(entry.getKey()) == TransactionType.RequiresNew) {
- coreDeploymentInfo.setMethodTransactionAttribute(entry.getKey(), TransactionType.Required);
+ if (entry.getValue().isAsynchronous() && beanContext.getTransactionType(entry.getKey()) == TransactionType.RequiresNew) {
+ beanContext.setMethodTransactionAttribute(entry.getKey(), TransactionType.Required);
}
}
}
@@ -639,9 +634,8 @@ public class Assembler extends Assembler
for (ApplicationExceptionInfo exceptionInfo : ejbJar.applicationException) {
try {
Class exceptionClass = classLoader.loadClass(exceptionInfo.exceptionClass);
- for (DeploymentInfo deploymentInfo : deployments.values()) {
- CoreDeploymentInfo coreDeploymentInfo = (CoreDeploymentInfo) deploymentInfo;
- coreDeploymentInfo.addApplicationException(exceptionClass, exceptionInfo.rollback, exceptionInfo.inherited);
+ for (BeanContext beanContext : deployments.values()) {
+ beanContext.addApplicationException(exceptionClass, exceptionInfo.rollback, exceptionInfo.inherited);
}
} catch (ClassNotFoundException e) {
logger.error("createApplication.invalidClass", e, exceptionInfo.exceptionClass, e.getMessage());
@@ -659,7 +653,7 @@ public class Assembler extends Assembler
// now that everything is configured, deploy to the container
if (start) {
// deploy
- for (DeploymentInfo deployment : allDeployments) {
+ for (BeanContext deployment : allDeployments) {
try {
Container container = deployment.getContainer();
container.deploy(deployment);
@@ -670,7 +664,7 @@ public class Assembler extends Assembler
}
// start
- for (DeploymentInfo deployment : allDeployments) {
+ for (BeanContext deployment : allDeployments) {
try {
Container container = deployment.getContainer();
container.start(deployment);
@@ -787,12 +781,12 @@ public class Assembler extends Assembler
return factory;
}
- private static List<DeploymentInfo> sort(List<DeploymentInfo> deployments) {
+ private static List<BeanContext> sort(List<BeanContext> deployments) {
// Sort all the singletons to the back of the list. We want to make sure
// all non-singletons are created first so that if a singleton refers to them
// they are available.
- Collections.sort(deployments, new Comparator<DeploymentInfo>(){
- public int compare(DeploymentInfo a, DeploymentInfo b) {
+ Collections.sort(deployments, new Comparator<BeanContext>(){
+ public int compare(BeanContext a, BeanContext b) {
int aa = (a.getComponentType() == BeanType.SINGLETON) ? 1 : 0;
int bb = (b.getComponentType() == BeanType.SINGLETON) ? 1 : 0;
return aa - bb;
@@ -801,12 +795,12 @@ public class Assembler extends Assembler
// Sort all the beans with references to the back of the list. Beans
// without references to ther beans will be deployed first.
- deployments = References.sort(deployments, new References.Visitor<DeploymentInfo>(){
- public String getName(DeploymentInfo t) {
+ deployments = References.sort(deployments, new References.Visitor<BeanContext>(){
+ public String getName(BeanContext t) {
return (String) t.getDeploymentID();
}
- public Set<String> getReferences(DeploymentInfo t) {
+ public Set<String> getReferences(BeanContext t) {
return t.getDependsOn();
}
});
@@ -814,8 +808,8 @@ public class Assembler extends Assembler
// Now Sort all the MDBs to the back of the list. The Resource Adapter
// may attempt to use the MDB on endpointActivation and the MDB may have
// references to other ejbs that would need to be available first.
- Collections.sort(deployments, new Comparator<DeploymentInfo>(){
- public int compare(DeploymentInfo a, DeploymentInfo b) {
+ Collections.sort(deployments, new Comparator<BeanContext>(){
+ public int compare(BeanContext a, BeanContext b) {
int aa = (a.getComponentType() == BeanType.MESSAGE_DRIVEN) ? 1 : 0;
int bb = (b.getComponentType() == BeanType.MESSAGE_DRIVEN) ? 1 : 0;
return aa - bb;
@@ -898,15 +892,15 @@ public class Assembler extends Assembler
}
// get all of the ejb deployments
- List<DeploymentInfo> deployments = new ArrayList<DeploymentInfo>();
+ List<BeanContext> deployments = new ArrayList<BeanContext>();
for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
for (EnterpriseBeanInfo beanInfo : ejbJarInfo.enterpriseBeans) {
String deploymentId = beanInfo.ejbDeploymentId;
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) containerSystem.getDeploymentInfo(deploymentId);
- if (deployment == null) {
+ BeanContext beanContext = containerSystem.getBeanContext(deploymentId);
+ if (beanContext == null) {
undeployException.getCauses().add(new Exception("deployment not found: " + deploymentId));
} else {
- deployments.add(deployment);
+ deployments.add(beanContext);
}
}
}
@@ -925,7 +919,7 @@ public class Assembler extends Assembler
Collections.reverse(deployments);
// stop
- for (DeploymentInfo deployment : deployments) {
+ for (BeanContext deployment : deployments) {
String deploymentID = deployment.getDeploymentID() + "";
try {
Container container = deployment.getContainer();
@@ -936,16 +930,16 @@ public class Assembler extends Assembler
}
// undeploy
- for (DeploymentInfo deployment : deployments) {
- String deploymentID = deployment.getDeploymentID() + "";
+ for (BeanContext bean : deployments) {
+ String deploymentID = bean.getDeploymentID() + "";
try {
- Container container = deployment.getContainer();
- container.undeploy(deployment);
- deployment.setContainer(null);
+ Container container = bean.getContainer();
+ container.undeploy(bean);
+ bean.setContainer(null);
} catch (Throwable t) {
undeployException.getCauses().add(new Exception("bean: " + deploymentID + ": " + t.getMessage(), t));
} finally {
- ((CoreDeploymentInfo)deployment).setDestroyed(true);
+ bean.setDestroyed(true);
}
}
@@ -962,10 +956,10 @@ public class Assembler extends Assembler
}
// Clear out naming for all components first
- for (DeploymentInfo deployment : deployments) {
+ for (BeanContext deployment : deployments) {
String deploymentID = deployment.getDeploymentID() + "";
try {
- containerSystem.removeDeploymentInfo(deployment);
+ containerSystem.removeBeanContext(deployment);
} catch (Throwable t) {
undeployException.getCauses().add(new Exception(deploymentID, t));
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java Tue Sep 14 07:43:38 2010
@@ -17,13 +17,12 @@
*/
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.AppContext;
import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.ModuleContext;
-import org.apache.openejb.core.AppContext;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.ModuleContext;
import org.apache.openejb.util.Messages;
import javax.naming.Context;
@@ -46,13 +45,13 @@ public class EjbJarBuilder {
this.context = context;
}
- public HashMap<String, DeploymentInfo> build(EjbJarInfo ejbJar, List<Injection> appInjections) throws OpenEJBException {
+ public HashMap<String, BeanContext> build(EjbJarInfo ejbJar, List<Injection> appInjections) throws OpenEJBException {
InjectionBuilder injectionBuilder = new InjectionBuilder(context.getClassLoader());
List<Injection> moduleInjections = injectionBuilder.buildInjections(ejbJar.moduleJndiEnc);
moduleInjections.addAll(appInjections);
Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, ejbJar.moduleId, context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
- HashMap<String, DeploymentInfo> deployments = new HashMap<String, DeploymentInfo>();
+ HashMap<String, BeanContext> deployments = new HashMap<String, BeanContext>();
ModuleContext moduleContext = new ModuleContext(ejbJar.moduleId, context, moduleJndiContext);
InterceptorBindingBuilder interceptorBindingBuilder = new InterceptorBindingBuilder(context.getClassLoader(), ejbJar);
@@ -62,20 +61,20 @@ public class EjbJarBuilder {
for (EnterpriseBeanInfo ejbInfo : ejbJar.enterpriseBeans) {
try {
EnterpriseBeanBuilder deploymentBuilder = new EnterpriseBeanBuilder(ejbInfo, new ArrayList<String>(), moduleContext, moduleInjections);
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) deploymentBuilder.build();
+ BeanContext bean = deploymentBuilder.build();
- interceptorBindingBuilder.build(deployment, ejbInfo);
+ interceptorBindingBuilder.build(bean, ejbInfo);
- methodScheduleBuilder.build(deployment, ejbInfo);
+ methodScheduleBuilder.build(bean, ejbInfo);
- deployments.put(ejbInfo.ejbDeploymentId, deployment);
+ deployments.put(ejbInfo.ejbDeploymentId, bean);
// TODO: replace with get() on application context or parent
Container container = (Container) props.get(ejbInfo.containerId);
- if (container == null) throw new IllegalStateException("Container does not exist: " + ejbInfo.containerId + ". Referenced by deployment: " + deployment.getDeploymentID());
+ if (container == null) throw new IllegalStateException("Container does not exist: " + ejbInfo.containerId + ". Referenced by deployment: " + bean.getDeploymentID());
// Don't deploy to the container, yet. That will be done by deploy() once Assembler as finished configuring the DeploymentInfo
- deployment.setContainer(container);
+ bean.setContainer(container);
} catch (Throwable e) {
throw new OpenEJBException("Error building bean '" + ejbInfo.ejbName + "'. Exception: " + e.getClass() + ": " + e.getMessage(), e);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Tue Sep 14 07:43:38 2010
@@ -32,11 +32,11 @@ import javax.naming.Context;
import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.ModuleContext;
+import org.apache.openejb.ModuleContext;
import org.apache.openejb.core.cmp.CmpUtil;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
@@ -79,7 +79,7 @@ class EnterpriseBeanBuilder {
}
}
- public Object build() throws OpenEJBException {
+ public BeanContext build() throws OpenEJBException {
Class ejbClass = loadClass(bean.ejbClass, "classNotFound.ejbClass");
Class home = null;
@@ -144,13 +144,13 @@ class EnterpriseBeanBuilder {
bind(compJndiContext, "app", moduleContext.getAppContext().getAppJndiContext());
bind(compJndiContext, "global", moduleContext.getAppContext().getGlobalJndiContext());
- CoreDeploymentInfo deployment;
+ BeanContext deployment;
if (BeanType.MESSAGE_DRIVEN != ejbType) {
- deployment = new CoreDeploymentInfo(bean.ejbDeploymentId, compJndiContext, moduleContext, ejbClass, home, remote, localhome, local, serviceEndpoint, businessLocals, businessRemotes, primaryKey, ejbType, bean.localbean && ejbType.isSession());
+ deployment = new BeanContext(bean.ejbDeploymentId, compJndiContext, moduleContext, ejbClass, home, remote, localhome, local, serviceEndpoint, businessLocals, businessRemotes, primaryKey, ejbType, bean.localbean && ejbType.isSession());
} else {
MessageDrivenBeanInfo messageDrivenBeanInfo = (MessageDrivenBeanInfo) bean;
Class mdbInterface = loadClass(messageDrivenBeanInfo.mdbInterface, "classNotFound.mdbInterface");
- deployment = new CoreDeploymentInfo(bean.ejbDeploymentId, compJndiContext, moduleContext, ejbClass, mdbInterface, messageDrivenBeanInfo.activationProperties);
+ deployment = new BeanContext(bean.ejbDeploymentId, compJndiContext, moduleContext, ejbClass, mdbInterface, messageDrivenBeanInfo.activationProperties);
deployment.setDestinationId(messageDrivenBeanInfo.destinationId);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Tue Sep 14 07:43:38 2010
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.assembler.classic;
-import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -92,8 +92,8 @@ public class InterceptorBindingBuilder {
}
}
- public void build(CoreDeploymentInfo deploymentInfo, EnterpriseBeanInfo beanInfo) {
- Class clazz = deploymentInfo.getBeanClass();
+ public void build(BeanContext beanContext, EnterpriseBeanInfo beanInfo) {
+ Class clazz = beanContext.getBeanClass();
InterceptorData beanAsInterceptor = new InterceptorData(clazz);
@@ -113,13 +113,13 @@ public class InterceptorBindingBuilder {
toMethods(clazz, beanInfo.aroundTimeout, beanAsInterceptor.getAroundTimeout());
}
- for (Method method : deploymentInfo.getBeanClass().getMethods()) {
+ for (Method method : beanContext.getBeanClass().getMethods()) {
List<InterceptorData> methodInterceptors = createInterceptorDatas(method, beanInfo.ejbName, this.bindings);
// The bean itself gets to intercept too and is always last.
methodInterceptors.add(beanAsInterceptor);
- deploymentInfo.setMethodInterceptors(method, methodInterceptors);
+ beanContext.setMethodInterceptors(method, methodInterceptors);
}
List<InterceptorData> callbackInterceptorDatas = createInterceptorDatas(null, beanInfo.ejbName, this.packageAndClassBindings);
@@ -127,7 +127,7 @@ public class InterceptorBindingBuilder {
// The bean itself gets to intercept too and is always last.
callbackInterceptorDatas.add(beanAsInterceptor);
- deploymentInfo.setCallbackInterceptors(callbackInterceptorDatas);
+ beanContext.setCallbackInterceptors(callbackInterceptorDatas);
}
private List<InterceptorData> createInterceptorDatas(Method method, String ejbName, List<InterceptorBindingInfo> bindings) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java Tue Sep 14 07:43:38 2010
@@ -16,14 +16,13 @@
*/
package org.apache.openejb.assembler.classic;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
import static org.apache.openejb.assembler.classic.MethodInfoUtil.resolveAttributes;
-import org.apache.openejb.core.CoreDeploymentInfo;
import javax.security.jacc.EJBMethodPermission;
import javax.security.jacc.EJBRoleRefPermission;
@@ -75,7 +74,7 @@ public class JaccPermissionsBuilder {
private static Logger log = Logger.getInstance(LogCategory.OPENEJB_STARTUP.createChild("attributes"), JaccPermissionsBuilder.class);
- public PolicyContext build(EjbJarInfo ejbJar, HashMap<String, DeploymentInfo> deployments) throws OpenEJBException {
+ public PolicyContext build(EjbJarInfo ejbJar, HashMap<String, BeanContext> deployments) throws OpenEJBException {
List<MethodPermissionInfo> normalized = new ArrayList<MethodPermissionInfo>();
@@ -90,8 +89,8 @@ public class JaccPermissionsBuilder {
perms = MethodInfoUtil.normalizeMethodPermissionInfos(perms);
- for (DeploymentInfo deploymentInfo : deployments.values()) {
- Map<Method, MethodAttributeInfo> attributes = resolveAttributes(perms, deploymentInfo);
+ for (BeanContext beanContext : deployments.values()) {
+ Map<Method, MethodAttributeInfo> attributes = resolveAttributes(perms, beanContext);
if (log.isDebugEnabled()) {
for (Map.Entry<Method, MethodAttributeInfo> entry : attributes.entrySet()) {
@@ -113,8 +112,8 @@ public class JaccPermissionsBuilder {
MethodInfo am = a.methods.get(0);
MethodInfo bm = new MethodInfo();
- bm.ejbName = deploymentInfo.getEjbName();
- bm.ejbDeploymentId = deploymentInfo.getDeploymentID() + "";
+ bm.ejbName = beanContext.getEjbName();
+ bm.ejbDeploymentId = beanContext.getDeploymentID() + "";
bm.methodIntf = am.methodIntf;
bm.className = method.getDeclaringClass().getName();
@@ -136,7 +135,7 @@ public class JaccPermissionsBuilder {
PolicyContext policyContext = new PolicyContext(ejbJar.moduleId);
for (EnterpriseBeanInfo enterpriseBean : ejbJar.enterpriseBeans) {
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) deployments.get(enterpriseBean.ejbDeploymentId);
+ BeanContext beanContext = deployments.get(enterpriseBean.ejbDeploymentId);
Permissions permissions = new Permissions();
@@ -145,11 +144,11 @@ public class JaccPermissionsBuilder {
for (InterfaceType type : InterfaceType.values()) {
if (type == InterfaceType.UNKNOWN) continue;
- for (Class interfce : deployment.getInterfaces(type)) {
+ for (Class interfce : beanContext.getInterfaces(type)) {
addPossibleEjbMethodPermissions(permissions, ejbName, type.getSpecName(), interfce);
}
}
- addPossibleEjbMethodPermissions(permissions, ejbName, null, deployment.getBeanClass());
+ addPossibleEjbMethodPermissions(permissions, ejbName, null, beanContext.getBeanClass());
addDeclaredEjbPermissions(ejbJar, enterpriseBean, null, permissions, policyContext);