Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8061293: Update javax/xml tests to remove references of jre dir
authorfyuan
Fri, 13 Mar 2015 15:50:39 +0300
changeset 29483 eb59a7c15e95
parent 29433 c97e2d1bad97
child 29484 066390a3907d
8061293: Update javax/xml tests to remove references of jre dir Reviewed-by: lancea, mkos
jdk/test/javax/xml/ws/8033113/WsImportTest.java file | annotate | diff | comparison | revisions
jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java file | annotate | diff | comparison | revisions
jdk/test/javax/xml/ws/clientjar/TestWsImport.java file | annotate | diff | comparison | revisions
jdk/test/javax/xml/ws/ebcdic/WsImportTest.java file | annotate | diff | comparison | revisions 
--- a/jdk/test/javax/xml/ws/8033113/WsImportTest.java	Wed Jul 05 20:24:25 2017 +0200
+++ b/jdk/test/javax/xml/ws/8033113/WsImportTest.java	Fri Mar 13 15:50:39 2015 +0300
@@ -140,9 +140,6 @@
 
     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");
--- a/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java	Wed Jul 05 20:24:25 2017 +0200
+++ b/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java	Fri Mar 13 15:50:39 2015 +0300
@@ -86,9 +86,6 @@
 
     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");
--- a/jdk/test/javax/xml/ws/clientjar/TestWsImport.java	Wed Jul 05 20:24:25 2017 +0200
+++ b/jdk/test/javax/xml/ws/clientjar/TestWsImport.java	Fri Mar 13 15:50:39 2015 +0300
@@ -55,9 +55,6 @@
     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");
--- a/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java	Wed Jul 05 20:24:25 2017 +0200
+++ b/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java	Fri Mar 13 15:50:39 2015 +0300
@@ -133,9 +133,6 @@
 
     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");
jdk-sandbox