From 827d9d39285738e0dc35807dae3330ec657f2032 Mon Sep 17 00:00:00 2001
From: Frank Yuan <fyuan@openjdk.org>
Date: Fri, 13 Mar 2015 15:50:39 +0300
Subject: [PATCH] 8061293: Update javax/xml tests to remove references of jre
 dir

Reviewed-by: lancea, mkos
---
 jdk/test/javax/xml/ws/8033113/WsImportTest.java       | 3 ---
 jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java | 3 ---
 jdk/test/javax/xml/ws/clientjar/TestWsImport.java     | 3 ---
 jdk/test/javax/xml/ws/ebcdic/WsImportTest.java        | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/jdk/test/javax/xml/ws/8033113/WsImportTest.java b/jdk/test/javax/xml/ws/8033113/WsImportTest.java
index aa1cf860ab4..ac1b13e3949 100644
--- a/jdk/test/javax/xml/ws/8033113/WsImportTest.java
+++ b/jdk/test/javax/xml/ws/8033113/WsImportTest.java
@@ -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");
diff --git a/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java b/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java
index cb70d2247ae..1edd3c23907 100644
--- a/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java
+++ b/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java
@@ -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");
diff --git a/jdk/test/javax/xml/ws/clientjar/TestWsImport.java b/jdk/test/javax/xml/ws/clientjar/TestWsImport.java
index 422f4f5f045..dadceb34295 100644
--- a/jdk/test/javax/xml/ws/clientjar/TestWsImport.java
+++ b/jdk/test/javax/xml/ws/clientjar/TestWsImport.java
@@ -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");
diff --git a/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java b/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java
index 7977cf98730..21a9fd874cc 100644
--- a/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java
+++ b/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java
@@ -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");