You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/29 23:19:51 UTC
svn commit: r1295319 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/config/
tomee/apache-tomee/src/main/groovy/commands/
tomee/tomee-common/src/main/java/org/apache/tomee/installer/
Author: rmannibucau
Date: Wed Feb 29 22:19:51 2012
New Revision: 1295319
URL: http://svn.apache.org/viewvc?rev=1295319&view=rev
Log:
trying to remove duplicated jars from tomee bundles
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
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/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1295319&r1=1295318&r2=1295319&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Wed Feb 29 22:19:51 2012
@@ -133,6 +133,12 @@ public class RemoteServer {
javaagentJar = file;
}
}
+ if (javaagentJar == null) {
+ javaagentJar = new File(home, "lib/openejb-javaagent.jar");
+ if (!javaagentJar.exists()) {
+ javaagentJar = null;
+ }
+ }
if (openejbJar == null){
throw new IllegalStateException("Cannot find the openejb-core jar in "+lib.getAbsolutePath());
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=1295319&r1=1295318&r2=1295319&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 22:19:51 2012
@@ -124,10 +124,11 @@ class SetupCommand {
// 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")
+ 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.findOpenEJBWebJar("tomee-loader"))
+ ant.delete(file: paths.findOpenEJBWebJar("swizzle-stream"))
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-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=1295319&r1=1295318&r2=1295319&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 Feb 29 22:19:51 2012
@@ -52,6 +52,8 @@ public class Paths {
*/
private File serverXmlFile;
+ private File openEJBWebLibDir;
+
public Paths(File openejbWarDir) {
this.openejbWarDir = openejbWarDir;
}
@@ -241,12 +243,19 @@ public class Paths {
return findOpenEJBJar("tomee-common");
}
- private File findOpenEJBJar(String namePrefix) {
- File openEJBLibDir = getOpenEJBLibDir();
- if (openEJBLibDir == null) return null;
+ public File findOpenEJBJar(String namePrefix) {
+ return findJar(getOpenEJBLibDir(), namePrefix);
+ }
+
+ public File findOpenEJBWebJar(String namePrefix) {
+ return findJar(getOpenEJBWebLibDir(), namePrefix);
+ }
+
+ private File findJar(File dir, String namePrefix) {
+ if (dir == null) return null;
File openejbLoaderJar = null;
- for (File file : openEJBLibDir.listFiles()) {
+ for (File file : dir.listFiles()) {
if (file.getName().startsWith(namePrefix + "-") && file.getName().endsWith(".jar")) {
return file;
}
@@ -254,6 +263,7 @@ public class Paths {
return openejbLoaderJar;
}
+
/**Verifies the following:
* <ul>
* <li>{@link #openejbWarDir} is unpacked</li>
@@ -419,4 +429,11 @@ public class Paths {
}
return null;
}
+
+ public File getOpenEJBWebLibDir() {
+ if (openEJBWebLibDir == null) {
+ openEJBWebLibDir = new File(openejbWarDir, "WEB-INF/lib");
+ }
+ return openEJBWebLibDir;
+ }
}