From c56c8530aeb61f2602b8e75c4d317fc608470d7b Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@gmail.com>
Date: Sun, 23 Dec 2012 15:00:51 +0800
Subject: [PATCH 1/2] jtds xa support 1.2.x & 1.3.0

---
 pom.xml                                       | 29 +++++++------------
 .../alibaba/druid/pool/xa/JtdsXAResource.java | 28 ++++++++++++++++--
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 678f10eac5..b367749f93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,15 @@
 	<inceptionYear>2012</inceptionYear>
 
 	<properties>
-		<gpg.skip>true</gpg.skip>
+		<spring.version>3.1.1.RELEASE</spring.version>
 		<junit.version>4.10</junit.version>
+
+		<gpg.skip>true</gpg.skip>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jdk.version>1.6</jdk.version>
 	</properties>
+
 	<repositories>
-		<repository>
-			<id>bonecp</id>
-			<name>bonecp</name>
-			<url>http://jolbox.com/bonecp/downloads/maven/</url>
-			<layout>default</layout>
-		</repository>
 		<repository>
 			<id>alibaba</id>
 			<name>alibaba</name>
@@ -34,12 +33,6 @@
 			<url>file://${basedir}/lib/</url>
 			<layout>default</layout>
 		</repository>
-
-		<repository>
-			<id>springsource-repo</id>
-			<name>SpringSource Repository</name>
-			<url>http://repo.springsource.org/release</url>
-		</repository>
 	</repositories>
 
 	<distributionManagement>
@@ -337,21 +330,21 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>3.1.1.RELEASE</version>
+			<version>${spring.version}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>3.1.1.RELEASE</version>
+			<version>${spring.version}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>3.1.1.RELEASE</version>
+			<version>${spring.version}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -399,13 +392,13 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.20</version>
+			<version>5.1.22</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
 			<artifactId>jtds</artifactId>
-			<version>1.2.7</version>
+			<version>1.3.0</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
index f258687d1a..c59585281d 100644
--- a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
+++ b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
@@ -15,25 +15,47 @@
  */
 package com.alibaba.druid.pool.xa;
 
+import java.lang.reflect.Method;
 import java.sql.Connection;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import net.sourceforge.jtds.jdbc.ConnectionJDBC2;
 import net.sourceforge.jtds.jdbc.XASupport;
 
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+
 public class JtdsXAResource implements XAResource {
 
+    private final static Log       LOG = LogFactory.getLog(JtdsXAResource.class);
+
     private final Connection       connection;
     private final JtdsXAConnection xaConnection;
-    private final String           rmHost;
+    private String                 rmHost;
+
+    private static Method          method;
 
     public JtdsXAResource(JtdsXAConnection xaConnection, Connection connection){
         this.xaConnection = xaConnection;
         this.connection = connection;
-        rmHost = ((ConnectionJDBC2) connection).getRmHost();
+
+        if (method == null) {
+            try {
+                method = connection.getClass().getMethod("getRmHost");
+            } catch (Exception e) {
+                LOG.error("getRmHost method error", e);
+            }
+        }
+
+        if (method != null) {
+            try {
+                rmHost = (String) method.invoke(connection);
+            } catch (Exception e) {
+                LOG.error("getRmHost error", e);
+            }
+        }
     }
 
     protected JtdsXAConnection getResourceManager() {

From 82488c8ae159df39d01397e83f47aa164b314552 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@gmail.com>
Date: Sun, 23 Dec 2012 15:16:05 +0800
Subject: [PATCH 2/2] refactor pom.xml

---
 pom.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index b367749f93..aa6d58e705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<spring.version>3.1.1.RELEASE</spring.version>
-		<junit.version>4.10</junit.version>
+		<junit.version>4.11</junit.version>
 
 		<gpg.skip>true</gpg.skip>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,12 +22,6 @@
 	</properties>
 
 	<repositories>
-		<repository>
-			<id>alibaba</id>
-			<name>alibaba</name>
-			<url>http://code.alibabatech.com/mvn/releases/</url>
-			<layout>default</layout>
-		</repository>
 		<repository>
 			<id>local-file</id>
 			<url>file://${basedir}/lib/</url>
@@ -89,7 +83,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.0</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<source>1.6</source>
@@ -100,7 +94,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12.2</version>
+				<version>2.12.4</version>
 				<configuration>
 					<includes>
 						<include>**/bvt/**/*.java</include>
@@ -111,7 +105,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.1</version>
+				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -127,7 +121,7 @@
 
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.8.1</version>
+				<version>2.9</version>
 				<executions>
 					<execution>
 						<id>attach-javadoc</id>
@@ -150,6 +144,7 @@
 
 			<plugin>
 				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.4</version>
 				<configuration>
 					<skip>${gpg.skip}</skip>
 				</configuration>