You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2010/05/06 18:45:04 UTC
svn commit: r941800 [1/3] - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/java/org/apache/openejb/config/ ...
Author: jgallimore
Date: Thu May 6 16:45:02 2010
New Revision: 941800
URL: http://svn.apache.org/viewvc?rev=941800&view=rev
Log:
OPENEJB-1188 adding LocalBean functionality
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppClassLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/BusinessLocalBeanReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
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/InterfaceType.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/EjbReferenceInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.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/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/SingletonBeanInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatelessBeanInfo.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/config/EjbJarInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.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/TempClassLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.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/naming/BusinessRemoteReference.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/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/util/proxy/LocalBeanProxyGenerator.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImplTest.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAnnotatedFieldInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessFieldInjectionTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessSetterInjectionTests.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
Added: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppClassLoader.java?rev=941800&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppClassLoader.java (added)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/AppClassLoader.java Thu May 6 16:45:02 2010
@@ -0,0 +1,50 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.openejb;
+
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.URLStreamHandlerFactory;
+import java.util.List;
+import java.util.ArrayList;
+
+public class AppClassLoader extends URLClassLoader {
+ List<String> addedClasses = new ArrayList<String>();
+
+ public AppClassLoader(URL[] urls, ClassLoader classLoader) {
+ super(urls, classLoader);
+ }
+
+ public AppClassLoader(URL[] urls) {
+ super(urls);
+ }
+
+ public AppClassLoader(URL[] urls, ClassLoader classLoader, URLStreamHandlerFactory urlStreamHandlerFactory) {
+ super(urls, classLoader, urlStreamHandlerFactory);
+ }
+
+ public void addClass(byte[] cls, String clsName) {
+ defineClass(clsName, cls, 0, cls.length);
+ addedClasses.add(clsName);
+ }
+
+ public boolean classDefined(String clsName) {
+ return addedClasses.contains(clsName);
+ }
+}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Thu May 6 16:45:02 2010
@@ -62,9 +62,9 @@ public class ClassLoaderUtil {
});
}
- public static URLClassLoader createClassLoader(String appId, URL[] urls, ClassLoader parent) {
+ public static AppClassLoader createClassLoader(String appId, URL[] urls, ClassLoader parent) {
urls = urlCache.cacheUrls(appId, urls);
- URLClassLoader classLoader = new URLClassLoader(urls, parent);
+ AppClassLoader classLoader = new AppClassLoader(urls, parent);
List<ClassLoader> classLoaders = classLoadersByApp.get(appId);
if (classLoaders == null) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java Thu May 6 16:45:02 2010
@@ -80,6 +80,8 @@ public interface DeploymentInfo {
public Class getBusinessLocalInterface();
+ public Class getBusinessLocalBeanInterface();
+
public Class getBusinessRemoteInterface();
public List<Class> getBusinessLocalInterfaces();
@@ -136,6 +138,8 @@ public interface DeploymentInfo {
BusinessLocalHome getBusinessLocalHome();
+ BusinessLocalBeanHome getBusinessLocalBeanHome();
+
BusinessLocalHome getBusinessLocalHome(List<Class> interfaces);
BusinessRemoteHome getBusinessRemoteHome();
@@ -156,6 +160,10 @@ public interface DeploymentInfo {
Object create();
}
+ public interface BusinessLocalBeanHome extends javax.ejb.EJBLocalHome {
+ Object create();
+ }
+
public interface BusinessRemoteHome extends javax.ejb.EJBHome {
Object create();
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InterfaceType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InterfaceType.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InterfaceType.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InterfaceType.java Thu May 6 16:45:02 2010
@@ -25,10 +25,12 @@ public enum InterfaceType {
EJB_LOCAL_HOME("LocalHome"),
EJB_LOCAL("Local"),
BUSINESS_LOCAL("Local"),
+ LOCALBEAN("LocalBean"),
BUSINESS_LOCAL_HOME("LocalHome"),
BUSINESS_REMOTE("Remote"),
BUSINESS_REMOTE_HOME("Home"),
SERVICE_ENDPOINT("ServiceEndpoint"),
+ BUSINESS_LOCALBEAN_HOME("LocalBeanHome"),
UNKNOWN("Unknown");
private final String specName;
@@ -46,6 +48,7 @@ public enum InterfaceType {
case EJB_HOME: return true;
case EJB_LOCAL_HOME: return true;
case BUSINESS_LOCAL_HOME: return true;
+ case BUSINESS_LOCALBEAN_HOME: return true;
case BUSINESS_REMOTE_HOME: return true;
}
return false;
@@ -87,6 +90,15 @@ public enum InterfaceType {
return false;
}
+ public boolean isLocalBean() {
+ switch(this){
+ case LOCALBEAN: return true;
+ case BUSINESS_LOCALBEAN_HOME: return true;
+ }
+ return false;
+
+ }
+
public InterfaceType getCounterpart() {
switch(this){
case EJB_HOME: return InterfaceType.EJB_OBJECT;
@@ -97,6 +109,8 @@ public enum InterfaceType {
case EJB_LOCAL: return InterfaceType.EJB_LOCAL_HOME;
case BUSINESS_REMOTE: return InterfaceType.BUSINESS_REMOTE_HOME;
case BUSINESS_LOCAL: return InterfaceType.BUSINESS_LOCAL_HOME;
+ case BUSINESS_LOCALBEAN_HOME: return InterfaceType.LOCALBEAN;
+ case LOCALBEAN: return InterfaceType.BUSINESS_LOCALBEAN_HOME;
default: throw new IllegalArgumentException("InterfaceType has no counterpart: " + this);
}
}
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=941800&r1=941799&r2=941800&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 Thu May 6 16:45:02 2010
@@ -670,6 +670,7 @@ public class Assembler extends Assembler
} catch (Exception e1) {
logger.debug("createApplication.undeployFailed", e1, appInfo.jarPath);
}
+
throw new OpenEJBException(messages.format("createApplication.failed", appInfo.jarPath), t);
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java Thu May 6 16:45:02 2010
@@ -27,4 +27,5 @@ public class EjbReferenceInfo extends In
public String link;
public ReferenceLocationInfo location;
+ public boolean localbean;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java Thu May 6 16:45:02 2010
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.util.LinkResolver;
import java.net.URI;
@@ -114,6 +115,30 @@ public class EjbResolver {
for (String businessLocal : bean.businessLocal) {
addInterfaces(new Interfaces(businessLocal, Type.LOCAL, bean.ejbDeploymentId));
}
+
+ boolean isLocalBean = false;
+ if (bean instanceof StatelessBeanInfo) {
+ StatelessBeanInfo statelessBean = (StatelessBeanInfo) bean;
+ if (statelessBean.localbean) {
+ isLocalBean = true;
+ }
+ }
+ if (bean instanceof StatefulBeanInfo) {
+ StatefulBeanInfo statefulBean = (StatefulBeanInfo) bean;
+ if (statefulBean.localbean) {
+ isLocalBean = true;
+ }
+ }
+ if (bean instanceof SingletonBeanInfo) {
+ SingletonBeanInfo singletonBeanInfo = (SingletonBeanInfo) bean;
+ if (singletonBeanInfo.localbean) {
+ isLocalBean = true;
+ }
+ }
+
+ if (isLocalBean) {
+ addInterfaces(new Interfaces(bean.ejbClass, Type.LOCAL, bean.ejbDeploymentId));
+ }
}
private void addInterfaces(Interfaces interfaces) {
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=941800&r1=941799&r2=941800&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 Thu May 6 16:45:02 2010
@@ -207,6 +207,7 @@ class EnterpriseBeanBuilder {
}
}
deployment.setExtendedEntityManagerFactories(new Index<EntityManagerFactory, Map>(extendedEntityManagerFactories));
+ deployment.setLocalbean(((StatefulBeanInfo) bean).localbean);
}
if (ejbType.isSession() || ejbType.isMessageDriven()) {
@@ -217,6 +218,11 @@ class EnterpriseBeanBuilder {
deployment.setBeanManagedConcurrency("Bean".equalsIgnoreCase(bean.concurrencyType));
deployment.getDependsOn().addAll(bean.dependsOn);
deployment.setLoadOnStartup(bean.loadOnStartup);
+ deployment.setLocalbean(((SingletonBeanInfo) bean).localbean);
+ }
+
+ if (ejbType == BeanType.STATELESS) {
+ deployment.setLocalbean(((StatelessBeanInfo) bean).localbean);
}
if (ejbType.isEntity()) {
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=941800&r1=941799&r2=941800&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 Thu May 6 16:45:02 2010
@@ -291,7 +291,8 @@ public class JaccPermissionsBuilder {
public void addPossibleEjbMethodPermissions(Permissions permissions, String ejbName, String methodInterface, Class clazz) throws OpenEJBException {
if (clazz == null) return;
for (java.lang.reflect.Method method : clazz.getMethods()) {
- permissions.add(new EJBMethodPermission(ejbName, methodInterface, method));
+ String methodIface = ("LocalBean".equals(methodInterface) || "LocalBeanHome".equals(methodInterface)) ? null : methodInterface;
+ permissions.add(new EJBMethodPermission(ejbName, methodIface, method));
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Thu May 6 16:45:02 2010
@@ -26,6 +26,9 @@ import javax.jms.MessageListener;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.ivm.naming.*;
+import org.apache.openejb.core.ivm.naming.openejb.BusinessLocalBeanReference;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -111,6 +114,7 @@ public class JndiBuilder {
REMOTE_HOME(InterfaceType.EJB_HOME, "RemoteHome", "home", ""),
LOCAL_HOME(InterfaceType.EJB_LOCAL_HOME, "LocalHome", "local-home", "Local"),
BUSINESS_LOCAL(InterfaceType.BUSINESS_LOCAL, "Local", "business-local", "BusinessLocal"),
+ LOCALBEAN(InterfaceType.LOCALBEAN, "LocalBean", "localbean", "LocalBean"),
BUSINESS_REMOTE(InterfaceType.BUSINESS_REMOTE, "Remote", "business-remote", "BusinessRemote"),
SERVICE_ENDPOINT(InterfaceType.SERVICE_ENDPOINT, "Endpoint", "service-endpoint", "ServiceEndpoint");
@@ -286,6 +290,7 @@ public class JndiBuilder {
public void bind(EjbJarInfo ejbJarInfo, DeploymentInfo deployment, EnterpriseBeanInfo beanInfo, JndiNameStrategy strategy) {
+ CoreDeploymentInfo cdi = (CoreDeploymentInfo) deployment;
Bindings bindings = new Bindings();
deployment.set(Bindings.class, bindings);
@@ -377,6 +382,25 @@ public class JndiBuilder {
}
try {
+ if (cdi.isLocalbean()) {
+ Class beanClass = deployment.getBeanClass();
+
+ DeploymentInfo.BusinessLocalBeanHome home = deployment.getBusinessLocalBeanHome();
+ BusinessLocalBeanReference ref = new BusinessLocalBeanReference(home);
+
+ optionalBind(bindings, ref, "openejb/Deployment/" + format(deployment.getDeploymentID(), beanClass.getName(), InterfaceType.LOCALBEAN));
+
+ String internalName = "openejb/Deployment/" + format(deployment.getDeploymentID(), beanClass.getName(), InterfaceType.BUSINESS_LOCALBEAN_HOME);
+ bind(internalName, ref, bindings, beanInfo, beanClass);
+
+ String name = strategy.getName(beanClass, JndiNameStrategy.Interface.LOCALBEAN);
+ bind("openejb/local/" + name, ref, bindings, beanInfo, beanClass);
+ }
+ } catch (NamingException e) {
+ throw new RuntimeException("Unable to bind business remote deployment in jndi.", e);
+ }
+
+ try {
if (MessageListener.class.equals(deployment.getMdbInterface())) {
String destinationId = deployment.getDestinationId();
@@ -414,7 +438,7 @@ public class JndiBuilder {
private void bind(String name, Reference ref, Bindings bindings, EnterpriseBeanInfo beanInfo, Class intrface) throws NamingException {
- if (name.startsWith("openejb/local/") || name.startsWith("openejb/remote/")) {
+ if (name.startsWith("openejb/local/") || name.startsWith("openejb/remote/") || name.startsWith("openejb/localbean/")) {
String externalName = name.replaceFirst("openejb/[^/]+/", "");
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Thu May 6 16:45:02 2010
@@ -172,7 +172,6 @@ public class JndiEncBuilder {
}
for (EjbReferenceInfo referenceInfo : jndiEnc.ejbLocalReferences) {
-
Reference reference = null;
if (referenceInfo.location != null) {
@@ -180,7 +179,7 @@ public class JndiEncBuilder {
} else if (referenceInfo.ejbDeploymentId == null){
reference = new LazyEjbReference(new Ref(referenceInfo), moduleUri, false);
} else {
- String jndiName = "openejb/Deployment/" + JndiBuilder.format(referenceInfo.ejbDeploymentId, referenceInfo.interfaceClassName, InterfaceType.BUSINESS_LOCAL);
+ String jndiName = "openejb/Deployment/" + JndiBuilder.format(referenceInfo.ejbDeploymentId, referenceInfo.interfaceClassName, referenceInfo.localbean ? InterfaceType.LOCALBEAN : InterfaceType.BUSINESS_LOCAL);
reference = new IntraVmJndiReference(jndiName);
}
bindings.put(normalize(referenceInfo.referenceName), reference);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/SingletonBeanInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/SingletonBeanInfo.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/SingletonBeanInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/SingletonBeanInfo.java Thu May 6 16:45:02 2010
@@ -17,6 +17,8 @@
package org.apache.openejb.assembler.classic;
public class SingletonBeanInfo extends EnterpriseBeanInfo {
+ public boolean localbean;
+
public SingletonBeanInfo() {
type = SINGLETON;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java Thu May 6 16:45:02 2010
@@ -31,4 +31,5 @@ public class StatefulBeanInfo extends En
public final List<InitMethodInfo> initMethods = new ArrayList<InitMethodInfo>();
public final List<RemoveMethodInfo> removeMethods = new ArrayList<RemoveMethodInfo>();
+ public boolean localbean;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatelessBeanInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatelessBeanInfo.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatelessBeanInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatelessBeanInfo.java Thu May 6 16:45:02 2010
@@ -17,6 +17,8 @@
package org.apache.openejb.assembler.classic;
public class StatelessBeanInfo extends EnterpriseBeanInfo {
+ public boolean localbean;
+
public StatelessBeanInfo() {
type = STATELESS;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu May 6 16:45:02 2010
@@ -19,6 +19,7 @@ package org.apache.openejb.config;
import org.apache.openejb.*;
import org.apache.openejb.api.LocalClient;
import org.apache.openejb.api.RemoteClient;
+import org.apache.openejb.jee.EmptyType;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.core.webservices.JaxWsUtils;
import org.apache.openejb.core.TempClassLoader;
@@ -114,6 +115,7 @@ import javax.ejb.EJBObject;
import javax.ejb.EJBs;
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.LocalBean;
import javax.ejb.LocalHome;
import javax.ejb.MessageDriven;
import javax.ejb.PostActivate;
@@ -1462,6 +1464,17 @@ public class AnnotationDeployer implemen
}
}
inheritedClassFinder = createInheritedClassFinder(classes.toArray(new Class<?>[classes.size()]));
+ }
+
+ for (EnterpriseBean bean : enterpriseBeans) {
+ Class<?> clazz;
+ try {
+ clazz = classLoader.loadClass(bean.getEjbClass());
+ } catch (ClassNotFoundException e) {
+ throw new OpenEJBException("Unable to load bean class: " + bean.getEjbClass(), e);
+ }
+
+ ClassFinder inheritedClassFinder = createInheritedClassFinder(clazz);
/*
* @EJB
@@ -1471,11 +1484,10 @@ public class AnnotationDeployer implemen
* @PersistenceContext
*/
buildAnnotatedRefs(bean, inheritedClassFinder, classLoader);
-
-
processWebServiceClientHandlers(bean, classLoader);
}
+
for (Interceptor interceptor : ejbModule.getEjbJar().getInterceptors()) {
Class<?> clazz;
try {
@@ -1832,6 +1844,10 @@ public class AnnotationDeployer implemen
// more local interfaces.
for (Class interfce : all.unspecified) sessionBean.addBusinessLocal(interfce);
+ if (beanClass.getAnnotation(LocalBean.class) != null || beanClass.getInterfaces().length == 0) {
+ sessionBean.setLocalBean(new EmptyType());
+ }
+
}
private static class BusinessInterfaces {
@@ -2337,7 +2353,9 @@ public class AnnotationDeployer implemen
interfce = (member == null) ? null : member.getType();
}
- if (interfce != null && !isValidEjbInterface(name, interfce, ejbRef.getName())) {
+ boolean localbean = isLocalBean(interfce);
+
+ if ((!localbean) && interfce != null && !isValidEjbInterface(name, interfce, ejbRef.getName())) {
return;
}
@@ -2362,6 +2380,9 @@ public class AnnotationDeployer implemen
}
}
ejbRef.setRefType(EjbReference.Type.LOCAL);
+ } else if (localbean) {
+ ejbRef.setRefType(EjbReference.Type.LOCAL);
+ ejbRef.setRemote(interfce.getName());
} else {
ejbRef.setRemote(interfce.getName());
if (interfce.getAnnotation(Local.class) != null) {
@@ -2419,6 +2440,27 @@ public class AnnotationDeployer implemen
}
}
+ private boolean isLocalBean(Class clazz) {
+ DeploymentModule module = getModule();
+ if (module instanceof EjbModule) {
+ Set<String> localbeans = new HashSet<String>();
+ EjbModule ejbModule = (EjbModule) module;
+ for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {
+ if (bean instanceof SessionBean) {
+ if (((SessionBean) bean).getLocalBean() != null) {
+ localbeans.add(bean.getEjbClass());
+ }
+ }
+ }
+
+ if (localbeans.contains(clazz.getName())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private boolean isValidEjbInterface(String b, Class clazz, String refName) {
if (!clazz.isInterface()) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Thu May 6 16:45:02 2010
@@ -483,6 +483,7 @@ public class EjbJarInfoBuilder {
if (s.getSessionType() == SessionType.STATEFUL) {
bean = new StatefulBeanInfo();
StatefulBeanInfo stateful = ((StatefulBeanInfo) bean);
+ stateful.localbean = s.getLocalBean() != null;
copyCallbacks(s.getPostActivate(), stateful.postActivate);
copyCallbacks(s.getPrePassivate(), stateful.prePassivate);
@@ -522,8 +523,10 @@ public class EjbJarInfoBuilder {
bean.loadOnStartup = s.getLoadOnStartup();
// See JndiEncInfoBuilder.buildDependsOnRefs for processing of DependsOn
// bean.dependsOn.addAll(s.getDependsOn());
+ ((SingletonBeanInfo)bean).localbean = s.getLocalBean() != null;
} else {
bean = new StatelessBeanInfo();
+ ((StatelessBeanInfo)bean).localbean = s.getLocalBean() != null;
}
bean.timeoutMethod = toInfo(s.getTimeoutMethod());
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Thu May 6 16:45:02 2010
@@ -19,6 +19,9 @@ package org.apache.openejb.config;
import static org.apache.openejb.assembler.classic.EjbResolver.Scope.EJBJAR;
import static org.apache.openejb.assembler.classic.EjbResolver.Scope.EAR;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.assembler.classic.SingletonBeanInfo;
+import org.apache.openejb.assembler.classic.StatefulBeanInfo;
+import org.apache.openejb.assembler.classic.StatelessBeanInfo;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.EjbLocalReferenceInfo;
@@ -79,8 +82,10 @@ public class JndiEncInfoBuilder {
private final EjbResolver earResolver;
private final Map<String, EjbResolver> ejbJarResolvers = new HashMap<String, EjbResolver>();
+ private AppInfo appInfo;
public JndiEncInfoBuilder(AppInfo appInfo) {
+ this.appInfo = appInfo;
// Global-scoped EJB Resolver
@@ -159,6 +164,7 @@ public class JndiEncInfoBuilder {
info.link = ref.getEjbLink();
info.location = buildLocationInfo(ref);
info.targets.addAll(buildInjectionInfos(ref));
+ info.localbean = isIntefaceLocalBean(moduleId, info.interfaceClassName);
if (info.location != null) {
@@ -190,6 +196,8 @@ public class JndiEncInfoBuilder {
continue;
}
+// info.localbean = isLocalBean(moduleId, deploymentId);
+
EjbResolver.Scope scope = ejbResolver.getScope(deploymentId);
info.externalReference = (scope != EAR && scope != EJBJAR);
@@ -227,6 +235,7 @@ public class JndiEncInfoBuilder {
l.link = r.link;
l.location = r.location;
l.targets.addAll(r.targets);
+ l.localbean = r.localbean;
return l;
}
@@ -412,6 +421,71 @@ public class JndiEncInfoBuilder {
}
+ private boolean isIntefaceLocalBean(String moduleId, String interfaceClassName) {
+ EnterpriseBeanInfo beanInfo = getInterfaceBeanInfo(moduleId, interfaceClassName);
+ return isLocalBean(beanInfo) && beanInfo.ejbClass.equals(interfaceClassName);
+ }
+
+ private EnterpriseBeanInfo getInterfaceBeanInfo(String moduleId, String interfaceClassName) {
+ List<EjbJarInfo> ejbJars = appInfo.ejbJars;
+ for (EjbJarInfo ejbJar : ejbJars) {
+ if (!ejbJar.moduleId.equals(moduleId)) continue;
+
+ List<EnterpriseBeanInfo> enterpriseBeans = ejbJar.enterpriseBeans;
+ for (EnterpriseBeanInfo enterpriseBean : enterpriseBeans) {
+ if (interfaceClassName.equals(enterpriseBean.ejbClass)
+ || interfaceClassName.equals(enterpriseBean.local)
+ || interfaceClassName.equals(enterpriseBean.remote)
+ || (enterpriseBean.businessLocal != null && enterpriseBean.businessLocal.contains(interfaceClassName))
+ || (enterpriseBean.businessRemote != null && enterpriseBean.businessRemote.contains(interfaceClassName))) {
+ return enterpriseBean;
+ }
+ }
+ }
+
+ return null;
+ }
+
+
+ private boolean isLocalBean(String moduleId, String deploymentId) {
+ EnterpriseBeanInfo beanInfo = getBeanInfo(moduleId, deploymentId);
+ return isLocalBean(beanInfo);
+ }
+
+ private boolean isLocalBean(EnterpriseBeanInfo beanInfo) {
+ if (beanInfo == null) return false;
+
+ if (beanInfo instanceof StatelessBeanInfo) {
+ StatelessBeanInfo statelessBeanInfo = (StatelessBeanInfo) beanInfo;
+ return statelessBeanInfo.localbean;
+ }
+ if (beanInfo instanceof StatefulBeanInfo) {
+ StatefulBeanInfo statefulBeanInfo = (StatefulBeanInfo) beanInfo;
+ return statefulBeanInfo.localbean;
+ }
+ if (beanInfo instanceof SingletonBeanInfo) {
+ SingletonBeanInfo singletonBeanInfo = (SingletonBeanInfo) beanInfo;
+ return singletonBeanInfo.localbean;
+ }
+
+ return false;
+ }
+
+ private EnterpriseBeanInfo getBeanInfo(String moduleId, String deploymentId) {
+ List<EjbJarInfo> ejbJars = appInfo.ejbJars;
+ for (EjbJarInfo ejbJar : ejbJars) {
+ if (!ejbJar.moduleId.equals(moduleId)) continue;
+
+ List<EnterpriseBeanInfo> enterpriseBeans = ejbJar.enterpriseBeans;
+ for (EnterpriseBeanInfo enterpriseBean : enterpriseBeans) {
+ if (enterpriseBean.ejbDeploymentId.equals(deploymentId)) {
+ return enterpriseBean;
+ }
+ }
+ }
+
+ return null;
+ }
private static class SimpleRef implements EjbResolver.Reference {
private final String name;
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java Thu May 6 16:45:02 2010
@@ -166,7 +166,7 @@ public class CheckClasses extends Valida
if (beanClass.isAnnotationPresent(WebService.class)) return;
- fail(b, "noInterfaceDeclared.session");
+ //fail(b, "noInterfaceDeclared.session");
}
private void check_hasDependentClasses(RemoteBean b, String className, String type) {
Modified: 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/core/CoreDeploymentInfo.java?rev=941800&r1=941799&r2=941800&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/core/CoreDeploymentInfo.java Thu May 6 16:45:02 2010
@@ -35,7 +35,6 @@ import javax.ejb.EJBObject;
import javax.ejb.MessageDrivenBean;
import javax.ejb.TimedObject;
import javax.ejb.Timer;
-import javax.ejb.ScheduleExpression;
import javax.ejb.SessionSynchronization;
import javax.naming.Context;
import javax.persistence.EntityManagerFactory;
@@ -50,6 +49,9 @@ import org.apache.openejb.SystemExceptio
import org.apache.openejb.core.cmp.KeyGenerator;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.core.stateful.StatefulEjbObjectHandler;
+import org.apache.openejb.core.stateless.StatelessEjbObjectHandler;
import org.apache.openejb.core.timer.EjbTimerService;
import org.apache.openejb.core.timer.MethodSchedule;
import org.apache.openejb.core.transaction.TransactionType;
@@ -57,6 +59,8 @@ import org.apache.openejb.core.transacti
import org.apache.openejb.util.Index;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.proxy.InvocationHandler;
+import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
/**
* @org.apache.xbean.XBean element="deployment"
@@ -132,6 +136,7 @@ public class CoreDeploymentInfo implemen
private final Map<Class, InterfaceType> interfaces = new HashMap<Class, InterfaceType>();
private final Map<Class, ExceptionType> exceptions = new HashMap<Class, ExceptionType>();
private boolean loadOnStartup;
+ private boolean localbean;
public Class getInterface(InterfaceType interfaceType) {
switch(interfaceType){
@@ -144,19 +149,20 @@ public class CoreDeploymentInfo implemen
case BUSINESS_REMOTE_HOME: return DeploymentInfo.BusinessRemoteHome.class;
case BUSINESS_LOCAL_HOME: return DeploymentInfo.BusinessLocalHome.class;
case SERVICE_ENDPOINT: return getServiceEndpointInterface();
+ case LOCALBEAN: return getBeanClass();
+ case BUSINESS_LOCALBEAN_HOME: return DeploymentInfo.BusinessLocalBeanHome.class;
default: throw new IllegalStateException("Unexpected enum constant: " + interfaceType);
}
}
public List<Class> getInterfaces(InterfaceType interfaceType) {
switch(interfaceType){
- case BUSINESS_LOCAL: return getBusinessLocalInterfaces();
case BUSINESS_REMOTE: return getBusinessRemoteInterfaces();
- default: {
- List<Class> interfaces = new ArrayList<Class>();
- interfaces.add(getInterface(interfaceType));
- return interfaces;
- }
+ case BUSINESS_LOCAL: return getBusinessLocalInterfaces();
+ default:
+ List<Class> interfaces = new ArrayList<Class>();
+ interfaces.add(getInterface(interfaceType));
+ return interfaces;
}
}
@@ -523,6 +529,12 @@ public class CoreDeploymentInfo implemen
return getBusinessLocalHome(getBusinessLocalInterfaces());
}
+ public BusinessLocalBeanHome getBusinessLocalBeanHome() {
+ List<Class> interfaces = new ArrayList<Class>();
+ interfaces.add(this.beanClass);
+ return (BusinessLocalBeanHome) EjbHomeProxyHandler.createHomeProxy(this, InterfaceType.BUSINESS_LOCALBEAN_HOME, interfaces);
+ }
+
public BusinessLocalHome getBusinessLocalHome(List<Class> interfaces) {
if (getBusinessLocalInterfaces().size() == 0){
throw new IllegalStateException("This component has no business local interfaces: " + getDeploymentID());
@@ -1081,4 +1093,20 @@ public class CoreDeploymentInfo implemen
public boolean isSessionSynchronized() {
return !isBeanManagedTransaction() && SessionSynchronization.class.isAssignableFrom(beanClass);
}
+
+ public boolean isLocalbean() {
+ return localbean;
+ }
+
+ public void setLocalbean(boolean localbean) {
+ this.localbean = localbean;
+ }
+
+ public Class getBusinessLocalBeanInterface() {
+ if (this.isLocalbean()) {
+ return this.beanClass;
+ }
+
+ return null;
+ }
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Thu May 6 16:45:02 2010
@@ -184,5 +184,4 @@ public class TempClassLoader extends URL
}
}
-
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java Thu May 6 16:45:02 2010
@@ -155,10 +155,25 @@ public class ReflectionInvocationContext
this.args = args;
}
public Object invoke() throws Exception {
- Object value = method.invoke(target, args);
+ Method targetMethod = getMethod(target.getClass(), method.getName(), method.getParameterTypes());
+ targetMethod.setAccessible(true);
+ Object value = targetMethod.invoke(target, args);
return value;
}
+ private Method getMethod(Class<?> cls, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException {
+ try {
+ Method method = cls.getDeclaredMethod(methodName, parameterTypes);
+ return method;
+ } catch (NoSuchMethodException e) {
+ if (! (Object.class.equals(cls))) {
+ return getMethod(cls.getSuperclass(), methodName, parameterTypes);
+ }
+
+ throw e;
+ }
+ }
+
public String toString() {
return method.getDeclaringClass().getName() + "." + method.getName();
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java Thu May 6 16:45:02 2010
@@ -119,9 +119,9 @@ public abstract class BaseEjbProxyHandle
interfaces = new ArrayList<Class>(deploymentInfo.getInterfaces(objectInterfaceType));
}
- this.setDoIntraVmCopy(!interfaceType.isLocal());
+ this.setDoIntraVmCopy(!interfaceType.isLocal() && !interfaceType.isLocalBean());
- if (!interfaceType.isLocal()){
+ if (!interfaceType.isLocal()&& !interfaceType.isLocalBean()){
setDoIntraVmCopy(REMOTE_COPY_ENABLED);
}
@@ -165,6 +165,7 @@ public abstract class BaseEjbProxyHandle
// it's interface.
Class mainInterface = getMainInterface();
if (interfaceType.isHome()) return mainInterface;
+ if (interfaceType.isLocalBean()) return mainInterface;
Class declaringClass = method.getDeclaringClass();
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Thu May 6 16:45:02 2010
@@ -33,6 +33,7 @@ import javax.ejb.EJBHome;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.AppClassLoader;
import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.core.managed.ManagedHomeHandler;
import org.apache.openejb.core.singleton.SingletonEjbHomeHandler;
@@ -42,6 +43,7 @@ import org.apache.openejb.core.stateful.
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.openejb.util.proxy.ProxyManager;
public abstract class EjbHomeProxyHandler extends BaseEjbProxyHandler {
@@ -134,7 +136,11 @@ public abstract class EjbHomeProxyHandle
proxyInterfaces.addAll(handler.getInterfaces());
proxyInterfaces.add(IntraVmProxy.class);
- return ProxyManager.newProxyInstance(proxyInterfaces.toArray(new Class[]{}), handler);
+ if (InterfaceType.LOCALBEAN.equals(objectInterfaceType)) {
+ return LocalBeanProxyFactory.newProxyInstance((AppClassLoader) handler.getDeploymentInfo().getClassLoader(), handler.getDeploymentInfo().getBeanClass(), handler);
+ } else {
+ return ProxyManager.newProxyInstance(proxyInterfaces.toArray(new Class[]{}), handler);
+ }
} catch (IllegalAccessException iae) {
throw new RuntimeException("Could not create IVM proxy for " + getInterfaces().get(0), iae);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Thu May 6 16:45:02 2010
@@ -218,6 +218,8 @@ public abstract class EjbObjectProxyHand
}
public static Object createProxy(DeploymentInfo deploymentInfo, Object primaryKey, InterfaceType interfaceType) {
+
+
return createProxy(deploymentInfo, primaryKey, interfaceType, null);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java Thu May 6 16:45:02 2010
@@ -21,7 +21,7 @@ import org.apache.openejb.DeploymentInfo
/**
* @version $Rev$ $Date$
*/
-public class BusinessRemoteReference extends Reference {
+public class BusinessRemoteReference extends Reference {
private final DeploymentInfo.BusinessRemoteHome businessHome;
Added: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/BusinessLocalBeanReference.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/BusinessLocalBeanReference.java?rev=941800&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/BusinessLocalBeanReference.java (added)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/BusinessLocalBeanReference.java Thu May 6 16:45:02 2010
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.ivm.naming.openejb;
+
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.core.ivm.naming.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class BusinessLocalBeanReference extends Reference {
+
+ private final DeploymentInfo.BusinessLocalBeanHome businessHome;
+
+ public BusinessLocalBeanReference(DeploymentInfo.BusinessLocalBeanHome localBeanHome) {
+ this.businessHome = localBeanHome;
+ }
+
+ public Object getObject() throws javax.naming.NamingException {
+ return businessHome.create();
+ }
+
+}
\ No newline at end of file
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java Thu May 6 16:45:02 2010
@@ -259,6 +259,9 @@ public abstract class AbstractSecuritySe
String ejbName = deploymentInfo.getEjbName();
String name = (type == null)? null: type.getSpecName();
+ if ("LocalBean".equals(name) || "LocalBeanHome".equals(name)) {
+ name = null;
+ }
Permission permission = new EJBMethodPermission(ejbName, name, method);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Thu May 6 16:45:02 2010
@@ -157,6 +157,17 @@ public class StatefulContainer implement
}
}
+ Class businessLocalBeanHomeInterface = deploymentInfo.getBusinessLocalBeanInterface();
+ if (businessLocalBeanHomeInterface != null) {
+ for (Method method : DeploymentInfo.BusinessLocalBeanHome.class.getMethods()) {
+ if (method.getName().startsWith("create")) {
+ methods.put(method, MethodType.CREATE);
+ } else if (method.getName().equals("remove")) {
+ methods.put(method, MethodType.REMOVE);
+ }
+ }
+ }
+
Class businessRemoteHomeInterface = deploymentInfo.getBusinessRemoteInterface();
if (businessRemoteHomeInterface != null) {
for (Method method : DeploymentInfo.BusinessRemoteHome.class.getMethods()) {
@@ -317,7 +328,8 @@ public class StatefulContainer implement
// Invoke create for legacy beans
if (!callMethod.getDeclaringClass().equals(DeploymentInfo.BusinessLocalHome.class) &&
- !callMethod.getDeclaringClass().equals(DeploymentInfo.BusinessRemoteHome.class)){
+ !callMethod.getDeclaringClass().equals(DeploymentInfo.BusinessRemoteHome.class) &&
+ !callMethod.getDeclaringClass().equals(DeploymentInfo.BusinessLocalBeanHome.class)) {
// Setup for business invocation
Method createOrInit = deploymentInfo.getMatchingBeanMethod(callMethod);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java Thu May 6 16:45:02 2010
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.stateful;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
@@ -35,12 +36,22 @@ public class StatefulEjbHomeHandler exte
public Object createProxy(Object primaryKey) {
Object proxy = super.createProxy(primaryKey);
- EjbObjectProxyHandler handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(proxy);
+ EjbObjectProxyHandler handler = null;
- registerHandler(handler.getRegistryId(), handler);
+ try {
+ handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(proxy);
+ } catch (Exception e) {
+ // try getting the invocation handler from the localbean
+ try {
+ Field field = proxy.getClass().getDeclaredField("invocationHandler");
+ field.setAccessible(true);
+ handler = (EjbObjectProxyHandler) field.get(proxy);
+ } catch (Exception e1) {
+ }
+ }
+ registerHandler(handler.getRegistryId(), handler);
return proxy;
-
}
protected Object findX(Class interfce, Method method, Object[] args, Object proxy) throws Throwable {
Added: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=941800&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (added)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Thu May 6 16:45:02 2010
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.util.proxy;
+
+import org.apache.openejb.AppClassLoader;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Proxy;
+
+public class LocalBeanProxyFactory {
+
+ public static Object newProxyInstance(AppClassLoader cl, Class interfce, java.lang.reflect.InvocationHandler h) throws IllegalArgumentException {
+ try {
+ Class proxyCls = new LocalBeanProxyGeneratorImpl().createProxy(interfce, cl);
+ Constructor constructor = proxyCls.getConstructor(java.lang.reflect.InvocationHandler.class);
+ Object object = constructor.newInstance(h);
+ return object;
+ } catch (NoSuchMethodException e) {
+ throw new InternalError(e.toString());
+ } catch (InstantiationException e) {
+ throw new InternalError(e.toString());
+ } catch (IllegalAccessException e) {
+ throw new InternalError(e.toString());
+ } catch (InvocationTargetException e) {
+ throw new InternalError(e.toString());
+ }
+ }
+
+}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGenerator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGenerator.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGenerator.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGenerator.java Thu May 6 16:45:02 2010
@@ -1,7 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.openejb.util.proxy;
-public interface LocalBeanProxyGenerator {
- public byte[] generateProxy(Class<?> clsToProxy) throws ProxyGenerationException;
+import org.apache.openejb.AppClassLoader;
- public byte[] generateProxy(Class<?> clsToProxy, String targetClassName) throws ProxyGenerationException;
+public interface LocalBeanProxyGenerator {
+ public Class createProxy(Class<?> clsToProxy, AppClassLoader cl);
}
+
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java Thu May 6 16:45:02 2010
@@ -16,46 +16,56 @@
*/
package org.apache.openejb.util.proxy;
-import java.lang.reflect.Method;
+import org.apache.xbean.asm.*;
+import org.apache.openejb.AppClassLoader;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.FieldVisitor;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
+import java.lang.reflect.Method;
public class LocalBeanProxyGeneratorImpl implements LocalBeanProxyGenerator, Opcodes {
- private static Object nextUniqueNumberLock = new Object();
- private final static String proxyClassNamePrefix = "$LocalBeanProxy";
- private static long nextUniqueNumber = 0;
-
- private String generateProxyName() {
- long num;
- synchronized (nextUniqueNumberLock) {
- num = nextUniqueNumber++;
- }
-
- return proxyClassNamePrefix + num;
- }
+ public Class createProxy(Class<?> clsToProxy, AppClassLoader cl) {
+ String proxyName = generateProxyName(clsToProxy.getName());
+ return createProxy(clsToProxy, proxyName, cl);
+ }
+
+ private String generateProxyName(String clsName) {
+ return clsName + "$LocalBeanProxy";
+ }
+
+ private Class createProxy(Class<?> clsToProxy, String proxyName, AppClassLoader cl) {
+ String clsName = proxyName.replaceAll("\\.", "/");
+
+ if (cl.classDefined(proxyName)) {
+ try {
+ return cl.loadClass(proxyName);
+ } catch (Exception e) {
+ }
+ }
+
+ try {
+ byte[] proxyBytes = generateProxy(clsToProxy, clsName);
+ cl.addClass(proxyBytes, proxyName);
+ Class<?> proxy = cl.loadClass(proxyName);
+ return proxy;
+ } catch (ProxyGenerationException e) {
+ throw new InternalError(e.toString());
+ } catch (ClassNotFoundException e) {
+ throw new InternalError(e.toString());
+ }
+ }
- public byte[] generateProxy(Class<?> clsToProxy) throws ProxyGenerationException {
- String proxyName = generateProxyName();
- return generateProxy(clsToProxy, proxyName);
- }
-
- public byte[] generateProxy(Class<?> clsToProxy, String proxyName) throws ProxyGenerationException {
+ private byte[] generateProxy(Class<?> clsToProxy, String proxyName) throws ProxyGenerationException {
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
FieldVisitor fv;
MethodVisitor mv;
- String clsToOverride = clsToProxy.getCanonicalName().replace('.', '/');
+ String clsToOverride = clsToProxy.getName().replaceAll("\\.", "/");
+ String proxyClassName = proxyName.replaceAll("\\.", "/");
- // push class signature
- cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, proxyName, null, clsToOverride, null);
- cw.visitSource(proxyName + ".java", null);
+ // push class signature
+ cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, proxyClassName, null, clsToOverride, null);
+ cw.visitSource(clsToOverride + ".java", null);
// push InvocationHandler field
fv = cw.visitField(ACC_FINAL + ACC_PRIVATE, "invocationHandler", "Ljava/lang/reflect/InvocationHandler;", null, null);
@@ -76,7 +86,7 @@ public class LocalBeanProxyGeneratorImpl
// loop through public methods, and push something to the class
Method[] methods = clsToProxy.getDeclaredMethods();
for (Method method : methods) {
- processMethod(cw, method, proxyName);
+ processMethod(cw, method, proxyClassName, clsToOverride);
}
byte[] clsBytes = cw.toByteArray();
@@ -84,7 +94,7 @@ public class LocalBeanProxyGeneratorImpl
}
- private void processMethod(ClassWriter cw, Method method, String proxyName) throws ProxyGenerationException {
+ private void processMethod(ClassWriter cw, Method method, String proxyName, String clsToOverride) throws ProxyGenerationException {
if ("<init>".equals(method.getName())) {
return;
}
@@ -107,11 +117,11 @@ public class LocalBeanProxyGeneratorImpl
mv.visitTryCatchBlock(l0, l1, l2, "java/lang/reflect/InvocationTargetException");
}
- mv.visitTryCatchBlock(l0, l1, l3, "java/lang/Throwable");
+// mv.visitTryCatchBlock(l0, l1, l3, "java/lang/Throwable");
// push try code
mv.visitLabel(l0);
- mv.visitLdcInsn(Type.getType("L" + proxyName + ";"));
+ mv.visitLdcInsn(Type.getType("L" + clsToOverride + ";"));
// the following code generates the bytecode for this line of Java:
// Method method = <proxy>.class.getMethod("add", new Class[] { <array of function argument classes> });
@@ -262,19 +272,6 @@ public class LocalBeanProxyGeneratorImpl
}
}
- // wrap any other exceptions with an UndeclaredThrowableException
- mv.visitLabel(l3);
- mv.visitVarInsn(ASTORE, length);
- Label l8 = new Label();
- mv.visitLabel(l8);
- mv.visitTypeInsn(NEW, "java/lang/reflect/UndeclaredThrowableException");
- mv.visitInsn(DUP);
- mv.visitVarInsn(ALOAD, length);
- mv.visitMethodInsn(INVOKESPECIAL, "java/lang/reflect/UndeclaredThrowableException", "<init>", "(Ljava/lang/Throwable;)V");
- mv.visitInsn(ATHROW);
- Label l9 = new Label();
- mv.visitLabel(l9);
-
// finish this method
mv.visitMaxs(0, 0);
mv.visitEnd();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java Thu May 6 16:45:02 2010
@@ -27,11 +27,13 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.SessionBean;
import org.junit.Assert;
import org.junit.Test;
import javax.ejb.ApplicationException;
import javax.ejb.Local;
+import javax.ejb.LocalBean;
import javax.ejb.Stateless;
/**
@@ -106,6 +108,31 @@ public class AnnotationDeployerTest {
assert bean != null;
}
+ /**
+ * For https://issues.apache.org/jira/browse/OPENEJB-1188
+ * @throws Exception
+ */
+ @Test
+ public void testLocalBean() throws Exception {
+ EjbJar ejbJar = new EjbJar("test-classes");
+ EjbModule ejbModule = new EjbModule(ejbJar);
+ ejbModule.setJarLocation(null);
+
+ AppModule appModule = new AppModule(Thread.currentThread().getContextClassLoader(), "myapp");
+ appModule.getEjbModules().add(ejbModule);
+
+ AnnotationDeployer annotationDeployer = new AnnotationDeployer();
+ appModule = annotationDeployer.deploy(appModule);
+
+ EnterpriseBean bean = ejbJar.getEnterpriseBean("TestLocalBean");
+ assert bean != null;
+ assert (((SessionBean)bean).getLocalBean() != null);
+
+ bean = ejbJar.getEnterpriseBean("InterceptedSLSBean");
+ assert bean != null;
+ assert (((SessionBean)bean).getLocalBean() == null);
+ }
+
@ApplicationException(rollback = true)
public abstract class BusinessException extends Exception {
}
@@ -130,4 +157,12 @@ public class AnnotationDeployerTest {
}
}
+ @Stateless
+ @LocalBean
+ public static class TestLocalBean {
+ public String echo(String input) {
+ return input;
+ }
+ }
+
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java Thu May 6 16:45:02 2010
@@ -54,6 +54,12 @@ public class InvalidEjbRefTest extends T
fooBean.addBusinessLocal(FooLocal.class.getName());
fooBean.addBusinessRemote(FooRemote.class.getName());
+ StatelessBean fooImpl = ejbJar.addEnterpriseBean(new StatelessBean(FooImpl.class));
+ fooImpl.setHomeAndRemote(FooEJBHome.class, FooEJBObject.class);
+ fooImpl.setHomeAndLocal(FooEJBLocalHome.class, FooEJBLocalObject.class);
+ fooImpl.addBusinessLocal(FooLocal.class.getName());
+ fooImpl.addBusinessRemote(FooRemote.class.getName());
+
List<String> expectedKeys = new ArrayList<String>();
expectedKeys.add("ann.ejb.ejbObject");
expectedKeys.add("ann.ejb.ejbLocalObject");
@@ -76,7 +82,7 @@ public class InvalidEjbRefTest extends T
public static class EjbRefBean implements EjbRefBeanLocal {
- // invalid
+ // valid because fooBean will be a LocalBean (because it has no interfaces)
@EJB
private FooBean fooBean;
@@ -111,6 +117,11 @@ public class InvalidEjbRefTest extends T
// invalid
@EJB
private FooClass fooClass;
+
+
+ // invalid because we refer to the bean class, but this bean is not a LocalBeanm
+ @EJB
+ private FooImpl fooImpl;
}
public static interface EjbRefBeanLocal {
@@ -149,4 +160,7 @@ public class InvalidEjbRefTest extends T
public static class FooClass {
}
+
+ public static class FooImpl implements FooLocal {
+ }
}
\ No newline at end of file
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java Thu May 6 16:45:02 2010
@@ -23,6 +23,7 @@ import javax.ejb.SessionContext;
import java.util.List;
import java.util.Arrays;
import java.util.Stack;
+import java.util.ArrayList;
import org.apache.openejb.core.ivm.naming.InitContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
@@ -33,6 +34,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.SingletonSessionContainerInfo;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EmptyType;
/**
* @version $Revision$ $Date$
@@ -59,6 +61,22 @@ public class SingletonContainerTest exte
// Check the lifecycle of the bean
assertEquals(join("\n", expected), join("\n", lifecycle));
+ }{
+ WidgetBean.lifecycle.clear();
+
+ Object object = ctx.lookup("WidgetBeanLocalBean");
+
+ assertTrue("instanceof widget", object instanceof WidgetBean);
+
+ WidgetBean widget = (WidgetBean) object;
+
+ // Do a business method...
+ Stack<Lifecycle> lifecycle = widget.getLifecycle();
+ assertNotNull("lifecycle", lifecycle);
+ assertSame("lifecycle", lifecycle, WidgetBean.lifecycle);
+
+ // Check the lifecycle of the bean
+ assertEquals(Lifecycle.CONSTRUCTOR + "\n" + Lifecycle.BUSINESS_METHOD + "\n", join("\n", lifecycle));
}
{
@@ -102,6 +120,7 @@ public class SingletonContainerTest exte
bean.addBusinessRemote(RemoteWidget.class.getName());
bean.addPostConstruct("init");
bean.addPreDestroy("destroy");
+ bean.setLocalBean(new EmptyType());
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(bean);
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java?rev=941800&r1=941799&r2=941800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java Thu May 6 16:45:02 2010
@@ -25,12 +25,7 @@ import java.util.ArrayList;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.SessionContext;
+import javax.ejb.*;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
@@ -56,6 +51,15 @@ public class StatefulContainerTest exten
public void testBusinessLocalInterface() throws Exception {
testBusinessLocalInterface(expectedLifecycle);
}
+
+ public void testBusinessLocalBeanInterface() throws Exception {
+ List localbeanExpectedLifecycle = new ArrayList();
+ localbeanExpectedLifecycle.addAll(expectedLifecycle);
+ // can't avoid the extra constructor call
+ localbeanExpectedLifecycle.add(4, Lifecycle.CONSTRUCTOR);
+
+ testBusinessLocalBeanInterface(localbeanExpectedLifecycle);
+ }
public void testBusinessRemoteInterfaceInTx() throws Exception {
TransactionManager transactionManager = SystemInstance.get().getComponent(TransactionManager.class);
@@ -100,6 +104,40 @@ public class StatefulContainerTest exten
assertEquals(StatefulContainerTest.join("\n", expectedLifecycle) , join("\n", WidgetBean.lifecycle));
}
+ protected void testBusinessLocalBeanInterface(List expectedLifecycle) throws Exception {
+
+ // Do a create...
+
+ InitialContext ctx = new InitialContext();
+ Object object = ctx.lookup("WidgetBeanLocalBean");
+
+ assertTrue("instanceof widget", object instanceof WidgetBean);
+
+ WidgetBean widget = (WidgetBean) object;
+
+ // Do a business method...
+ Stack<Object> actual = widget.getLifecycle();
+ assertNotNull("lifecycle", actual);
+
+ // test app exception
+ try {
+ widget.throwAppException();
+ fail("Expected application exception");
+ } catch (SQLException e) {
+ assertEquals("test", e.getMessage());
+ }
+
+ // Do another business method...
+ widget.afterAppException();
+
+ // Do a remove...
+ widget.destroy();
+
+ // Check the lifecycle of the bean
+
+ assertEquals(StatefulContainerTest.join("\n", expectedLifecycle) , join("\n", WidgetBean.lifecycle));
+ }
+
public void testBusinessRemoteInterface() throws Exception {
testBusinessRemoteInterface(expectedLifecycle);
}
@@ -114,6 +152,21 @@ public class StatefulContainerTest exten
}
}
+ public void testBusinessLocalBeanInterfaceInTx() throws Exception {
+ List localbeanExpectedLifecycle = new ArrayList();
+ localbeanExpectedLifecycle.addAll(inTxExpectedLifecycle);
+ // can't avoid the extra constructor call
+ localbeanExpectedLifecycle.add(3, Lifecycle.CONSTRUCTOR);
+
+ TransactionManager transactionManager = SystemInstance.get().getComponent(TransactionManager.class);
+ transactionManager.begin();
+ try {
+ testBusinessLocalBeanInterface(localbeanExpectedLifecycle);
+ } finally {
+ transactionManager.commit();
+ }
+ }
+
protected void testBusinessRemoteInterface(List expectedLifecycle) throws Exception {
WidgetBean.lifecycle.clear();
@@ -226,6 +279,7 @@ public class StatefulContainerTest exten
POST_ACTIVATE4, REMOVE, PRE_DESTROY,
}
+ @LocalBean
public static class WidgetBean implements Widget, RemoteWidget {
private int activates = 0;
private int passivates = 0;