Merge
authorlana
Mon, 12 Jan 2015 12:24:50 -0800
changeset 28314 87aeabf7ffa2
parent 28312 d222e993dbbf (current diff)
parent 28313 4031f01fb540 (diff)
child 28315 760c5c566354
Merge
corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java
corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java
corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java
corba/src/java.corba/share/classes/javax/transaction/package.html
corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java
corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java
corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java
corba/src/java.sql/share/classes/javax/transaction/xa/package.html
--- a/corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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	Thu Jan 08 12:08:21 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>