JDBC-618 Rename package org.firebirdsql.jca to org.firebirdsql.jaybir…

…d.xca

src/main/org/firebirdsql/ds/FBConnectionPoolDataSource.java

@@ -31,7 +31,7 @@
 
 import org.firebirdsql.gds.impl.GDSFactory;
 import org.firebirdsql.gds.impl.GDSType;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 import org.firebirdsql.jdbc.FBDataSource;
 import org.firebirdsql.jdbc.FBSQLException;
 

src/main/org/firebirdsql/ds/FBSimpleDataSource.java

@@ -22,7 +22,7 @@
 import org.firebirdsql.gds.TransactionParameterBuffer;
 import org.firebirdsql.gds.impl.GDSFactory;
 import org.firebirdsql.gds.impl.GDSType;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 import org.firebirdsql.jdbc.FBDataSource;
 import org.firebirdsql.jdbc.FirebirdConnectionProperties;
 

src/main/org/firebirdsql/ds/FBXAConnection.java

@@ -25,7 +25,7 @@
 import javax.sql.XAConnection;
 import javax.transaction.xa.XAResource;
 
-import org.firebirdsql.jca.FBManagedConnection;
+import org.firebirdsql.jaybird.xca.FBManagedConnection;
 import org.firebirdsql.jdbc.FBConnection;
 import org.firebirdsql.jdbc.FBSQLException;
 import org.firebirdsql.jdbc.SQLStateConstants;

src/main/org/firebirdsql/ds/FBXADataSource.java

@@ -35,8 +35,8 @@
 
 import org.firebirdsql.gds.impl.GDSFactory;
 import org.firebirdsql.gds.impl.GDSType;
-import org.firebirdsql.jca.FBManagedConnection;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBManagedConnection;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 import org.firebirdsql.jdbc.FBConnection;
 import org.firebirdsql.jdbc.FBDataSource;
 import org.firebirdsql.jdbc.FBSQLException;

src/main/org/firebirdsql/jca/FBConnectionRequestInfo.java → src/main/org/firebirdsql/jaybird/xca/FBConnectionRequestInfo.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import org.firebirdsql.encodings.Encoding;
 import org.firebirdsql.gds.DatabaseParameterBuffer;

src/main/org/firebirdsql/jca/FBIncorrectXidException.java → src/main/org/firebirdsql/jaybird/xca/FBIncorrectXidException.java

@@ -1,5 +1,5 @@
 /*
- * Firebird Open Source J2ee connector - jdbc driver
+ * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
  * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html
@@ -12,11 +12,11 @@
  * This file was created by members of the firebird development team.
  * All individual contributions remain the Copyright (C) of those
  * individuals.  Contributors to this file are either listed here or
- * can be obtained from a CVS history command.
+ * can be obtained from a source control history command.
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 /**
  * This error is thrown when message read from the RDB$TRANSACTIONS table does

src/main/org/firebirdsql/jca/FBLocalTransaction.java → src/main/org/firebirdsql/jaybird/xca/FBLocalTransaction.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import org.firebirdsql.jdbc.FBConnection;
 import org.firebirdsql.jdbc.SQLStateConstants;

src/main/org/firebirdsql/jca/FBManagedConnection.java → src/main/org/firebirdsql/jaybird/xca/FBManagedConnection.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import org.firebirdsql.gds.*;
 import org.firebirdsql.gds.impl.DatabaseParameterBufferExtension;

src/main/org/firebirdsql/jca/FBManagedConnectionFactory.java → src/main/org/firebirdsql/jaybird/xca/FBManagedConnectionFactory.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import org.firebirdsql.gds.DatabaseParameterBuffer;
 import org.firebirdsql.gds.GDSException;

src/main/org/firebirdsql/jca/FBManagedConnectionMetaData.java → src/main/org/firebirdsql/jaybird/xca/FBManagedConnectionMetaData.java

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
@@ -18,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import javax.resource.spi.ManagedConnectionMetaData;
 import javax.resource.ResourceException;

src/main/org/firebirdsql/jca/FBResourceException.java → src/main/org/firebirdsql/jaybird/xca/FBResourceException.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import org.firebirdsql.jdbc.SQLStateConstants;
 

src/main/org/firebirdsql/jca/FBResourceTransactionException.java → src/main/org/firebirdsql/jaybird/xca/FBResourceTransactionException.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 /**
  * Exception represents transaction error in resource.

src/main/org/firebirdsql/jca/FBStandAloneConnectionManager.java → src/main/org/firebirdsql/jaybird/xca/FBStandAloneConnectionManager.java

@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import java.io.Serializable;
 

src/main/org/firebirdsql/jca/FBTpb.java → src/main/org/firebirdsql/jaybird/xca/FBTpb.java

@@ -1,7 +1,5 @@
 /*
- * $Id$
- * 
- * Firebird Open Source J2ee connector - jdbc driver
+ * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
  * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html
@@ -14,12 +12,12 @@
  * This file was created by members of the firebird development team.
  * All individual contributions remain the Copyright (C) of those
  * individuals.  Contributors to this file are either listed here or
- * can be obtained from a CVS history command.
+ * can be obtained from a source control history command.
  *
  * All rights reserved.
  */
 
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import java.io.Serializable;
 

src/main/org/firebirdsql/jca/FBXAException.java → src/main/org/firebirdsql/jaybird/xca/FBXAException.java

@@ -1,5 +1,5 @@
 /*
- * Firebird Open Source J2ee connector - jdbc driver
+ * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
  * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html
@@ -12,11 +12,11 @@
  * This file was created by members of the firebird development team.
  * All individual contributions remain the Copyright (C) of those
  * individuals.  Contributors to this file are either listed here or
- * can be obtained from a CVS history command.
+ * can be obtained from a source control history command.
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;

src/main/org/firebirdsql/jca/FBXid.java → src/main/org/firebirdsql/jaybird/xca/FBXid.java

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
@@ -18,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import javax.resource.ResourceException;
 import javax.transaction.xa.Xid;

src/main/org/firebirdsql/jca/FatalGDSErrorHelper.java → src/main/org/firebirdsql/jaybird/xca/FatalGDSErrorHelper.java

@@ -1,5 +1,5 @@
 /*
- * Firebird Open Source J2ee connector - jdbc driver
+ * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
  * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html
@@ -12,11 +12,11 @@
  * This file was created by members of the firebird development team.
  * All individual contributions remain the Copyright (C) of those
  * individuals.  Contributors to this file are either listed here or
- * can be obtained from a CVS history command.
+ * can be obtained from a source control history command.
  *
  * All rights reserved.
  */
-package org.firebirdsql.jca;
+package org.firebirdsql.jaybird.xca;
 
 import java.sql.SQLException;
 import java.util.Arrays;

src/main/org/firebirdsql/jaybird/xca/FirebirdLocalTransaction.java

@@ -0,0 +1,50 @@
+/*
+ * Firebird Open Source JavaEE Connector - JDBC Driver
+ *
+ * Distributable under LGPL license.
+ * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html
+ *
+ * This program 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
+ * LGPL License for more details.
+ *
+ * This file was created by members of the firebird development team.
+ * All individual contributions remain the Copyright (C) of those
+ * individuals.  Contributors to this file are either listed here or
+ * can be obtained from a source control history command.
+ *
+ * All rights reserved.
+ */
+package org.firebirdsql.jaybird.xca;
+
+import javax.resource.ResourceException;
+import javax.resource.spi.LocalTransaction;
+import javax.transaction.xa.Xid;
+
+
+/**
+ * Extention of the {@link javax.resource.spi.LocalTransaction} interface
+ * to tell whether the underlying managed connection is currently participating
+ * in some transaction or not and to obtain the associated Xid.
+ */
+public interface FirebirdLocalTransaction extends LocalTransaction {
+
+    /**
+     * Check if managed connection is currently participating in transaction.
+     * 
+     * @return <code>true</code> if managed connection is participating in
+     * transaction.
+     * 
+     * @throws ResourceException if operation cannot be completed.
+     */
+    boolean inTransaction() throws ResourceException;
+
+    /**
+     * Get the associated Xid.
+     * 
+     * @return instance of {@link Xid} representing a transaction ID that is
+     * managed by this local transaction.
+     */
+    Xid getXid();
+}

src/main/org/firebirdsql/jdbc/FBConnection.java

@@ -26,10 +26,10 @@
 import org.firebirdsql.gds.impl.GDSHelper;
 import org.firebirdsql.gds.ng.FbDatabase;
 import org.firebirdsql.gds.ng.FbExceptionBuilder;
-import org.firebirdsql.jca.FBConnectionRequestInfo;
-import org.firebirdsql.jca.FBLocalTransaction;
-import org.firebirdsql.jca.FBManagedConnection;
-import org.firebirdsql.jca.FirebirdLocalTransaction;
+import org.firebirdsql.jaybird.xca.FBConnectionRequestInfo;
+import org.firebirdsql.jaybird.xca.FBLocalTransaction;
+import org.firebirdsql.jaybird.xca.FBManagedConnection;
+import org.firebirdsql.jaybird.xca.FirebirdLocalTransaction;
 import org.firebirdsql.jdbc.escape.FBEscapedParser;
 import org.firebirdsql.logging.Logger;
 import org.firebirdsql.logging.LoggerFactory;

src/main/org/firebirdsql/jdbc/FBConnectionProperties.java

@@ -24,7 +24,7 @@
 import org.firebirdsql.gds.ParameterBufferHelper;
 import org.firebirdsql.gds.TransactionParameterBuffer;
 import org.firebirdsql.gds.impl.DatabaseParameterBufferImp;
-import org.firebirdsql.jca.FBResourceException;
+import org.firebirdsql.jaybird.xca.FBResourceException;
 
 import java.io.Serializable;
 import java.sql.Connection;

src/main/org/firebirdsql/jdbc/FBDataSource.java

@@ -19,8 +19,8 @@
 package org.firebirdsql.jdbc;
 
 import org.firebirdsql.ds.RootCommonDataSource;
-import org.firebirdsql.jca.FBConnectionRequestInfo;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBConnectionRequestInfo;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 
 import javax.naming.Reference;
 import javax.resource.Referenceable;

src/main/org/firebirdsql/jdbc/FBDatabaseMetaData.java

@@ -29,7 +29,7 @@
 import org.firebirdsql.gds.ng.fields.RowValue;
 import org.firebirdsql.gds.ng.fields.RowValueBuilder;
 import org.firebirdsql.jaybird.Version;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 import org.firebirdsql.jdbc.escape.FBEscapedFunctionHelper;
 import org.firebirdsql.jdbc.metadata.*;
 import org.firebirdsql.logging.Logger;

src/main/org/firebirdsql/jdbc/FBDriver.java

@@ -24,7 +24,7 @@
 import org.firebirdsql.gds.impl.GDSType;
 import org.firebirdsql.gds.ng.FbExceptionBuilder;
 import org.firebirdsql.jaybird.Version;
-import org.firebirdsql.jca.FBManagedConnectionFactory;
+import org.firebirdsql.jaybird.xca.FBManagedConnectionFactory;
 import org.firebirdsql.logging.Logger;
 import org.firebirdsql.logging.LoggerFactory;
 

src/main/org/firebirdsql/jdbc/FBSQLException.java

@@ -23,8 +23,8 @@
 import javax.resource.ResourceException;
 
 import org.firebirdsql.gds.GDSException;
-import org.firebirdsql.jca.FBResourceException;
-import org.firebirdsql.jca.FBXAException;
+import org.firebirdsql.jaybird.xca.FBResourceException;
+import org.firebirdsql.jaybird.xca.FBXAException;
 
 public class FBSQLException extends SQLException {