svn commit: r1482691 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed May 15 06:30:43 2013
New Revision: 1482691

URL: http://svn.apache.org/r1482691
Log:
TOMEE-936 adding in ear lib part jsf enrichments too to ensure jsf impl can be in ear libs

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1482691&r1=1482690&r2=1482691&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Wed May 15 06:30:43 2013
@@ -29,6 +29,7 @@ import org.apache.openejb.assembler.WebA
 import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
 import org.apache.openejb.assembler.classic.WebAppBuilder;
 import org.apache.openejb.classloader.WebAppEnricher;
+import org.apache.openejb.component.ClassLoaderEnricher;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.config.NewLoaderLogic;
 import org.apache.openejb.config.sys.Tomee;
@@ -55,6 +56,7 @@ import org.apache.tomee.loader.TomcatHel
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -219,8 +221,15 @@ public class TomcatLoader implements Loa
         SystemInstance.get().setComponent(WebDeploymentListeners.class, new WebDeploymentListeners());
 
         // tomee webapp enricher
-        SystemInstance.get().setComponent(WebAppEnricher.class, new TomEEClassLoaderEnricher());
+        final TomEEClassLoaderEnricher classLoaderEnricher = new TomEEClassLoaderEnricher();
+        SystemInstance.get().setComponent(WebAppEnricher.class, classLoaderEnricher);
 
+        // add common lib even in ear "lib" part (if the ear provides myfaces for instance)
+        for (final URL url : classLoaderEnricher.enrichment(null)) { // we rely on the fact we know what the impl does with null but that's fine
+            SystemInstance.get().getComponent(ClassLoaderEnricher.class).addUrl(url);
+        }
+
+        // optional services
         if (optionalService(properties, "org.apache.tomee.webservices.TomeeJaxRsService")) {
             // in embedded mode we use regex, in tomcat we use tomcat servlet mapping
             SystemInstance.get().setProperty("openejb.rest.wildcard", "*");