Author: rmannibucau Date: Sun Mar 31 20:04:26 2013 New Revision: 1463043 URL: http://svn.apache.org/r1463043 Log: TOMEE-877 using tccl as parent loader for embedded EJBContainer
Added: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ProvidedClassLoaderFinder.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1463043&r1=1463042&r2=1463043&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Sun Mar 31 20:04:26 2013 @@ -28,6 +28,8 @@ import org.apache.openejb.config.NewLoad import org.apache.openejb.config.PersistenceModule; import org.apache.openejb.config.ValidationFailedException; import org.apache.openejb.core.Operation; +import org.apache.openejb.core.ParentClassLoaderFinder; +import org.apache.openejb.core.ProvidedClassLoaderFinder; import org.apache.openejb.core.ThreadContext; import org.apache.openejb.jee.Application; import org.apache.openejb.jee.Beans; @@ -327,6 +329,14 @@ public class OpenEjbContainer extends EJ SystemInstance.get().setProperty("openejb.embedded", "true"); SystemInstance.get().setProperty(EJBContainer.class.getName(), "true"); + if (SystemInstance.get().getComponent(ParentClassLoaderFinder.class) == null) { + ClassLoader tccl = Thread.currentThread().getContextClassLoader(); + if (tccl == null) { + tccl = OpenEjbContainer.class.getClassLoader(); + } + SystemInstance.get().setComponent(ParentClassLoaderFinder.class, new ProvidedClassLoaderFinder(tccl)); + } + OptionsLog.install(); OpenEJB.init(properties); Added: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ProvidedClassLoaderFinder.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ProvidedClassLoaderFinder.java?rev=1463043&view=auto ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ProvidedClassLoaderFinder.java (added) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ProvidedClassLoaderFinder.java Sun Mar 31 20:04:26 2013 @@ -0,0 +1,30 @@ +/** + * 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; + +public class ProvidedClassLoaderFinder implements ParentClassLoaderFinder { + private final ClassLoader loader; + + public ProvidedClassLoaderFinder(final ClassLoader tccl) { + loader = tccl; + } + + @Override + public ClassLoader getParentClassLoader(final ClassLoader fallback) { + return loader; + } +}