Author: rmannibucau
Date: Wed Sep 19 14:35:59 2012
New Revision: 1387621
URL: http://svn.apache.org/viewvc?rev=1387621&view=rev
Log:
TOMEE-420 (from trunk) classloader enricher
Modified:
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
Modified:
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1387621&r1=1387620&r2=1387621&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Wed Sep 19 14:35:59 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);
Modified:
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1387621&r1=1387620&r2=1387621&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/branches/openejb-4.1.0/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Wed Sep 19 14:35:59 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/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java?rev=1387621&r1=1387620&r2=1387621&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
(original)
+++
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
Wed Sep 19 14:35:59 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()]);
}
