changeset 11604:07725f2302ac

8061293: Update javax/xml tests to remove references of jre dir Reviewed-by: lancea, mkos
author fyuan
date Fri, 13 Mar 2015 15:50:39 +0300
parents d49e247dade6
children a5d7d7d2d888
files test/javax/xml/ws/8033113/WsImportTest.java test/javax/xml/ws/8046817/GenerateEnumSchema.java test/javax/xml/ws/clientjar/TestWsImport.java test/javax/xml/ws/ebcdic/WsImportTest.java
diffstat 4 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/test/javax/xml/ws/8033113/WsImportTest.java	Thu Mar 12 21:15:18 2015 -0700
+++ b/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/test/javax/xml/ws/8046817/GenerateEnumSchema.java	Thu Mar 12 21:15:18 2015 -0700
+++ b/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/test/javax/xml/ws/clientjar/TestWsImport.java	Thu Mar 12 21:15:18 2015 -0700
+++ b/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/test/javax/xml/ws/ebcdic/WsImportTest.java	Thu Mar 12 21:15:18 2015 -0700
+++ b/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");