svn commit: r1333422 - 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: Thu May  3 12:22:33 2012
New Revision: 1333422

URL: http://svn.apache.org/viewvc?rev=1333422&view=rev
Log:
jaxb-impl was still duplicated in libs and endorsed dir

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=1333422&r1=1333421&r2=1333422&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
 Thu May  3 12:22:33 2012
@@ -125,9 +125,10 @@ class SetupCommand {
 
         // clean up duplicate jars since in TomEE it is useless
         // = gain of space ;)
-        ant.delete(file: paths.findOpenEJBJar("openejb-javaagent"))
-        ant.delete(file: paths.findOpenEJBJar("jaxb-impl"))
-        ant.delete(file: paths.findOpenEJBJar("tomee-loader"))
+        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.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=1333422&r1=1333421&r2=1333422&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
 Thu May  3 12:22:33 2012
@@ -251,6 +251,10 @@ public class Paths {
         return findJar(getOpenEJBWebLibDir(), namePrefix);
     }
 
+    public File findTomEELibJar(final String prefix) {
+        return findJar(getCatalinaLibDir(), prefix);
+    }
+
     private File findJar(File dir, String namePrefix) {
         if (dir == null) return null;