Author: rmannibucau
Date: Wed Oct 3 07:10:12 2012
New Revision: 1393320
URL: http://svn.apache.org/viewvc?rev=1393320&view=rev
Log:
TOMEE-444 looking in tomee.war/lib if tomee/lib doesn't contain the searched
lib (used for webapp classloader enrichment)
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
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=1393320&r1=1393319&r2=1393320&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 Oct 3 07:10:12 2012
@@ -259,7 +259,14 @@ public class Paths {
}
public File findTomEELibJar(final String prefix) {
- return findJar(getCatalinaLibDir(), prefix);
+ final File jar = findJar(getCatalinaLibDir(), prefix);
+ if (jar == null) { // maybe tomcat/openejb integration
+ final String tomeeWar = System.getProperty("tomee.war");
+ if (tomeeWar != null) {
+ return findJar(new File(tomeeWar, "lib"), prefix);
+ }
+ }
+ return jar;
}
private File findJar(File dir, String namePrefix) {
