Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wenshao
2013-07-15 15:51:50 +08:00
parent 7129ff5839 f11f77aa9f
commit 0b7fb95430
7 changed files with 23 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/util/MySqlUtils.java
+13 -1
View File
@@ -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);
}
}
src/main/resources/support/http/resources/js/common.js
+1 -1
View File
@@ -21,7 +21,7 @@ druid.common = function () {
$(document.body).prepend(html);
druid.lang.trigger();
$(".navbar .nav li").eq(index).addClass("active");
});
},"html");
},
src/main/resources/support/http/resources/spring-detail.html
+1 -1
View File
@@ -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);
},
src/main/resources/support/http/resources/webapp.html
+5 -101
View File
@@ -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;
}
}
}();
src/main/resources/support/http/resources/websession-detail.html
+1 -1
View File
@@ -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');
},
src/main/resources/support/http/resources/weburi-detail.html
+1 -1
View File
@@ -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');
},
src/main/resources/support/http/resources/weburi.html
+1 -14
View File
@@ -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>