Author: rmannibucau
Date: Wed Sep 19 14:32:20 2012
New Revision: 1387614
URL: http://svn.apache.org/viewvc?rev=1387614&view=rev
Log:
TOMEE-420 classloaderenricher feature
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AdditionalLibClassLoaderEnricherObserver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/ClassLoaderEnricher.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AdditionalLibClassLoaderEnricherObserver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AdditionalLibClassLoaderEnricherObserver.java?rev=1387614&view=auto
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AdditionalLibClassLoaderEnricherObserver.java
(added)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AdditionalLibClassLoaderEnricherObserver.java
Wed Sep 19 14:32:20 2012
@@ -0,0 +1,51 @@
+package org.apache.openejb.assembler.classic;
+
+import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.component.ClassLoaderEnricher;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.observer.Observes;
+import org.apache.openejb.observer.event.ObserverAdded;
+
+import java.io.File;
+import java.net.MalformedURLException;
+
+public class AdditionalLibClassLoaderEnricherObserver {
+ public static final String OPENEJB_ENRICHER_ADDITIONAL_LIB =
"openejb.enricher.additional-lib";
+
+ private static boolean initDone = false;
+
+ private String path = "additional-lib";
+
+ public void initEnricher(@Observes final ObserverAdded event) {
+ if (initDone || path == null ||
!AdditionalLibClassLoaderEnricherObserver.class.isInstance(event.getObserver()))
{
+ return;
+ }
+
+ File dir = new File(path);
+ if (!dir.exists()) {
+ final String systProp =
SystemInstance.get().getProperty(OPENEJB_ENRICHER_ADDITIONAL_LIB, (String)
null);
+ if (systProp != null) {
+ dir = new File(systProp);
+ }
+ }
+ if (dir.exists()) {
+ final File[] libs = dir.listFiles();
+ if (libs != null) {
+ final ClassLoaderEnricher enricher =
SystemInstance.get().getComponent(ClassLoaderEnricher.class);
+ for (File lib : libs) {
+ try {
+ enricher.addUrl(lib.toURI().toURL());
+ } catch (MalformedURLException e) {
+ throw new OpenEJBRuntimeException(e);
+ }
+ }
+ }
+ }
+
+ initDone = true;
+ }
+
+ public void setPath(final String path) {
+ this.path = path;
+ }
+}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1387614&r1=1387613&r2=1387614&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Wed Sep 19 14:32:20 2012
@@ -51,6 +51,7 @@ import org.apache.openejb.cdi.CustomELAd
import org.apache.openejb.cdi.ManagedSecurityService;
import org.apache.openejb.cdi.OpenEJBTransactionService;
import org.apache.openejb.cdi.OptimizedLoaderService;
+import org.apache.openejb.component.ClassLoaderEnricher;
import org.apache.openejb.core.ConnectorReference;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.CoreUserTransaction;
@@ -1437,6 +1438,7 @@ public class Assembler extends Assembler
logger.warning("can't find open-jpa-integration jar");
}
}
+
jars.addAll(Arrays.asList(SystemInstance.get().getComponent(ClassLoaderEnricher.class).applicationEnrichment()));
// Create the class loader
final ParentClassLoaderFinder parentFinder =
SystemInstance.get().getComponent(ParentClassLoaderFinder.class);
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/ClassLoaderEnricher.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/ClassLoaderEnricher.java?rev=1387614&view=auto
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/ClassLoaderEnricher.java
(added)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/component/ClassLoaderEnricher.java
Wed Sep 19 14:32:20 2012
@@ -0,0 +1,38 @@
+/*
+ * 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.component;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class ClassLoaderEnricher {
+ // files used for war or lib part of ear
+ private final Collection<URL> applicationURLs = new
CopyOnWriteArrayList<URL>();
+
+ public URL[] applicationEnrichment() {
+ return applicationURLs.toArray(new URL[applicationURLs.size()]);
+ }
+
+ public void addUrl(final URL url) {
+ applicationURLs.add(url);
+ }
+
+ public void removeUrl(final URL url) {
+ applicationURLs.remove(url);
+ }
+}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1387614&r1=1387613&r2=1387614&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Wed Sep 19 14:32:20 2012
@@ -66,6 +66,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.WebAppInfo;
+import org.apache.openejb.component.ClassLoaderEnricher;
import org.apache.openejb.config.sys.AbstractService;
import org.apache.openejb.config.sys.AdditionalDeployments;
import org.apache.openejb.config.sys.ConnectionManager;
@@ -148,7 +149,7 @@ public class ConfigurationFactory implem
final Options options = SystemInstance.get().getOptions();
if (SystemInstance.get().getComponent(DataSourceCreator.class) ==
null) {
- final String creator =
SystemInstance.get().getOptions().get(OPENEJB_JDBC_DATASOURCE_CREATOR, (String)
null);
+ final String creator =
options.get(OPENEJB_JDBC_DATASOURCE_CREATOR, (String) null);
if (creator == null) {
SystemInstance.get().setComponent(DataSourceCreator.class, new
DefaultDataSourceCreator());
} else {
@@ -160,6 +161,9 @@ public class ConfigurationFactory implem
}
}
}
+ if (SystemInstance.get().getComponent(ClassLoaderEnricher.class) ==
null) {
+ SystemInstance.get().setComponent(ClassLoaderEnricher.class, new
ClassLoaderEnricher());
+ }
// annotation deployer encapsulate some logic, to be able to push to
it some config
// we give the ability here to get the internal deployer to push the
config values
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java?rev=1387614&r1=1387613&r2=1387614&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
Wed Sep 19 14:32:20 2012
@@ -18,7 +18,7 @@ package org.apache.tomee.catalina;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.classloader.WebAppEnricher;
-import org.apache.openejb.loader.IO;
+import org.apache.openejb.component.ClassLoaderEnricher;
import org.apache.openejb.loader.JarLocation;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -34,6 +34,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -87,7 +88,7 @@ public final class TomEEClassLoaderEnric
@Override
public URL[] enrichment(final ClassLoader appCl) {
- final Collection<URL> urls = new ArrayList<URL>();
+ final Collection<URL> urls = new HashSet<URL>();
// from class
final ClassLoader cl =
TomEEClassLoaderEnricher.class.getClassLoader(); // reference classloader =
standardclassloader
@@ -157,6 +158,9 @@ public final class TomEEClassLoaderEnric
}
}
+ // from config
+
urls.addAll(Arrays.asList(SystemInstance.get().getComponent(ClassLoaderEnricher.class).applicationEnrichment()));
+
return urls.toArray(new URL[urls.size()]);
}
