--- a/.hgtags	Mon Jan 12 11:46:43 2015 -0800
+++ b/.hgtags	Mon Jan 12 12:52:39 2015 -0800
@@ -287,3 +287,4 @@
 3107be2ba9c6e208a0b86bc7100a141abbc5b5fb jdk9-b42
 6494b13f88a867026ee316b444d9a4fa589dd6bd jdk9-b43
 abbfccd659b91a7bb815d5e36fed635dcdd40f31 jdk9-b44
+bfc24ae2b900187585079bb11e66e459d1e525fe jdk9-b45

--- a/.hgtags-top-repo	Mon Jan 12 11:46:43 2015 -0800
+++ b/.hgtags-top-repo	Mon Jan 12 12:52:39 2015 -0800
@@ -287,3 +287,4 @@
 f7c11da0b0481d49cc7a65a453336c108191e821 jdk9-b42
 02ee8c65622e8bd97496d584e22fc7dcf0edc4ae jdk9-b43
 8994f5d87b3bb5e8d317d4e8ccb326da1a73684a jdk9-b44
+3dd628fde2086218d548841022ee8436b6b88185 jdk9-b45

--- a/Makefile	Mon Jan 12 11:46:43 2015 -0800
+++ b/Makefile	Mon Jan 12 12:52:39 2015 -0800
@@ -54,8 +54,11 @@
   # Duplication of global targets, needed before ParseConfAndSpec in case we have
   # no configurations.
   help:
-  # If CONF is not set, look for all available configurations
-  CONF?=
+  # If both CONF and SPEC are unset, look for all available configurations by
+  # setting CONF to the empty string.
+  ifeq ($(SPEC), )
+    CONF?=
+  endif
 endif
 
 # ... and then we can include our helper functions

--- a/common/autoconf/generated-configure.sh	Mon Jan 12 11:46:43 2015 -0800
+++ b/common/autoconf/generated-configure.sh	Mon Jan 12 12:52:39 2015 -0800
@@ -4329,7 +4329,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1418395009
+DATE_WHEN_GENERATED=1420811523
 
 ###############################################################################
 #
@@ -27408,8 +27408,8 @@
     # The trailing space for everyone except PATH is no typo, but is needed due
     # to trailing \ in the Windows paths. These will be stripped later.
     $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
-    $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
-    $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
+    $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
+    $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE

--- a/common/autoconf/spec.gmk.in	Mon Jan 12 11:46:43 2015 -0800
+++ b/common/autoconf/spec.gmk.in	Mon Jan 12 12:52:39 2015 -0800
@@ -690,10 +690,15 @@
 # Images directory definitions
 JDK_IMAGE_SUBDIR:=jdk
 JRE_IMAGE_SUBDIR:=jre
+
 # Colon left out to be able to override output dir for bootcycle-images
 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
 
+# Test image, as above
+TEST_IMAGE_SUBDIR:=test
+TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
+
 # Macosx bundles directory definitions
 JDK_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents
 JRE_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents

--- a/common/autoconf/toolchain_windows.m4	Mon Jan 12 11:46:43 2015 -0800
+++ b/common/autoconf/toolchain_windows.m4	Mon Jan 12 12:52:39 2015 -0800
@@ -173,8 +173,8 @@
     # The trailing space for everyone except PATH is no typo, but is needed due
     # to trailing \ in the Windows paths. These will be stripped later.
     $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
-    $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
-    $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
+    $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
+    $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
     $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE

--- a/common/bin/unshuffle_list.txt	Mon Jan 12 11:46:43 2015 -0800
+++ b/common/bin/unshuffle_list.txt	Mon Jan 12 12:52:39 2015 -0800
@@ -26,10 +26,8 @@
 corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl
 corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity
 corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi
-corba/src/java.corba/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
 corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg
 corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba
-corba/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
 corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop
 jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime
 jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal
@@ -66,8 +64,8 @@
 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org
 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2
 jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind
-jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
-jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
+jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
+jaxws/src/java.xml.ws/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
 jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal
 jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal
 jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish
@@ -1245,6 +1243,8 @@
 jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset
 jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql
 jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql
+jdk/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
+jdk/src/java.transaction/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
 jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security
 jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto
 jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal

--- a/corba/.hgtags	Mon Jan 12 11:46:43 2015 -0800
+++ b/corba/.hgtags	Mon Jan 12 12:52:39 2015 -0800
@@ -287,3 +287,4 @@
 078bb11af876fe528d4b516f33ad4dd9bb60549e jdk9-b42
 9645e35616b60c5c07b4fdf11a132afc8081dfa8 jdk9-b43
 1f57bd728c9e6865ccb9d43ccd80a1c11230a32f jdk9-b44
+9e3f2bed80c0e5a84a256ce41f1d10c5ade48466 jdk9-b45

--- a/corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1998, 1999, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package javax.transaction;
-
-/**
- * This exception indicates that the request carried an invalid transaction
- * context. For example, this exception could be raised if an error
- * occured when trying to register a resource.
- */
-public class InvalidTransactionException extends java.rmi.RemoteException
-{
-    public InvalidTransactionException()
-    {
-        super();
-    }
-
-    public InvalidTransactionException(String msg)
-    {
-        super(msg);
-    }
-}

--- a/corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1998, 1999, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package javax.transaction;
-
-/**
- * This exception indicates that a request carried a null transaction context,
- * but the target object requires an activate transaction.
- */
-public class TransactionRequiredException extends java.rmi.RemoteException
-{
-    public TransactionRequiredException()
-    {
-        super();
-    }
-
-    public TransactionRequiredException(String msg)
-    {
-        super(msg);
-    }
-}

--- a/corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1998, 1999, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package javax.transaction;
-
-/**
- * This exception indicates that the transaction associated with processing
- * of the request has been rolled back, or marked to roll back. Thus the
- * requested operation either could not be performed or was not performed
- * because further computation on behalf of the transaction would be
- * fruitless
- */
-public class TransactionRolledbackException extends java.rmi.RemoteException
-{
-    public TransactionRolledbackException()
-    {
-        super();
-    }
-
-    public TransactionRolledbackException(String msg)
-    {
-        super(msg);
-    }
-}

--- a/corba/src/java.corba/share/classes/javax/transaction/package.html	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 1999, 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.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-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.
--->
-
-</head>
-<body bgcolor="white">
-
-Contains three exceptions thrown by the ORB machinery during unmarshalling.
-<p>
-@since 1.3
-</body>
-</html>

--- a/corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package javax.transaction.xa;
-
-/**
- * The XAException is thrown by the Resource Manager (RM) to inform the
- * Transaction Manager of an error encountered by the involved transaction.
- *
- */
-public class XAException extends java.lang.Exception {
-
-    /**
-    * The error code with which to create the SystemException.
-    *
-    * @serial The error code for the exception
-     */
-
-    public int errorCode;
-
-    /**
-     * Create an XAException.
-     */
-    public XAException()
-    {
-        super();
-    }
-
-    /**
-     * Create an XAException with a given string.
-     *
-     * @param s The <code>String</code> object containing the exception
-     *          message.
-     */
-    public XAException(String s)
-    {
-        super(s);
-    }
-
-    /**
-     * Create an XAException with a given error code.
-     *
-     * @param errcode The error code identifying the exception.
-     */
-    public XAException(int errcode)
-    {
-        super();
-        errorCode = errcode;
-    }
-
-    /**
-     * The inclusive lower bound of the rollback codes.
-     */
-    public final static int XA_RBBASE = 100;
-
-    /**
-     * Indicates that the rollback was caused by an unspecified reason.
-     */
-    public final static int XA_RBROLLBACK = XA_RBBASE;
-
-    /**
-     * Indicates that the rollback was caused by a communication failure.
-     */
-    public final static int XA_RBCOMMFAIL = XA_RBBASE + 1;
-
-    /**
-     * A deadlock was detected.
-     */
-    public final static int XA_RBDEADLOCK = XA_RBBASE + 2;
-
-    /**
-     * A condition that violates the integrity of the resource was detected.
-     */
-    public final static int XA_RBINTEGRITY = XA_RBBASE + 3;
-
-    /**
-     * The resource manager rolled back the transaction branch for a reason
-     * not on this list.
-     */
-    public final static int XA_RBOTHER = XA_RBBASE + 4;
-
-    /**
-     * A protocol error occurred in the resource manager.
-     */
-    public final static int XA_RBPROTO = XA_RBBASE + 5;
-
-    /**
-     * A transaction branch took too long.
-     */
-    public final static int XA_RBTIMEOUT = XA_RBBASE + 6;
-
-    /**
-     * May retry the transaction branch.
-     */
-    public final static int XA_RBTRANSIENT = XA_RBBASE + 7;
-
-    /**
-     * The inclusive upper bound of the rollback error code.
-     */
-    public final static int XA_RBEND = XA_RBTRANSIENT;
-
-    /**
-     * Resumption must occur where the suspension occurred.
-     */
-    public final static int XA_NOMIGRATE = 9;
-
-    /**
-     * The transaction branch may have been heuristically completed.
-     */
-    public final static int XA_HEURHAZ = 8;
-
-    /**
-     * The transaction branch has been heuristically committed.
-     */
-    public final static int XA_HEURCOM = 7;
-
-    /**
-     * The transaction branch has been heuristically rolled back.
-     */
-    public final static int XA_HEURRB = 6;
-
-    /**
-     * The transaction branch has been heuristically committed and
-     * rolled back.
-     */
-    public final static int XA_HEURMIX = 5;
-
-    /**
-     * Routine returned with no effect and may be reissued.
-     */
-    public final static int XA_RETRY = 4;
-
-    /**
-     * The transaction branch was read-only and has been committed.
-     */
-    public final static int XA_RDONLY = 3;
-
-    /**
-     * There is an asynchronous operation already outstanding.
-     */
-    public final static int XAER_ASYNC = -2;
-
-    /**
-     * A resource manager error has occurred in the transaction branch.
-     */
-    public final static int XAER_RMERR = -3;
-
-    /**
-     * The XID is not valid.
-     */
-    public final static int XAER_NOTA = -4;
-
-    /**
-     * Invalid arguments were given.
-     */
-    public final static int XAER_INVAL = -5;
-
-    /**
-     * Routine was invoked in an inproper context.
-     */
-    public final static int XAER_PROTO = -6;
-
-    /**
-     * Resource manager is unavailable.
-     */
-    public final static int XAER_RMFAIL = -7;
-
-    /**
-     * The XID already exists.
-     */
-    public final static int XAER_DUPID = -8;
-
-    /**
-     * The resource manager is doing work outside a global transaction.
-     */
-    public final static int XAER_OUTSIDE = -9;
-
-
-}

--- a/corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package javax.transaction.xa;
-
-/** <p>The XAResource interface is a Java mapping of the industry standard
-  * XA interface based on the X/Open CAE Specification (Distributed
-  * Transaction Processing: The XA Specification).
-  *
-  * <p>The XA interface defines the contract between a Resource Manager
-  * and a Transaction Manager in a distributed transaction processing
-  * (DTP) environment. A JDBC driver or a JMS provider implements
-  * this interface to support the association between a global transaction
-  * and a database or message service connection.
-  *
-  * <p>The XAResource interface can be supported by any transactional
-  * resource that is intended to be used by application programs in an
-  * environment where transactions are controlled by an external
-  * transaction manager. An example of such a resource is a database
-  * management system. An application may access data through multiple
-  * database connections. Each database connection is enlisted with
-  * the transaction manager as a transactional resource. The transaction
-  * manager obtains an XAResource for each connection participating
-  * in a global transaction. The transaction manager uses the
-  * <code>start</code> method
-  * to associate the global transaction with the resource, and it uses the
-  * <code>end</code> method to disassociate the transaction from
-  * the resource. The resource
-  * manager is responsible for associating the global transaction to all
-  * work performed on its data between the start and end method invocations.
-  *
-  * <p>At transaction commit time, the resource managers are informed by
-  * the transaction manager to prepare, commit, or rollback a transaction
-  * according to the two-phase commit protocol.</p>
-  *
-  */
-
-public interface XAResource
-{
-    /** Commits the global transaction specified by xid.
-      *
-      * @param xid A global transaction identifier
-      *
-      * @param onePhase If true, the resource manager should use a one-phase
-      * commit protocol to commit the work done on behalf of xid.
-      *
-      * @exception XAException An error has occurred. Possible XAExceptions
-      * are XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX, XAER_RMERR,
-      * XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or XAER_PROTO.
-      *
-      * <P>If the resource manager did not commit the transaction and the
-      *  paramether onePhase is set to true, the resource manager may throw
-      *  one of the XA_RB* exceptions. Upon return, the resource manager has
-      *  rolled back the branch's work and has released all held resources.
-      */
-
-    void commit(Xid xid, boolean onePhase) throws XAException;
-
-
-    /** Ends the work performed on behalf of a transaction branch.
-      * The resource manager disassociates the XA resource from the
-      * transaction branch specified and lets the transaction
-      * complete.
-      *
-      * <p>If TMSUSPEND is specified in the flags, the transaction branch
-      * is temporarily suspended in an incomplete state. The transaction
-      * context is in a suspended state and must be resumed via the
-      * <code>start</code> method with TMRESUME specified.</p>
-      *
-      * <p>If TMFAIL is specified, the portion of work has failed.
-      * The resource manager may mark the transaction as rollback-only</p>
-      *
-      * <p>If TMSUCCESS is specified, the portion of work has completed
-      * successfully.</p>
-      *
-      * @param xid A global transaction identifier that is the same as
-      * the identifier used previously in the <code>start</code> method.
-      *
-      * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND.
-      *
-      * @exception XAException An error has occurred. Possible XAException
-      * values are XAER_RMERR, XAER_RMFAILED, XAER_NOTA, XAER_INVAL,
-      * XAER_PROTO, or XA_RB*.
-      */
-
-    void end(Xid xid, int flags) throws XAException;
-
-
-    /** Tells the resource manager to forget about a heuristically
-      * completed transaction branch.
-      *
-      * @param xid A global transaction identifier.
-      *
-      * @exception XAException An error has occurred. Possible exception
-      * values are XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
-      * XAER_PROTO.
-      */
-
-    void forget(Xid xid) throws XAException;
-
-    /** Obtains the current transaction timeout value set for this
-      * XAResource instance. If <CODE>XAResource.setTransactionTimeout</CODE>
-      * was not used prior to invoking this method, the return value
-      * is the default timeout set for the resource manager; otherwise,
-      * the value used in the previous <CODE>setTransactionTimeout</CODE>
-      * call is returned.
-      *
-      * @return the transaction timeout value in seconds.
-      *
-      * @exception XAException An error has occurred. Possible exception
-      * values are XAER_RMERR and XAER_RMFAIL.
-      */
-    int getTransactionTimeout() throws XAException;
-
-    /** This method is called to determine if the resource manager
-      * instance represented by the target object is the same as the
-      * resouce manager instance represented by the parameter <i>xares</i>.
-      *
-      * @param xares An XAResource object whose resource manager instance
-      *      is to be compared with the resource manager instance of the
-      *      target object.
-      *
-      * @return <i>true</i> if it's the same RM instance; otherwise
-      *       <i>false</i>.
-      *
-      * @exception XAException An error has occurred. Possible exception
-      * values are XAER_RMERR and XAER_RMFAIL.
-      *
-      */
-    boolean isSameRM(XAResource xares) throws XAException;
-
-    /** Ask the resource manager to prepare for a transaction commit
-      * of the transaction specified in xid.
-      *
-      * @param xid A global transaction identifier.
-      *
-      * @exception XAException An error has occurred. Possible exception
-      * values are: XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL,
-      * or XAER_PROTO.
-      *
-      * @return A value indicating the resource manager's vote on the
-      * outcome of the transaction. The possible values are: XA_RDONLY
-      * or XA_OK. If the resource manager wants to roll back the
-      * transaction, it should do so by raising an appropriate XAException
-      * in the prepare method.
-      */
-
-    int prepare(Xid xid) throws XAException;
-
-
-    /** Obtains a list of prepared transaction branches from a resource
-      * manager. The transaction manager calls this method during recovery
-      * to obtain the list of transaction branches that are currently in
-      * prepared or heuristically completed states.
-      *
-      * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
-      * must be used when no other flags are set in the parameter.
-      *
-      * @exception XAException An error has occurred. Possible values are
-      * XAER_RMERR, XAER_RMFAIL, XAER_INVAL, and XAER_PROTO.
-      *
-      * @return The resource manager returns zero or more XIDs of the
-      * transaction branches that are currently in a prepared or
-      * heuristically completed state. If an error occurs during the
-      * operation, the resource manager should throw the appropriate
-      * XAException.
-      *
-      */
-
-    Xid[] recover(int flag) throws XAException;
-
-
-    /** Informs the resource manager to roll back work done on behalf
-      * of a transaction branch.
-      *
-      * @param xid A global transaction identifier.
-      *
-      * @exception XAException An error has occurred.
-      */
-
-    void rollback(Xid xid) throws XAException;
-
-
-    /** <P>Sets the current transaction timeout value for this <CODE>XAResource</CODE>
-      * instance. Once set, this timeout value is effective until
-      * <code>setTransactionTimeout</code> is invoked again with a different
-      * value. To reset the timeout value to the default value used by the resource
-      * manager, set the value to zero.
-      *
-      * If the timeout operation is performed successfully, the method returns
-      * <i>true</i>; otherwise <i>false</i>. If a resource manager does not
-      * support explicitly setting the transaction timeout value, this method
-      * returns <i>false</i>.
-      *
-      * @param seconds The transaction timeout value in seconds.
-      *
-      * @return <i>true</i> if the transaction timeout value is set successfully;
-      *       otherwise <i>false</i>.
-      *
-      * @exception XAException An error has occurred. Possible exception values
-      * are XAER_RMERR, XAER_RMFAIL, or XAER_INVAL.
-      */
-    boolean setTransactionTimeout(int seconds) throws XAException;
-
-
-    /** Starts work on behalf of a transaction branch specified in
-      * <code>xid</code>.
-      *
-      * If TMJOIN is specified, the start applies to joining a transaction
-      * previously seen by the resource manager. If TMRESUME is specified,
-      * the start applies to resuming a suspended transaction specified in the
-      * parameter <code>xid</code>.
-      *
-      * If neither TMJOIN nor TMRESUME is specified and the transaction
-      * specified by <code>xid</code> has previously been seen by the resource
-      * manager, the resource manager throws the XAException exception with
-      * XAER_DUPID error code.
-      *
-      * @param xid A global transaction identifier to be associated
-      * with the resource.
-      *
-      * @param flags One of TMNOFLAGS, TMJOIN, or TMRESUME.
-      *
-      * @exception XAException An error has occurred. Possible exceptions
-      * are XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_DUPID, XAER_OUTSIDE,
-      * XAER_NOTA, XAER_INVAL, or XAER_PROTO.
-      *
-      */
-    void start(Xid xid, int flags) throws XAException;
-
-
-    /**
-      * Ends a recovery scan.
-      */
-    public final static int TMENDRSCAN =   0x00800000;
-
-    /**
-      * Disassociates the caller and marks the transaction branch
-      * rollback-only.
-      */
-    public final static int TMFAIL =       0x20000000;
-
-    /**
-      * Caller is joining existing transaction branch.
-      */
-    public final static int TMJOIN =       0x00200000;
-
-    /**
-      * Use TMNOFLAGS to indicate no flags value is selected.
-      */
-    public final static int TMNOFLAGS =     0x00000000;
-
-    /**
-      * Caller is using one-phase optimization.
-      */
-    public final static int TMONEPHASE =   0x40000000;
-
-    /**
-      * Caller is resuming association with a suspended
-      * transaction branch.
-      */
-    public final static int TMRESUME =     0x08000000;
-
-    /**
-      * Starts a recovery scan.
-      */
-    public final static int TMSTARTRSCAN = 0x01000000;
-
-
-    /**
-      * Disassociates caller from a transaction branch.
-      */
-    public final static int TMSUCCESS =    0x04000000;
-
-
-    /**
-      * Caller is suspending (not ending) its association with
-      * a transaction branch.
-      */
-    public final static int TMSUSPEND =    0x02000000;
-
-    /**
-     * The transaction branch has been read-only and has been committed.
-     */
-    public final static int XA_RDONLY = 0x00000003;
-
-    /**
-     * The transaction work has been prepared normally.
-     */
-    public final static int XA_OK = 0;
-
-}

--- a/corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2000, 2002, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package javax.transaction.xa;
-
-/**
- * The Xid interface is a Java mapping of the X/Open transaction identifier
- * XID structure. This interface specifies three accessor methods to
- * retrieve a global transaction format ID, global transaction ID,
- * and branch qualifier. The Xid interface is used by the transaction
- * manager and the resource managers. This interface is not visible to
- * the application programs.
- */
-public interface Xid {
-
-    /**
-     * Maximum number of bytes returned by getGtrid.
-     */
-    final static int MAXGTRIDSIZE = 64;
-
-    /**
-     * Maximum number of bytes returned by getBqual.
-     */
-    final static int MAXBQUALSIZE = 64;
-
-    /**
-     * Obtain the format identifier part of the XID.
-     *
-     * @return Format identifier. O means the OSI CCR format.
-     */
-    int getFormatId();
-
-    /**
-     * Obtain the global transaction identifier part of XID as an array
-     * of bytes.
-     *
-     * @return Global transaction identifier.
-     */
-    byte[] getGlobalTransactionId();
-
-    /**
-     * Obtain the transaction branch identifier part of XID as an array
-     * of bytes.
-     *
-     * @return Global transaction identifier.
-     */
-    byte[] getBranchQualifier();
-}

--- a/corba/src/java.sql/share/classes/javax/transaction/xa/package.html	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 2001, 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.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-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.
--->
-
-</head>
-<body bgcolor="white">
-
-Provides the API that defines the contract between the transaction 
-manager and the resource manager, which allows the transaction 
-manager to enlist and delist resource objects (supplied by the 
-resource manager driver) in JTA transactions. The driver vendor 
-for a specific resource manager provides the implementation of 
-this API.
-<p>
-@since 1.4
-</body>
-</html>

--- a/hotspot/.hgtags	Mon Jan 12 11:46:43 2015 -0800
+++ b/hotspot/.hgtags	Mon Jan 12 12:52:39 2015 -0800
@@ -447,3 +447,4 @@
 38cb4fbd47e3472bd1b5ebac83bda96fe4869c4f jdk9-b42
 65a9747147b8090037541040ba67156ec914db6a jdk9-b43
 43a44b56dca61a4d766a20f0528fdd8b5ceff873 jdk9-b44
+5dc8184af1e2bb30b0103113d1f1a58a21a80c37 jdk9-b45

--- a/jaxp/.hgtags	Mon Jan 12 11:46:43 2015 -0800
+++ b/jaxp/.hgtags	Mon Jan 12 12:52:39 2015 -0800
@@ -287,3 +287,4 @@
 47b0d3fa4118b9d56870cf4004987438c501f5c0 jdk9-b42
 40b242363040229a05224fbc5dc203a3f46a8f8f jdk9-b43
 0cb0844b58924d6086d2850c22087d06679d5eef jdk9-b44
+0dab3e848229127c7aca4c58b98e2d90ba70372f jdk9-b45

--- a/jaxws/.hgtags	Mon Jan 12 11:46:43 2015 -0800
+++ b/jaxws/.hgtags	Mon Jan 12 12:52:39 2015 -0800
@@ -290,3 +290,4 @@
 301ddb4478fb36d1f025d14e7e48c2a434e9e6ff jdk9-b42
 edc13d27dc871be57d7ca77eef77e6d04972fee2 jdk9-b43
 2a03baa4d849818ff6d635f110c2813b12fc2326 jdk9-b44
+e529374fbe526dbd668e5e98fc047b42b3bc6d33 jdk9-b45

--- a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.xml.internal.messaging.saaj;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-/**
- * LazyEnvelopeSource provides the source to create lazy Envelope
- *
- * @author shih-chang.chen@oracle.com
- */
-public interface LazyEnvelopeSource extends javax.xml.transform.Source {
-    /**
-     * Retrieve payload qname without materializing its contents
-     * @return
-     * @throws SOAPException
-     */
-    public QName getPayloadQName();
-    public XMLStreamReader readToBodyStarTag() throws XMLStreamException;
-    public XMLStreamReader readPayload();
-    public void writePayloadTo(XMLStreamWriter writer)throws XMLStreamException;
-    public boolean isPayloadStreamReader();
-}

--- a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.xml.internal.messaging.saaj;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import javax.xml.soap.SOAPException;
-
-/**
- * An exception that signals that a SOAP exception has occurred. A
- * <code>SOAPExceptionImpl</code> object may contain a <code>String</code>
- * that gives the reason for the exception, an embedded
- * <code>Throwable</code> object, or both. This class provides methods
- * for retrieving reason messages and for retrieving the embedded
- * <code>Throwable</code> object.
- *
- * <P> Typical reasons for throwing a <code>SOAPExceptionImpl</code>
- * object are problems such as difficulty setting a header, not being
- * able to send a message, and not being able to get a connection with
- * the provider.  Reasons for embedding a <code>Throwable</code>
- * object include problems such as input/output errors or a parsing
- * problem, such as an error in parsing a header.
- */
-public class SOAPExceptionImpl extends SOAPException {
-    private Throwable cause;
-
-    /**
-     * Constructs a <code>SOAPExceptionImpl</code> object with no
-     * reason or embedded <code>Throwable</code> object.
-     */
-    public SOAPExceptionImpl() {
-        super();
-        this.cause = null;
-    }
-
-    /**
-     * Constructs a <code>SOAPExceptionImpl</code> object with the given
-     * <code>String</code> as the reason for the exception being thrown.
-     *
-     * @param reason a description of what caused the exception
-     */
-    public SOAPExceptionImpl(String reason) {
-        super(reason);
-        this.cause = null;
-    }
-
-    /**
-     * Constructs a <code>SOAPExceptionImpl</code> object with the given
-     * <code>String</code> as the reason for the exception being thrown
-     * and the given <code>Throwable</code> object as an embedded
-     * exception.
-     *
-     * @param reason a description of what caused the exception
-     * @param cause a <code>Throwable</code> object that is to
-     *        be embedded in this <code>SOAPExceptionImpl</code> object
-     */
-    public SOAPExceptionImpl(String reason, Throwable cause) {
-       super (reason);
-       initCause(cause);
-    }
-
-    /**
-     * Constructs a <code>SOAPExceptionImpl</code> object initialized
-     * with the given <code>Throwable</code> object.
-     */
-    public SOAPExceptionImpl(Throwable cause) {
-        super (cause.toString());
-        initCause(cause);
-    }
-
-    /**
-     * Returns the detail message for this <code>SOAPExceptionImpl</code>
-     * object.
-     * <P>
-     * If there is an embedded <code>Throwable</code> object, and if the
-     * <code>SOAPExceptionImpl</code> object has no detail message of its
-     * own, this method will return the detail message from the embedded
-     * <code>Throwable</code> object.
-     *
-     * @return the error or warning message for this
-     *         <code>SOAPExceptionImpl</code> or, if it has none, the
-     *         message of the embedded <code>Throwable</code> object,
-     *         if there is one
-     */
-    public String getMessage() {
-        String message = super.getMessage ();
-        if (message == null && cause != null) {
-            return cause.getMessage();
-        } else {
-            return message;
-        }
-    }
-
-    /**
-     * Returns the <code>Throwable</code> object embedded in this
-     * <code>SOAPExceptionImpl</code> if there is one. Otherwise, this method
-     * returns <code>null</code>.
-     *
-     * @return the embedded <code>Throwable</code> object or <code>null</code>
-     *         if there is none
-     */
-
-    public Throwable getCause() {
-        return cause;
-    }
-
-    /**
-     * Initializes the <code>cause</code> field of this <code>SOAPExceptionImpl</code>
-     * object with the given <code>Throwable</code> object.
-     * <P>
-     * This method can be called at most once.  It is generally called from
-     * within the constructor or immediately after the constructor has
-     * returned a new <code>SOAPExceptionImpl</code> object.
-     * If this <code>SOAPExceptionImpl</code> object was created with the
-     * constructor {@link #SOAPExceptionImpl(Throwable)} or
-     * {@link #SOAPExceptionImpl(String,Throwable)}, meaning that its
-     * <code>cause</code> field already has a value, this method cannot be
-     * called even once.
-     *
-     * @param  cause the <code>Throwable</code> object that caused this
-     *         <code>SOAPExceptionImpl</code> object to be thrown.  The value of this
-     *         parameter is saved for later retrieval by the
-     *         {@link #getCause()} method.  A <tt>null</tt> value is
-     *         permitted and indicates that the cause is nonexistent or
-     *         unknown.
-     * @return  a reference to this <code>SOAPExceptionImpl</code> instance
-     * @throws IllegalArgumentException if <code>cause</code> is this
-     *         <code>Throwable</code> object.  (A <code>Throwable</code> object
-     *         cannot be its own cause.)
-     * @throws IllegalStateException if this <code>SOAPExceptionImpl</code> object
-     *         was created with {@link #SOAPExceptionImpl(Throwable)} or
-     *         {@link #SOAPExceptionImpl(String,Throwable)}, or this
-     *         method has already been called on this <code>SOAPExceptionImpl</code>
-     *         object
-     */
-    public synchronized Throwable initCause(Throwable cause)
-    {
-        if(this.cause != null) {
-            throw new IllegalStateException("Can't override cause");
-        }
-        if(cause == this) {
-            throw new IllegalArgumentException("Self-causation not permitted");
-        }
-        this.cause = cause;
-
-        return this;
-    }
-
-    public void printStackTrace() {
-        super.printStackTrace();
-        if (cause != null) {
-            System.err.println("\nCAUSE:\n");
-            cause.printStackTrace();
-        }
-    }
-
-    public void printStackTrace(PrintStream s) {
-        super.printStackTrace(s);
-        if (cause != null) {
-            s.println("\nCAUSE:\n");
-            cause.printStackTrace(s);
-        }
-    }
-
-    public void printStackTrace(PrintWriter s) {
-        super.printStackTrace(s);
-        if (cause != null) {
-            s.println("\nCAUSE:\n");
-            cause.printStackTrace(s);
-        }
-    }
-}

--- a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java	Mon Jan 12 11:46:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,657 +0,0 @@
-/*
- * Copyright (c) 1997, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.xml.internal.messaging.saaj.client.p2p;
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.net.*;
-import java.security.*;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.soap.*;
-
-import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
-import com.sun.xml.internal.messaging.saaj.util.*;
-
-/**
- * This represents a "connection" to the simple HTTP-based provider.
- *
- * @author Anil Vijendran (akv@eng.sun.com)
- * @author Rajiv Mordani (rajiv.mordani@sun.com)
- * @author Manveen Kaur (manveen.kaur@sun.com)
- *
- */
-class HttpSOAPConnection extends SOAPConnection {
-
-    public static final String vmVendor = SAAJUtil.getSystemProperty("java.vendor.url");
-    private static final String sunVmVendor = "http://java.sun.com/";
-    private static final String ibmVmVendor = "http://www.ibm.com/";
-    private static final boolean isSunVM = sunVmVendor.equals(vmVendor) ? true: false;
-    private static final boolean isIBMVM = ibmVmVendor.equals(vmVendor) ? true : false;
-    private static final String JAXM_URLENDPOINT="javax.xml.messaging.URLEndpoint";
-
-    protected static final Logger log =
-        Logger.getLogger(LogDomainConstants.HTTP_CONN_DOMAIN,
-                         "com.sun.xml.internal.messaging.saaj.client.p2p.LocalStrings");
-
-
-    MessageFactory messageFactory = null;
-
-    boolean closed = false;
-
-    public HttpSOAPConnection() throws SOAPException {
-
-        try {
-            messageFactory = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
-        } catch (NoSuchMethodError ex) {
-            //fallback to default SOAP 1.1 in this case for backward compatibility
-            messageFactory = MessageFactory.newInstance();
-        } catch (Exception ex) {
-            log.log(Level.SEVERE, "SAAJ0001.p2p.cannot.create.msg.factory", ex);
-            throw new SOAPExceptionImpl("Unable to create message factory", ex);
-        }
-    }
-
-    public void close() throws SOAPException {
-        if (closed) {
-            log.severe("SAAJ0002.p2p.close.already.closed.conn");
-            throw new SOAPExceptionImpl("Connection already closed");
-        }
-
-        messageFactory = null;
-        closed = true;
-    }
-
-   public SOAPMessage call(SOAPMessage message, Object endPoint)
-        throws SOAPException {
-        if (closed) {
-            log.severe("SAAJ0003.p2p.call.already.closed.conn");
-            throw new SOAPExceptionImpl("Connection is closed");
-        }
-
-        Class urlEndpointClass = null;
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        try {
-            if (loader != null) {
-                urlEndpointClass = loader.loadClass(JAXM_URLENDPOINT);
-            } else {
-                urlEndpointClass = Class.forName(JAXM_URLENDPOINT);
-            }
-        } catch (ClassNotFoundException ex) {
-            //Do nothing. URLEndpoint is available only when JAXM is there.
-            if (log.isLoggable(Level.FINEST))
-                log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM");
-        }
-
-        if (urlEndpointClass != null) {
-            if (urlEndpointClass.isInstance(endPoint)) {
-                String url = null;
-
-                try {
-                    Method m = urlEndpointClass.getMethod("getURL", (Class[])null);
-                    url = (String) m.invoke(endPoint, (Object[])null);
-                } catch (Exception ex) {
-                    // TBD -- exception chaining
-                    log.log(Level.SEVERE,"SAAJ0004.p2p.internal.err",ex);
-                    throw new SOAPExceptionImpl(
-                        "Internal error: " + ex.getMessage());
-                }
-                try {
-                    endPoint = new URL(url);
-                } catch (MalformedURLException mex) {
-                    log.log(Level.SEVERE,"SAAJ0005.p2p.", mex);
-                    throw new SOAPExceptionImpl("Bad URL: " + mex.getMessage());
-                }
-            }
-        }
-
-        if (endPoint instanceof java.lang.String) {
-            try {
-                endPoint = new URL((String) endPoint);
-            } catch (MalformedURLException mex) {
-                log.log(Level.SEVERE, "SAAJ0006.p2p.bad.URL", mex);
-                throw new SOAPExceptionImpl("Bad URL: " + mex.getMessage());
-            }
-        }
-
-        if (endPoint instanceof URL)
-            try {
-                SOAPMessage response = post(message, (URL)endPoint);
-                return response;
-            } catch (Exception ex) {
-                // TBD -- chaining?
-                throw new SOAPExceptionImpl(ex);
-            } else {
-            log.severe("SAAJ0007.p2p.bad.endPoint.type");
-            throw new SOAPExceptionImpl("Bad endPoint type " + endPoint);
-        }
-    }
-
-    SOAPMessage post(SOAPMessage message, URL endPoint) throws SOAPException, IOException {
-        boolean isFailure = false;
-
-        URL url = null;
-        HttpURLConnection httpConnection = null;
-
-        int responseCode = 0;
-        try {
-            if (endPoint.getProtocol().equals("https"))
-                //if(!setHttps)
-                initHttps();
-            // Process the URL
-            URI uri = new URI(endPoint.toString());
-            String userInfo = uri.getRawUserInfo();
-
-            url = endPoint;
-
-            if (dL > 0)
-                d("uri: " + userInfo + " " + url + " " + uri);
-
-            // TBD
-            //    Will deal with https later.
-            if (!url.getProtocol().equalsIgnoreCase("http")
-                && !url.getProtocol().equalsIgnoreCase("https")) {
-                log.severe("SAAJ0052.p2p.protocol.mustbe.http.or.https");
-                throw new IllegalArgumentException(
-                    "Protocol "
-                        + url.getProtocol()
-                        + " not supported in URL "
-                        + url);
-            }
-            httpConnection = (HttpURLConnection) createConnection(url);
-
-            httpConnection.setRequestMethod("POST");
-
-            httpConnection.setDoOutput(true);
-            httpConnection.setDoInput(true);
-            httpConnection.setUseCaches(false);
-            httpConnection.setInstanceFollowRedirects(true);
-
-            if (message.saveRequired())
-                message.saveChanges();
-
-            MimeHeaders headers = message.getMimeHeaders();
-
-            Iterator it = headers.getAllHeaders();
-            boolean hasAuth = false; // true if we find explicit Auth header
-            while (it.hasNext()) {
-                MimeHeader header = (MimeHeader) it.next();
-
-                String[] values = headers.getHeader(header.getName());
-                if (values.length == 1)
-                    httpConnection.setRequestProperty(
-                        header.getName(),
-                        header.getValue());
-                else {
-                    StringBuffer concat = new StringBuffer();
-                    int i = 0;
-                    while (i < values.length) {
-                        if (i != 0)
-                            concat.append(',');
-                        concat.append(values[i]);
-                        i++;
-                    }
-
-                    httpConnection.setRequestProperty(
-                        header.getName(),
-                        concat.toString());
-                }
-
-                if ("Authorization".equals(header.getName())) {
-                    hasAuth = true;
-                    if (log.isLoggable(Level.FINE))
-                        log.fine("SAAJ0091.p2p.https.auth.in.POST.true");
-                }
-            }
-
-            if (!hasAuth && userInfo != null) {
-                initAuthUserInfo(httpConnection, userInfo);
-            }
-
-            OutputStream out = httpConnection.getOutputStream();
-            try {
-                message.writeTo(out);
-                out.flush();
-            } finally {
-                out.close();
-            }
-
-            httpConnection.connect();
-
-            try {
-
-                responseCode = httpConnection.getResponseCode();
-
-                // let HTTP_INTERNAL_ERROR (500) through because it is used for SOAP faults
-                if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    isFailure = true;
-                }
-                //else if (responseCode != HttpURLConnection.HTTP_OK)
-                //else if (!(responseCode >= HttpURLConnection.HTTP_OK && responseCode < 207))
-                else if ((responseCode / 100) != 2) {
-                    log.log(Level.SEVERE,
-                            "SAAJ0008.p2p.bad.response",
-                            new String[] {httpConnection.getResponseMessage()});
-                    throw new SOAPExceptionImpl(
-                        "Bad response: ("
-                            + responseCode
-                            + httpConnection.getResponseMessage());
-
-                }
-            } catch (IOException e) {
-                // on JDK1.3.1_01, we end up here, but then getResponseCode() succeeds!
-                responseCode = httpConnection.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    isFailure = true;
-                } else {
-                    throw e;
-                }
-
-            }
-
-        } catch (SOAPException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            log.severe("SAAJ0009.p2p.msg.send.failed");
-            throw new SOAPExceptionImpl("Message send failed", ex);
-        }
-
-        SOAPMessage response = null;
-        InputStream httpIn = null;
-        if (responseCode == HttpURLConnection.HTTP_OK || isFailure) {
-            try {
-                MimeHeaders headers = new MimeHeaders();
-
-                String key, value;
-
-                // Header field 0 is the status line so we skip it.
-
-                int i = 1;
-
-                while (true) {
-                    key = httpConnection.getHeaderFieldKey(i);
-                    value = httpConnection.getHeaderField(i);
-
-                    if (key == null && value == null)
-                        break;
-
-                    if (key != null) {
-                        StringTokenizer values =
-                            new StringTokenizer(value, ",");
-                        while (values.hasMoreTokens())
-                            headers.addHeader(key, values.nextToken().trim());
-                    }
-                    i++;
-                }
-
-                httpIn =
-                    (isFailure
-                        ? httpConnection.getErrorStream()
-                        : httpConnection.getInputStream());
-
-                byte[] bytes = readFully(httpIn);
-
-                int length =
-                    httpConnection.getContentLength() == -1
-                        ? bytes.length
-                        : httpConnection.getContentLength();
-
-                // If no reply message is returned,
-                // content-Length header field value is expected to be zero.
-                if (length == 0) {
-                    response = null;
-                    log.warning("SAAJ0014.p2p.content.zero");
-                } else {
-                    ByteInputStream in = new ByteInputStream(bytes, length);
-                    response = messageFactory.createMessage(headers, in);
-                }
-
-            } catch (SOAPException ex) {
-                throw ex;
-            } catch (Exception ex) {
-                log.log(Level.SEVERE,"SAAJ0010.p2p.cannot.read.resp", ex);
-                throw new SOAPExceptionImpl(
-                    "Unable to read response: " + ex.getMessage());
-            } finally {
-               if (httpIn != null)
-                   httpIn.close();
-               httpConnection.disconnect();
-            }
-        }
-        return response;
-    }
-
-    // Object identifies where the request should be sent.
-    // It is required to support objects of type String and java.net.URL.
-
-    public SOAPMessage get(Object endPoint) throws SOAPException {
-        if (closed) {
-            log.severe("SAAJ0011.p2p.get.already.closed.conn");
-            throw new SOAPExceptionImpl("Connection is closed");
-        }
-        Class urlEndpointClass = null;
-
-        try {
-            urlEndpointClass = Class.forName("javax.xml.messaging.URLEndpoint");
-        } catch (Exception ex) {
-            //Do nothing. URLEndpoint is available only when JAXM is there.
-        }
-
-        if (urlEndpointClass != null) {
-            if (urlEndpointClass.isInstance(endPoint)) {
-                String url = null;
-
-                try {
-                    Method m = urlEndpointClass.getMethod("getURL", (Class[])null);
-                    url = (String) m.invoke(endPoint, (Object[])null);
-                } catch (Exception ex) {
-                    log.severe("SAAJ0004.p2p.internal.err");
-                    throw new SOAPExceptionImpl(
-                        "Internal error: " + ex.getMessage());
-                }
-                try {
-                    endPoint = new URL(url);
-                } catch (MalformedURLException mex) {
-                    log.severe("SAAJ0005.p2p.");
-                    throw new SOAPExceptionImpl("Bad URL: " + mex.getMessage());
-                }
-            }
-        }
-
-        if (endPoint instanceof java.lang.String) {
-            try {
-                endPoint = new URL((String) endPoint);
-            } catch (MalformedURLException mex) {
-                log.severe("SAAJ0006.p2p.bad.URL");
-                throw new SOAPExceptionImpl("Bad URL: " + mex.getMessage());
-            }
-        }
-
-        if (endPoint instanceof URL)
-            try {
-                SOAPMessage response = doGet((URL)endPoint);
-                return response;
-            } catch (Exception ex) {
-                throw new SOAPExceptionImpl(ex);
-            } else
-            throw new SOAPExceptionImpl("Bad endPoint type " + endPoint);
-    }
-
-    SOAPMessage doGet(URL endPoint) throws SOAPException, IOException {
-        boolean isFailure = false;
-
-        URL url = null;
-        HttpURLConnection httpConnection = null;
-
-        int responseCode = 0;
-        try {
-            /// Is https GET allowed??
-            if (endPoint.getProtocol().equals("https"))
-                initHttps();
-            // Process the URL
-            URI uri = new URI(endPoint.toString());
-            String userInfo = uri.getRawUserInfo();
-
-            url = endPoint;
-
-            if (dL > 0)
-                d("uri: " + userInfo + " " + url + " " + uri);
-
-            // TBD
-            //    Will deal with https later.
-            if (!url.getProtocol().equalsIgnoreCase("http")
-                && !url.getProtocol().equalsIgnoreCase("https")) {
-                log.severe("SAAJ0052.p2p.protocol.mustbe.http.or.https");
-                throw new IllegalArgumentException(
-                    "Protocol "
-                        + url.getProtocol()
-                        + " not supported in URL "
-                        + url);
-            }
-            httpConnection = (HttpURLConnection) createConnection(url);
-
-            httpConnection.setRequestMethod("GET");
-
-            httpConnection.setDoOutput(true);
-            httpConnection.setDoInput(true);
-            httpConnection.setUseCaches(false);
-            httpConnection.setFollowRedirects(true);
-
-            httpConnection.connect();
-
-            try {
-
-                responseCode = httpConnection.getResponseCode();
-
-                // let HTTP_INTERNAL_ERROR (500) through because it is used for SOAP faults
-                if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    isFailure = true;
-                } else if ((responseCode / 100) != 2) {
-                    log.log(Level.SEVERE,
-                            "SAAJ0008.p2p.bad.response",
-                            new String[] { httpConnection.getResponseMessage()});
-                    throw new SOAPExceptionImpl(
-                        "Bad response: ("
-                            + responseCode
-                            + httpConnection.getResponseMessage());
-
-                }
-            } catch (IOException e) {
-                // on JDK1.3.1_01, we end up here, but then getResponseCode() succeeds!
-                responseCode = httpConnection.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    isFailure = true;
-                } else {
-                    throw e;
-                }
-
-            }
-
-        } catch (SOAPException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            log.severe("SAAJ0012.p2p.get.failed");
-            throw new SOAPExceptionImpl("Get failed", ex);
-        }
-
-        SOAPMessage response = null;
-        InputStream httpIn = null;
-        if (responseCode == HttpURLConnection.HTTP_OK || isFailure) {
-            try {
-                MimeHeaders headers = new MimeHeaders();
-
-                String key, value;
-
-                // Header field 0 is the status line so we skip it.
-
-                int i = 1;
-
-                while (true) {
-                    key = httpConnection.getHeaderFieldKey(i);
-                    value = httpConnection.getHeaderField(i);
-
-                    if (key == null && value == null)
-                        break;
-
-                    if (key != null) {
-                        StringTokenizer values =
-                            new StringTokenizer(value, ",");
-                        while (values.hasMoreTokens())
-                            headers.addHeader(key, values.nextToken().trim());
-                    }
-                    i++;
-                }
-
-                httpIn =
-                        (isFailure
-                        ? httpConnection.getErrorStream()
-                        : httpConnection.getInputStream());
-                // If no reply message is returned,
-                // content-Length header field value is expected to be zero.
-                // java SE 6 documentation says :
-                // available() : an estimate of the number of bytes that can be read
-                //(or skipped over) from this input stream without blocking
-                //or 0 when it reaches the end of the input stream.
-                if ((httpIn == null )
-                        || (httpConnection.getContentLength() == 0)
-                        || (httpIn.available() == 0)) {
-                    response = null;
-                    log.warning("SAAJ0014.p2p.content.zero");
-                } else {
-                    response = messageFactory.createMessage(headers, httpIn);
-                }
-
-            } catch (SOAPException ex) {
-                throw ex;
-            } catch (Exception ex) {
-                log.log(Level.SEVERE,
-                        "SAAJ0010.p2p.cannot.read.resp",
-                        ex);
-                throw new SOAPExceptionImpl(
-                    "Unable to read response: " + ex.getMessage());
-            } finally {
-               if (httpIn != null)
-                   httpIn.close();
-               httpConnection.disconnect();
-            }
-        }
-        return response;
-    }
-
-    private byte[] readFully(InputStream istream) throws IOException {
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        byte[] buf = new byte[1024];
-        int num = 0;
-
-        while ((num = istream.read(buf)) != -1) {
-            bout.write(buf, 0, num);
-        }
-
-        byte[] ret = bout.toByteArray();
-
-        return ret;
-    }
-
-    //private static String SSL_PKG = "com.sun.net.ssl.internal.www.protocol";
-    //private static String SSL_PROVIDER =
-      //  "com.sun.net.ssl.internal.ssl.Provider";
-    private static final String SSL_PKG;
-    private static final String SSL_PROVIDER;
-
-    static {
-        if (isIBMVM) {
-            SSL_PKG ="com.ibm.net.ssl.internal.www.protocol";
-            SSL_PROVIDER ="com.ibm.net.ssl.internal.ssl.Provider";
-        } else {
-            //if not IBM VM default to Sun.
-            SSL_PKG = "com.sun.net.ssl.internal.www.protocol";
-            SSL_PROVIDER ="com.sun.net.ssl.internal.ssl.Provider";
-        }
-    }
-
-    private void initHttps() {
-        //if(!setHttps) {
-        String pkgs = SAAJUtil.getSystemProperty("java.protocol.handler.pkgs");
-        if (log.isLoggable(Level.FINE))
-            log.log(Level.FINE, "SAAJ0053.p2p.providers", new String[] { pkgs });
-
-        if (pkgs == null || pkgs.indexOf(SSL_PKG) < 0) {
-            if (pkgs == null)
-                pkgs = SSL_PKG;
-            else
-                pkgs = pkgs + "|" + SSL_PKG;
-            System.setProperty("java.protocol.handler.pkgs", pkgs);
-            if (log.isLoggable(Level.FINE))
-                log.log(Level.FINE, "SAAJ0054.p2p.set.providers",
-                        new String[] { pkgs });
-            try {
-                Class c = Class.forName(SSL_PROVIDER);
-                Provider p = (Provider) c.newInstance();
-                Security.addProvider(p);
-                if (log.isLoggable(Level.FINE))
-                    log.log(Level.FINE, "SAAJ0055.p2p.added.ssl.provider",
-                            new String[] { SSL_PROVIDER });
-                //System.out.println("Added SSL_PROVIDER " + SSL_PROVIDER);
-                //setHttps = true;
-            } catch (Exception ex) {
-            }
-        }
-        //}
-    }
-
-    private void initAuthUserInfo(HttpURLConnection conn, String userInfo) {
-        String user;
-        String password;
-        if (userInfo != null) { // get the user and password
-            //System.out.println("UserInfo= " + userInfo );
-            int delimiter = userInfo.indexOf(':');
-            if (delimiter == -1) {
-                user = ParseUtil.decode(userInfo);
-                password = null;
-            } else {
-                user = ParseUtil.decode(userInfo.substring(0, delimiter++));
-                password = ParseUtil.decode(userInfo.substring(delimiter));
-            }
-
-            String plain = user + ":";
-            byte[] nameBytes = plain.getBytes();
-            byte[] passwdBytes = (password == null ? new byte[0] : password
-                    .getBytes());
-
-            // concatenate user name and password bytes and encode them
-            byte[] concat = new byte[nameBytes.length + passwdBytes.length];
-
-            System.arraycopy(nameBytes, 0, concat, 0, nameBytes.length);
-            System.arraycopy(
-                passwdBytes,
-                0,
-                concat,
-                nameBytes.length,
-                passwdBytes.length);
-            String auth = "Basic " + new String(Base64.encode(concat));
-            conn.setRequestProperty("Authorization", auth);
-            if (dL > 0)
-                d("Adding auth " + auth);
-        }
-    }
-
-    private static final int dL = 0;
-    private void d(String s) {
-        log.log(Level.SEVERE,
-                "SAAJ0013.p2p.HttpSOAPConnection",
-                new String[] { s });
-        System.err.println("HttpSOAPConnection: " + s);
-    }
-
-    private java.net.HttpURLConnection createConnection(URL endpoint)
-        throws IOException {
-        return (HttpURLConnection) endpoint.openConnection();
-    }
-
-}