svn commit: r1336320 - in /openejb/trunk/openejb/tomee: apache-tomee/src/main/groovy/commands/SetupCommand.groovy tomee-common/src/main/java/org/apache/tomee/installer/Paths.java

[rmannibucau]

Author: rmannibucau
Date: Wed May  9 18:06:24 2012
New Revision: 1336320

URL: http://svn.apache.org/viewvc?rev=1336320&view=rev
Log:
removing openejb-javaagent duplicated jar in tomee

Modified:
    
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
    
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.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=1336320&r1=1336319&r2=1336320&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 May  9 18:06:24 2012
@@ -125,10 +125,10 @@ class SetupCommand {
 
         // clean up duplicate jars since in TomEE it is useless
         // = gain of space ;)
-        ant.delete(file: paths.getOpenEJBJavaagentJar())
         ant.delete(file: paths.getJAXBImpl())
         ant.delete(file: paths.getOpenEJBTomcatLoaderJar())
         ant.delete(file: paths.findTomEELibJar("jaxb-impl"))
+        ant.delete(file: 
paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar")) // we need 
the one without version
         ant.delete(file: paths.findOpenEJBWebJar("tomee-loader"))
         ant.delete(file: paths.findOpenEJBWebJar("swizzle-stream"))
 

Modified: 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java?rev=1336320&r1=1336319&r2=1336320&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
 Wed May  9 18:06:24 2012
@@ -262,7 +262,9 @@ public class Paths {
         final File[] files = dir.listFiles();
         if (files != null) {
             for (File file : files) {
-                if (file.getName().startsWith(namePrefix + "-") && 
file.getName().endsWith(".jar")) {
+                final String name = file.getName();
+                if ((name.startsWith(namePrefix + "-") && 
name.endsWith(".jar"))
+                        || name.equals(namePrefix)) {
                     return file;
                 }
             }