svn commit: r1295302 - in /openejb/trunk/openejb/tomee: apache-tomee/src/main/groovy/commands/SetupCommand.groovy tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed Feb 29 21:59:34 2012
New Revision: 1295302

URL: http://svn.apache.org/viewvc?rev=1295302&view=rev
Log:
trying to remove duplicated jars from tomee bundles

Modified:
    openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
    openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java

Modified: openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1295302&r1=1295301&r2=1295302&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy Wed Feb 29 21:59:34 2012
@@ -122,6 +122,13 @@ class SetupCommand {
 		Installer installer = new Installer(paths, true)
 		installer.installAll()
 
+        // clean up duplicate jars since in TomEE it is useless
+        // = gain of space ;)
+        ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/lib/openejb-javaagent-${openejbVersion}.jar")
+        ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/lib/tomee-loader-${openejbVersion}.jar")
+        ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/WEB-INF/lib/tomee-loader-${openejbVersion}.jar")
+        ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/WEB-INF/lib/swizzle-stream-1.6.1.jar")
+
 		log.info("Assigning execute privileges to scripts in Tomcat bin directory")
 		ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: "u+x", includes: "**/*.sh")
 

Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java?rev=1295302&r1=1295301&r2=1295302&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java Wed Feb 29 21:59:34 2012
@@ -226,19 +226,21 @@ public class OpenEJBListener implements 
     }
      
     private static File findOpenEjbWarInContext(File contextDir) {
-        // does this war have a web-inf lib dir
-        File webInfLib = new File(new File(contextDir, "WEB-INF"), "lib");
+        // this should be a webapp
+        if (!new File(contextDir, "WEB-INF").exists()) {
+            return null;
+        }
+
+        // this should be the openejb war...
+        // make sure it has a lib directory
+        File webInfLib = new File(contextDir, "lib");
         if (!webInfLib.isDirectory()) {
              return null;
         }
         // iterate over the libs looking for the openejb-loader-*.jar
         for (File file : webInfLib.listFiles()) {
-            if (file.getName().startsWith("tomee-loader-") && file.getName().endsWith(".jar")) {
-                // this should be the openejb war...
-                // make sure it has a lib directory
-                if (new File(contextDir, "lib").isDirectory()) {
-                    return contextDir;
-                }
+            if (file.getName().startsWith("tomee-catalina-") && file.getName().endsWith(".jar")) {
+                return contextDir;
             }
         }
         return null;