svn commit: r1613707 [3/3] - in /tomee/tomee/trunk: container/openejb-core/src/main/resources/ tck/cdi-tomee/src/test/resources/ tomee/tomee-catalina/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ tomee/tomee-catalina/src/main/java/org/...

[rmannibucau]

Modified: 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 Sat Jul 26 19:06:37 2014
@@ -224,7 +224,7 @@ public class Installer implements Instal
         }
 
         final String newIndeJsp = indeJsp.replaceFirst("<div id=\"actions\">",
-                "<div id=\\\"actions\\\">\r\n" +
+                "<div id=\"actions\">\n" +
                         "                    <div class=\"button\">\n" +
                         "                        <a class=\"container shadow\" 
href=\"/tomee\"><span>TomEE Gui</span></a>\n" +
                         "                    </div>");

Modified: 
tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
 Sat Jul 26 19:06:37 2014
@@ -45,7 +45,7 @@ public class TomEEJarScanner extends Sta
     }
 
     private static class TomEEFilter implements JarScanFilter {
-        private static final Filter INCLUDE = 
Filters.tokens("openejb-jstl-1.2", "myfaces-impl", "javax.faces-2.", 
"spring-security-taglibs", "spring-webmvc");
+        private static final Filter INCLUDE = Filters.tokens("javax.faces-2.", 
"spring-security-taglibs", "spring-webmvc");
         private final JarScanFilter delegate;
 
         public TomEEFilter(final JarScanFilter jarScanFilter) {
@@ -54,8 +54,18 @@ public class TomEEJarScanner extends Sta
 
         @Override
         public boolean check(final JarScanType jarScanType, final String 
jarName) {
-            return INCLUDE.accept(jarName)
-                || (!NewLoaderLogic.skip(jarName) && (delegate == null || 
delegate.check(jarScanType, jarName)));
+            if (jarScanType == JarScanType.TLD) {
+                if (INCLUDE.accept(jarName)) {
+                    return true;
+                }
+                if (jarName.startsWith("tomcat-websocket")) {
+                    return false;
+                }
+            }
+            if (jarName.startsWith("fleece-")) {
+                return false; // but we scan it in openejb scnaning
+            }
+            return !NewLoaderLogic.skip(jarName) && (delegate == null || 
delegate.check(jarScanType, jarName));
         }
     }
 }