From f10fdcf6fc8511c2e343cd4e519d24cabea56797 Mon Sep 17 00:00:00 2001
From: yaowei <pathfinder.name@gmail.com>
Date: Wed, 3 Jul 2013 16:49:41 +0800
Subject: [PATCH 1/3] support pinGlobalTxToPhysicalConnection setting.

---
 .../java/com/alibaba/druid/util/MySqlUtils.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/util/MySqlUtils.java b/src/main/java/com/alibaba/druid/util/MySqlUtils.java
index 1edede3b94..2c50437ed0 100644
--- a/src/main/java/com/alibaba/druid/util/MySqlUtils.java
+++ b/src/main/java/com/alibaba/druid/util/MySqlUtils.java
@@ -20,11 +20,23 @@ import java.sql.SQLException;
 
 import javax.sql.XAConnection;
 
+import com.mysql.jdbc.Util;
 import com.mysql.jdbc.jdbc2.optional.MysqlXAConnection;
+import com.mysql.jdbc.jdbc2.optional.SuspendableXAConnection;
 
 public class MySqlUtils {
 
     public static XAConnection createXAConnection(Connection physicalConn) throws SQLException {
-        return new MysqlXAConnection((com.mysql.jdbc.ConnectionImpl) physicalConn, false);
+    	com.mysql.jdbc.ConnectionImpl mysqlConn = (com.mysql.jdbc.ConnectionImpl)physicalConn;
+    	if(mysqlConn.getPinGlobalTxToPhysicalConnection()) {
+
+    		if (!Util.isJdbc4()) {
+    			return new SuspendableXAConnection(mysqlConn);
+    		}
+
+    		return new com.mysql.jdbc.jdbc2.optional.JDBC4SuspendableXAConnection(mysqlConn);
+    	
+    	}
+        return new MysqlXAConnection(mysqlConn, false);
     }
 }

From 4b836ddc47e19686e6af79ee190ea6d5c4db6b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=98=B3?= <gaoyang@cmstop.com>
Date: Tue, 9 Jul 2013 22:16:37 +0800
Subject: [PATCH 2/3] deleted some code that not used. corrected the menu's
 index in some page.

---
 .../support/http/resources/spring-detail.html |   2 +-
 .../support/http/resources/webapp.html        | 106 +-----------------
 .../http/resources/websession-detail.html     |   2 +-
 .../support/http/resources/weburi-detail.html |   2 +-
 .../support/http/resources/weburi.html        |  15 +--
 5 files changed, 9 insertions(+), 118 deletions(-)

diff --git a/src/main/resources/support/http/resources/spring-detail.html b/src/main/resources/support/http/resources/spring-detail.html
index 2adac32527..d64cebf255 100644
--- a/src/main/resources/support/http/resources/spring-detail.html
+++ b/src/main/resources/support/http/resources/spring-detail.html
@@ -105,7 +105,7 @@
     		var method = druid.common.getUrlVar("method");
     		return  {
     			init : function() {
-    				druid.common.buildHead(6);
+    				druid.common.buildHead(7);
     				this.ajaxRequestForBasicInfo();
     				$("#viewJsonApi").attr("href", 'spring-detail.json?class=' + clazz + '&method=' + method);
     			},
diff --git a/src/main/resources/support/http/resources/webapp.html b/src/main/resources/support/http/resources/webapp.html
index 1f3fe4cedb..79fb120d28 100644
--- a/src/main/resources/support/http/resources/webapp.html
+++ b/src/main/resources/support/http/resources/webapp.html
@@ -27,7 +27,7 @@
 				{{~ it.content :contextNow:i  }}
 				<ul class="nav nav-tabs" id="datasourceTab{{=i}}">
 					<li class="active">
-						<a 	href="webapp.html#dstab/{{=contextNow.ContextPath}}">WebApp-/{{=contextNow.ContextPath}}</a>
+						<a 	href="webapp.html#dstab/{{=contextNow.ContextPath}}">WebApp-{{=contextNow.ContextPath}}</a>
 					</li>
 				</ul>
 				<div class="tab-content">
@@ -49,68 +49,7 @@
     	<script type="text/javascript">
 			$.namespace("druid.datasource");
 			druid.datasource = function () {  
-				var keys = [
-				            "ContextPath", 
-				            "RunningCount", 
-				            "ConcurrentMax", 
-				            "RequestCount",
-				            "SessionCount",
-				            
-				            "JdbcCommitCount", 
-				            "JdbcRollbackCount", 
-				            "JdbcExecuteCount", 
-				            "JdbcExecuteTimeMillis",
-				            "JdbcFetchRowCount",
-				            "JdbcUpdateCount",
-				            "OSMacOSXCount",
-				            "OSWindowsCount",
-				            "OSLinuxCount",
-				            "OSSymbianCount",
-				            "OSFreeBSDCount",
-				            "OSOpenBSDCount",
-				            "OSAndroidCount",
-				            "OSWindows98Count",
-				            "OSWindowsXPCount",
-				            "OSWindows2000Count",
-				            "OSWindowsVistaCount",
-				            "OSWindows7Count",
-				            "OSAndroid15Count",
-				            "OSAndroid16Count",
-				            "OSAndroid20Count",
-				            "OSAndroid21Count",
-				            "OSAndroid22Count",
-				            "OSAndroid23Count",
-				            "OSAndroid30Count",
-				            "OSAndroid31Count",
-				            "OSAndroid32Count",
-				            "OSAndroid40Count",
-				            "OSLinuxUbuntuCount",
-				            "BrowserIECount",
-				            "BrowserFirefoxCount",
-				            "BrowserChromeCount",
-				            "BrowserSafariCount",
-				            "BrowserOperaCount",
-				            "BrowserIE5Count",
-				            "BrowserIE6Count",
-				            "BrowserIE7Count",
-				            "BrowserIE8Count",
-				            "BrowserIE9Count",
-				            "BrowserIE10Count",
-				            "Browser360SECount",
-				            "DeviceAndroidCount",
-				            "DeviceIpadCount",
-				            "DeviceIphoneCount",
-				            "DeviceWindowsPhoneCount",
-				            "BotCount",
-				            "BotBaiduCount",
-				            "BotYoudaoCount", 
-				            "BotGoogleCount",
-				            "BotMsnCount",
-				            "BotBingCount",
-				            "BotSosoCount",
-				            "BotSogouCount",
-				            "BotYahooCount"
-				            ];
+				
 				return  {
 					init : function() {
 						druid.common.buildHead(4);
@@ -123,15 +62,7 @@
 							success: function(data) {
 								var datasourceList = data.Content;
 								
-//								var tab = '<ul class="nav nav-tabs" id="datasourceTab">';
-//								var content = '<div class="tab-content">';
-//								for ( var i = 0; i < datasourceList.length; i++) {
-//									var datasource = datasourceList[i];
-//									content += druid.datasource.generateDataSourceTable(datasource, i);
-//									tab += druid.datasource.generateDataSourceTab(datasource.ContextPath, i);
-//								}
-//								tab += '</ul>';
-//								content += '</div>';
+
 								var tmpl = $('#webapp-template').html();
 								var contents = {'content' : datasourceList};
 								var doTtmpl = doT.template(tmpl);
@@ -147,36 +78,9 @@
 							},
 							dataType: "json"
 						});
-					},
-					
-					generateDataSourceTab : function(datasourceId, index) {
-						if(index == 0)
-							return '<li class="active"><a href="#dstab' + datasourceId + '">WebApp-'+datasourceId+'</a></li>';
-						else
-							return '<li><a href="#dstab' + datasourceId + '">DataSource-'+datasourceId+'</a></li>';
-					},
-					
-					generateDataSourceTable : function(datasource, index) {
-						var contextPath = datasource.ContextPath;
-						
-						if(index == 0)
-							var html = '<div class="tab-pane active" id="dstab' + contextPath + '">';
-						else
-							var html = '<div class="tab-pane" id="dstab' + contextPath + '">';
-						
-						html += '<table class="table table-bordered" style="background-color: #fff">';
-						
-						for(var i=0, len=keys.length; i<len; i++) {
-							var value = datasource[keys[i]];
-							if(value == null)
-								value = "";
-							
-							html += '<tr><td valign="top" class="td_lable">' + keys[i] + '</td><td>' + value + '</td></tr>'
-						}
-						
-						html += '</table></div>';
-						return html;
 					}
+					
+					
 				}
 			}();
 	
diff --git a/src/main/resources/support/http/resources/websession-detail.html b/src/main/resources/support/http/resources/websession-detail.html
index 02fbed7fd4..13f5afafc1 100644
--- a/src/main/resources/support/http/resources/websession-detail.html
+++ b/src/main/resources/support/http/resources/websession-detail.html
@@ -116,7 +116,7 @@
     		var sessionId = druid.common.getUrlVar("sessionId");
     		return  {
     			init : function() {
-    				druid.common.buildHead(5);
+    				druid.common.buildHead(6);
     				this.ajaxRequestForBasicInfo();
     				$("#viewJsonApi").attr("href", 'websession-' + sessionId + '.json');
     			},
diff --git a/src/main/resources/support/http/resources/weburi-detail.html b/src/main/resources/support/http/resources/weburi-detail.html
index b2bdcd0330..33d5e859ca 100644
--- a/src/main/resources/support/http/resources/weburi-detail.html
+++ b/src/main/resources/support/http/resources/weburi-detail.html
@@ -147,7 +147,7 @@
     		var uri = druid.common.getUrlVar("uri");
     		return  {
     			init : function() {
-    				druid.common.buildHead(4);
+    				druid.common.buildHead(5);
     				this.ajaxRequestForBasicInfo();
     				$("#viewJsonApi").attr("href", 'weburi-' + encodeURI(uri) + '.json');
     			},
diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html
index 00a8df1ac2..25f95ab9fd 100644
--- a/src/main/resources/support/http/resources/weburi.html
+++ b/src/main/resources/support/http/resources/weburi.html
@@ -22,20 +22,7 @@
 							<thead>
 								<tr>
 									<th>N</th>
-									<!-- 
-									<th><a id="th-URI" >URI</a></th>
-									<th width="50"><a id="th-RequestCount" >RequestCount</a></th>
-									<th width="50"><a id="th-RequestTimeMillis" >RequestTime</a></th>
-									<th width="50"><a id="th-RunningCount" >Running</a></th>
-									<th width="50" title="Concurrent Max"><a id="th-ConcurrentMax" >Concurrent</a></th>
-									<th width="50" title="Jdbc Execute Count"><a id="th-JdbcExecuteCount" >JdbcCount</a></th>
-									<th width="50" title="Jdbc Execute Error Count"><a id="th-JdbcExecuteErrorCount" >JdbcError</a></th>
-									<th width="50" title="Jdbc Execute Time"><a id="th-JdbcExecuteTimeMillis" >JdbcTime</a></th>
-									<th width="50"><a id="th-JdbcCommitCount" >JdbcCommit</a></th>
-									<th width="50"><a id="th-JdbcRollbackCount" >JdbcRollback</a></th>
-									<th width="50"><a id="th-JdbcFetchRowCount" >JdbcFetchRow</a></th>
-									<th width="50"><a id="th-JdbcUpdateCount" >JdbcUpdate</a></th>
-									 -->
+									
 									<th><a id="th-URI" class="lang" langKey="URI">URI</a></th>
 									<th><a id="th-RequestCount" class="lang" langKey="RequestCount">RequestCount</a></th>
 									<th><a id="th-RequestTimeMillis" class="lang" langKey="RequestTimeMillis">RequestTimeMillis</a></th>

From 3b82f9315c1bfc5b584a8589da7d888c732633bf Mon Sep 17 00:00:00 2001
From: "shrek.wang" <shrek.wang@gmail.com>
Date: Mon, 15 Jul 2013 15:35:38 +0800
Subject: [PATCH 3/3] fix head navigation bar not show up problem in firefox
 browser

---
 src/main/resources/support/http/resources/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js
index 4e0a97dcd7..d365e5bbf8 100644
--- a/src/main/resources/support/http/resources/js/common.js
+++ b/src/main/resources/support/http/resources/js/common.js
@@ -21,7 +21,7 @@ druid.common = function () {
 				$(document.body).prepend(html);
 				druid.lang.trigger();
 				$(".navbar .nav li").eq(index).addClass("active");
-			});
+			},"html");
 						
 		},