--- a/jdk/test/com/sun/jdi/SimulResumerTest.java Tue Apr 08 11:57:57 2014 -0400
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java Tue Apr 08 13:16:22 2014 -0400
@@ -177,12 +177,18 @@
List<StackFrame> frames = thr.frames();
// no failure return value here; could cause an NPE
+ kind = "frames(0, size - 1)";
+ System.out.println("kind = " + kind);
int nframes = frames.size();
- if (nframes > 0) {
- // hmm, how could it ever be 0?
- kind = "frames(0, size - 1)";
- System.out.println("kind = " + kind);
- thr.frames(0, frames.size() - 1);
+ while (nframes > 0) {
+ try {
+ thr.frames(0, nframes - 1);
+ break;
+ } catch (IndexOutOfBoundsException iobe) {
+ // 6815126. let's try to get less frames
+ iobe.printStackTrace();
+ nframes--;
+ }
}
kind = "frameCount()";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/xml/ws/8033113/Organization_List.wsdl Tue Apr 08 13:16:22 2014 -0400
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="urn:Organization_List" xmlns:s0="urn:Organization_List" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <xsd:schema elementFormDefault="qualified" targetNamespace="urn:Organization_List">
+ <xsd:element name="OpGetList" type="s0:GetListInputMap"/>
+ <xsd:complexType name="GetListInputMap">
+ <xsd:sequence>
+ <xsd:element name="Qualification" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="OpGetListResponse" type="s0:GetListOutputMap"/>
+ <xsd:complexType name="GetListOutputMap">
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" name="getListValues">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="Organization_Name" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="AuthenticationInfo" type="s0:AuthenticationInfo"/>
+ <xsd:complexType name="AuthenticationInfo">
+ <xsd:sequence>
+ <xsd:element name="userName" type="xsd:string"/>
+ <xsd:element name="password" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="authentication" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="locale" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="timeZone" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="ARAuthenticate">
+ <wsdl:part element="s0:AuthenticationInfo" name="param"/>
+ </wsdl:message>
+
+ <wsdl:message name="OpGetListSoapIn">
+ <wsdl:part element="s0:OpGetList" name="param"/>
+ </wsdl:message>
+
+ <wsdl:message name="OpGetListSoapOut">
+ <wsdl:part element="s0:OpGetListResponse" name="param"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Organization_ListPortType">
+ <wsdl:operation name="OpGetList">
+ <wsdl:input message="s0:OpGetListSoapIn"/>
+ <wsdl:output message="s0:OpGetListSoapOut"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="Organization_ListSoapBinding" type="s0:Organization_ListPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="OpGetList">
+ <soap:operation soapAction="urn:Organization_List/OpGetList" style="document"/>
+ <wsdl:input>
+ <soap:header message="s0:ARAuthenticate" part="param" use="literal">
+ </soap:header>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="Organization_ListService">
+ <wsdl:port binding="s0:Organization_ListSoapBinding" name="Organization_ListSoap">
+ <soap:address location="http://bogus:9080/URL"/>
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/xml/ws/8033113/WsImportTest.java Tue Apr 08 13:16:22 2014 -0400
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8033113
+ * @summary wsimport fails on WSDL:header parameter name customization
+ * @run main/othervm WsImportTest
+ */
+
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+import static java.nio.file.FileVisitResult.*;
+
+public class WsImportTest {
+
+ public static void main(String[] args) throws IOException {
+
+ String wsimport = getWsImport();
+ String customization = getWSDLFilePath("customization.xml");
+ String wsdl = getWSDLFilePath("Organization_List.wsdl");
+
+ try {
+ log("Importing wsdl: " + wsdl);
+ String[] wsargs = {
+ wsimport,
+ "-keep",
+ "-verbose",
+ "-extension",
+ "-XadditionalHeaders",
+ "-Xdebug",
+ "-b",
+ customization,
+ wsdl
+ };
+
+ ProcessBuilder pb = new ProcessBuilder(wsargs);
+ pb.redirectErrorStream(true);
+ Process p = pb.start();
+ logOutput(p);
+ int result = p.waitFor();
+ p.destroy();
+
+ if (result != 0) {
+ fail("WsImport failed. TEST FAILED.");
+ } else {
+ log("Test PASSED.");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ } finally {
+ deleteGeneratedFiles();
+ }
+ }
+
+ private static void fail(String message) {
+ throw new RuntimeException(message);
+ }
+
+ private static void log(String msg) {
+ System.out.println(msg);
+ }
+
+ private static void logOutput(Process p) throws IOException {
+ BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String s = r.readLine();
+ while (s != null) {
+ log(s.trim());
+ s = r.readLine();
+ }
+ }
+
+ private static void deleteGeneratedFiles() {
+ Path p = Paths.get("generated");
+ if (Files.exists(p)) {
+ try {
+ Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attrs) throws IOException {
+
+ Files.delete(file);
+ return CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir,
+ IOException exc) throws IOException {
+
+ if (exc == null) {
+ Files.delete(dir);
+ return CONTINUE;
+ } else {
+ throw exc;
+ }
+ }
+ });
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+ }
+
+ private static String getWSDLFilePath(String filename) {
+ String testSrc = System.getProperty("test.src");
+ if (testSrc == null) testSrc = ".";
+ return Paths.get(testSrc).resolve(filename).toString();
+ }
+
+ 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");
+ }
+ return wsimport;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/xml/ws/8033113/customization.xml Tue Apr 08 13:16:22 2014 -0400
@@ -0,0 +1,23 @@
+<jaxws:bindings wsdlLocation="./Organization_List.wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+ <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
+ <jaxws:bindings node="wsdl:definitions/wsdl:binding[@name='Organization_ListSoapBinding']/wsdl:operation[@name='OpGetList']">
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='ARAuthenticate']/wsdl:part[@name='param']" name="authParam"/>
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='OpGetListSoapIn']/wsdl:part[@name='param']" name="inParam"/>
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='OpGetListSoapOut']/wsdl:part[@name='param']" name="outParam"/>
+ </jaxws:bindings>
+</jaxws:bindings>
+
+<!--wsdl:message definitions from WSDL whose part names we are trying to override...
+
+ <wsdl:message name="ARAuthenticate">
+ <wsdl:part element="s0:AuthenticationInfo" name="param"/>
+ </wsdl:message>
+
+ <wsdl:message name="OpGetListSoapIn">
+ <wsdl:part element="s0:OpGetList" name="param"/>
+ </wsdl:message>
+
+ <wsdl:message name="OpGetListSoapOut">
+ <wsdl:part element="s0:OpGetListResponse" name="param"/>
+ </wsdl:message>
+-->
--- a/jdk/test/sun/tools/jstatd/JstatdTest.java Tue Apr 08 11:57:57 2014 -0400
+++ b/jdk/test/sun/tools/jstatd/JstatdTest.java Tue Apr 08 13:16:22 2014 -0400
@@ -27,6 +27,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.Arrays;
+import java.util.regex.Pattern;
import static jdk.testlibrary.Asserts.*;
import jdk.testlibrary.JDKToolLauncher;
@@ -34,6 +35,7 @@
import jdk.testlibrary.ProcessThread;
import jdk.testlibrary.TestThread;
import jdk.testlibrary.Utils;
+import jdk.testlibrary.ProcessTools;
/**
* The base class for tests of jstatd.
@@ -93,8 +95,11 @@
if (tool == "rmiregistry") {
processName = "registryimpl";
}
+
+ Pattern toolInJpsPattern =
+ Pattern.compile("^\\d+\\s{1}" + processName + "\\s{1}.*-dparent\\.pid\\." + ProcessTools.getProcessId() + ".*");
for (String line : lines) {
- if (line.toLowerCase().matches("^\\d+\\s{1}" + processName + "$")) {
+ if (toolInJpsPattern.matcher(line.toLowerCase()).matches()) {
pid = line.split(" ")[0];
count++;
}
@@ -167,6 +172,8 @@
private OutputAnalyzer runJps() throws Exception {
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
launcher.addVMArg("-XX:+UsePerfData");
+ // Run jps with -v flag to obtain -Dparent.pid.<pid>
+ launcher.addToolArg("-v");
launcher.addToolArg(getDestination());
String[] cmd = launcher.getCommand();
@@ -286,7 +293,7 @@
* jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -n serverName
* jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port -n serverName
*/
- private String[] getJstatdCmd() throws UnknownHostException {
+ private String[] getJstatdCmd() throws Exception {
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstatd");
launcher.addVMArg("-XX:+UsePerfData");
String testSrc = System.getProperty("test.src");
@@ -294,6 +301,8 @@
assertTrue(policy.exists() && policy.isFile(),
"Security policy " + policy.getAbsolutePath() + " does not exist or not a file");
launcher.addVMArg("-Djava.security.policy=" + policy.getAbsolutePath());
+ // -Dparent.pid.<pid> will help to identify jstad process started by this test
+ launcher.addVMArg("-Dparent.pid." + ProcessTools.getProcessId());
if (port != null) {
launcher.addToolArg("-p");
launcher.addToolArg(port);