8061293: Update javax/xml tests to remove references of jre dir
Reviewed-by: lancea, mkos
This commit is contained in:
parent
63923c6c41
commit
827d9d3928
@ -140,9 +140,6 @@ public class WsImportTest {
|
||||
|
||||
private static String getWsImport() {
|
||||
String javaHome = System.getProperty("java.home");
|
||||
if (javaHome.endsWith("jre")) {
|
||||
javaHome = new File(javaHome).getParent();
|
||||
}
|
||||
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
|
||||
if (System.getProperty("os.name").startsWith("Windows")) {
|
||||
wsimport = wsimport.concat(".exe");
|
||||
|
@ -86,9 +86,6 @@ public class GenerateEnumSchema {
|
||||
|
||||
private static String getSchemagen() {
|
||||
String javaHome = System.getProperty("java.home");
|
||||
if (javaHome.endsWith("jre")) {
|
||||
javaHome = new File(javaHome).getParent();
|
||||
}
|
||||
String schemagen = javaHome + File.separator + "bin" + File.separator + "schemagen";
|
||||
if (System.getProperty("os.name").startsWith("Windows")) {
|
||||
schemagen = schemagen.concat(".exe");
|
||||
|
@ -55,9 +55,6 @@ public class TestWsImport {
|
||||
public static void main(String[] args) throws IOException {
|
||||
|
||||
String javaHome = System.getProperty("java.home");
|
||||
if (javaHome.endsWith("jre")) {
|
||||
javaHome = new File(javaHome).getParent();
|
||||
}
|
||||
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
|
||||
if (System.getProperty("os.name").startsWith("Windows")) {
|
||||
wsimport = wsimport.concat(".exe");
|
||||
|
@ -133,9 +133,6 @@ public class WsImportTest {
|
||||
|
||||
private static String getWsImport() {
|
||||
String javaHome = System.getProperty("java.home");
|
||||
if (javaHome.endsWith("jre")) {
|
||||
javaHome = new File(javaHome).getParent();
|
||||
}
|
||||
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
|
||||
if (System.getProperty("os.name").startsWith("Windows")) {
|
||||
wsimport = wsimport.concat(".exe");
|
||||
|
Loading…
x
Reference in New Issue
Block a user