diff --git a/pom.xml b/pom.xml index 5be0fa88a9..a44fd6a611 100644 --- a/pom.xml +++ b/pom.xml @@ -216,6 +216,14 @@ + + javax.transaction + jta + 1.1 + provided + true + + javax.servlet servlet-api diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidAXDataSource.java b/src/main/java/com/alibaba/druid/pool/xa/DruidAXDataSource.java new file mode 100644 index 0000000000..c65f9b70b6 --- /dev/null +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidAXDataSource.java @@ -0,0 +1,24 @@ +package com.alibaba.druid.pool.xa; + +import java.sql.SQLException; + +import javax.sql.XAConnection; +import javax.sql.XADataSource; + +import com.alibaba.druid.pool.DruidDataSource; + + +public class DruidAXDataSource extends DruidDataSource implements XADataSource { + private static final long serialVersionUID = 1L; + + @Override + public XAConnection getXAConnection() throws SQLException { + return null; + } + + @Override + public XAConnection getXAConnection(String user, String password) throws SQLException { + throw new UnsupportedOperationException("Not supported by DruidDataSource"); + } + +} diff --git a/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java b/src/main/java/com/alibaba/druid/pool/xa/DruidXAPoolableConnection.java similarity index 87% rename from src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java rename to src/main/java/com/alibaba/druid/pool/xa/DruidXAPoolableConnection.java index b400198a28..2afdae8912 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidXAPoolableConnection.java @@ -14,9 +14,9 @@ import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -public class XAPoolableConnection extends DruidPooledConnection implements XAResource { +public class DruidXAPoolableConnection extends DruidPooledConnection implements XAResource { - private final static Log LOG = LogFactory.getLog(XAPoolableConnection.class); + private final static Log LOG = LogFactory.getLog(DruidXAPoolableConnection.class); protected final XAConnection xaConnection; @@ -26,7 +26,7 @@ public class XAPoolableConnection extends DruidPooledConnection implements XARes private Lock stateLock = new ReentrantLock(); - public XAPoolableConnection(DruidConnectionHolder holder, XAConnection xaConnection) throws SQLException{ + public DruidXAPoolableConnection(DruidConnectionHolder holder, XAConnection xaConnection) throws SQLException{ super(holder); this.xaConnection = xaConnection;