svn commit: r1363558 - in /openejb/trunk/openejb: container/openejb-jsf/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jul 19 21:34:14 2012
New Revision: 1363558

URL: http://svn.apache.org/viewvc?rev=1363558&view=rev
Log:
OPENEJB-1874 openejb-jsf shouldnt be needed now

Removed:
    openejb/trunk/openejb/container/openejb-jsf/
Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java
    
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java?rev=1363558&r1=1363557&r2=1363558&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderHelper.java
 Thu Jul 19 21:34:14 2012
@@ -50,8 +50,7 @@ public final class TomEEClassLoaderHelpe
     public static final String TOMEE_WEBAPP_CLASSLOADER_ENRICHMENT_PREFIXES = 
"tomee.webapp.classloader.enrichment.prefixes";
 
     private static final String[] 
DEFAULT_CLASSES_WHICH_CAN_BE_LOADED_FROM_APP_ONLY = new String[] {
-            // openejb-jsf and openwebbeans-jsf to be able to embedded the jsf 
impl keeping CDI features
-            "org.apache.openejb.jsf.CustomApplicationFactory",
+            // openwebbeans-jsf to be able to embedded the jsf impl keeping 
CDI features
             "org.apache.webbeans.jsf.OwbApplicationFactory"
     };
     private static final String[] JAR_TO_ADD_CLASS_HELPERS;

Modified: 
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java?rev=1363558&r1=1363557&r2=1363558&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java
 Thu Jul 19 21:34:14 2012
@@ -72,7 +72,6 @@ public class EmbeddedJarScanner implemen
             // is really slow.
 
 //            excluded = excluded.exclude(".*myfaces-impl-.*");
-//            excluded = excluded.exclude(".*openejb-jsf-.*");
 
             final UrlSet scan = classpath.exclude(excluded);