stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8061293: Update javax/xml tests to remove references of jre dir

Browse Source 
Reviewed-by: lancea, mkos
This commit is contained in:
Frank Yuan 2015-03-13 15:50:39 +03:00
parent 63923c6c41
commit 827d9d3928
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/test/javax/xml/ws/8033113/WsImportTest.java
View File

@ -140,9 +140,6 @@ public class WsImportTest {
private static String getWsImport() { private static String getWsImport() {
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
if (javaHome.endsWith("jre")) {
javaHome = new File(javaHome).getParent();
}
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport"; String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
wsimport = wsimport.concat(".exe"); wsimport = wsimport.concat(".exe");

3
jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java
View File

@ -86,9 +86,6 @@ public class GenerateEnumSchema {
private static String getSchemagen() { private static String getSchemagen() {
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
if (javaHome.endsWith("jre")) {
javaHome = new File(javaHome).getParent();
}
String schemagen = javaHome + File.separator + "bin" + File.separator + "schemagen"; String schemagen = javaHome + File.separator + "bin" + File.separator + "schemagen";
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
schemagen = schemagen.concat(".exe"); schemagen = schemagen.concat(".exe");

3
jdk/test/javax/xml/ws/clientjar/TestWsImport.java
View File

@ -55,9 +55,6 @@ public class TestWsImport {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
if (javaHome.endsWith("jre")) {
javaHome = new File(javaHome).getParent();
}
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport"; String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
wsimport = wsimport.concat(".exe"); wsimport = wsimport.concat(".exe");

3
jdk/test/javax/xml/ws/ebcdic/WsImportTest.java
View File

@ -133,9 +133,6 @@ public class WsImportTest {
private static String getWsImport() { private static String getWsImport() {
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
if (javaHome.endsWith("jre")) {
javaHome = new File(javaHome).getParent();
}
String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport"; String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
wsimport = wsimport.concat(".exe"); wsimport = wsimport.concat(".exe");