Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2036: Check JAVA_HOME for lib/tools.jar for all java vendors, not just IBM. 

Submitted By: Jason Pyeron

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1151885 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2011-07-28 15:03:04 +00:00
parent 868035a540
commit 4412599698
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
View File

@ -191,7 +191,6 @@ public class InstrumentationFactory {
if (log.isTraceEnabled() == true) { if (log.isTraceEnabled() == true) {
log.trace(_name + ".findToolsJar() -- couldn't find default " + toolsJarFile.getAbsolutePath()); log.trace(_name + ".findToolsJar() -- couldn't find default " + toolsJarFile.getAbsolutePath());
} }
if (JavaVendors.getCurrentVendor().isIBM()) {
// If we're on an IBM SDK, then remove /jre off of java.home and try again. // If we're on an IBM SDK, then remove /jre off of java.home and try again.
if (javaHomeFile.getAbsolutePath().endsWith(File.separator + "jre") == true) { if (javaHomeFile.getAbsolutePath().endsWith(File.separator + "jre") == true) {
javaHomeFile = javaHomeFile.getParentFile(); javaHomeFile = javaHomeFile.getParentFile();
@ -202,7 +201,6 @@ public class InstrumentationFactory {
toolsJarFile.getAbsolutePath()); toolsJarFile.getAbsolutePath());
} }
} }
}
} else if (System.getProperty("os.name").toLowerCase().indexOf("mac") >= 0) { } else if (System.getProperty("os.name").toLowerCase().indexOf("mac") >= 0) {
// If we're on a Mac, then change the search path to use ../Classes/classes.jar. // If we're on a Mac, then change the search path to use ../Classes/classes.jar.
if (javaHomeFile.getAbsolutePath().endsWith(File.separator + "Home") == true) { if (javaHomeFile.getAbsolutePath().endsWith(File.separator + "Home") == true) {