[esb-java-dev] svn commit r730 - in esb/java/trunk/modules:
core/src/main/java/org/wso2/esb/services
distribution/src/main/www/extensions/core/css
distribution/src/main/www/extensions/core/js
distribution/src/main/www/extensions/core/xslt
svn at wso2.com
svn at wso2.com
Mon Feb 5 04:31:38 PST 2007
Author: indika
Date: Mon Feb 5 04:31:13 2007
New Revision: 730
Added:
esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl
- copied, changed from r725, esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl
Removed:
esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl
Modified:
esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
esb/java/trunk/modules/distribution/src/main/www/extensions/core/css/wso2-esb.css
esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/logs.js
esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/trace.js
Log:
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java Mon Feb 5 04:31:13 2007
@@ -41,7 +41,7 @@
ServerStatus serverStatus = new ServerStatus();
serverStatus.update(getAxisConfig());
return serverStatus;
- }
+ }
public ServerData getServerData() throws AxisFault {
@@ -95,7 +95,7 @@
int DEFAULT_NO_OF_LOGS = 100;
String DEFAULT_LOGGING_PATTERN = "%5p [%d] [%t] %C{1} - %m%n";
- MemoryAppender memoryAppender = (MemoryAppender) Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER") ;
+ MemoryAppender memoryAppender = (MemoryAppender) Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER") ;
if ((memoryAppender == null) ||
(memoryAppender.getCircularQueue() == null) ||
(memoryAppender.getCircularQueue().getObjects(amount) ==
Modified: esb/java/trunk/modules/distribution/src/main/www/extensions/core/css/wso2-esb.css
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/www/extensions/core/css/wso2-esb.css (original)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/css/wso2-esb.css Mon Feb 5 04:31:13 2007
@@ -338,9 +338,17 @@
margin: 0;
}
.trace{
-
+ border:gray;
+ border-style:solid;
+ border-width:thin;
height:400px;
}
+table.log td{
+ width:70%;
+ border-bottom:gray;
+ border-bottom-style:solid;
+ border-bottom-width:thin;
+}
div#boxone1 {
float: left;
margin-left: 0;
Modified: esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/logs.js
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/logs.js (original)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/logs.js Mon Feb 5 04:31:13 2007
@@ -18,14 +18,6 @@
log.js contains scripts need to handle log information.
*/
-// Adding some colors to the logs
-var TRACE_color = "#FFFFFFFF";
-var DEBUG_color = "#C6FFFF";
-var INFO_color = "#B4F3FF";
-var WARN_color = "#FEE3A1";
-var ERROR_color = "#F7B761";
-var FATAL_color = "#EA8823";
-
function viewLogs() {
var body_xml = '<ns1:getLogsRequest xmlns:ns1="http://org.apache.synapse/xsd">' +
@@ -41,40 +33,10 @@
if (!onError()) {
return;
}
- var objDiv = document.getElementById("divViewLogs");
+ var objDiv = document.getElementById("divTracer");
var data = getBody(xhReq.responseXML);
- var strHTML = "<div style=\"align:left;\"><h2> System Log <img src='extensions/core/images/help.gif' alt='' onmouseover='showHelp(event,"+'logHelpDiv'+","+'-10'+","+'50'+")' onmouseout='hideHelp(event,"+'logHelpDiv'+")' /></h2>"+
- "<div id='logHelpDiv' style='background-color:#99cccc;position:absolute;visibility:hidden;padding:5px;z-index:600;'> "+
- "<span style='font-weight:bold;'>Custom ToolTip </span><br/> More details can go there </div>"+
- '<div id="formset"><form><fieldset>' +
- '<legend>System Log</legend>' +
- "<div style='overflow: auto; height: 480px'>";
-
- var rets = data.getElementsByTagName("return");
- var len = rets.length;
- var count;
-
- var str_line_type = "";
- var str_line_color = "";
- for (count = 0; count < len; count++) {
- str_line_type = rets[count].firstChild.nodeValue;
- str_line_type = str_line_type.substring(0, 6);
- str_line_color = getLogLineColor(str_line_type);
- strHTML += "<p style='background-color: " + str_line_color + ";border:1px solid #D0D0D0;'>" + rets[count].firstChild.nodeValue + "</p>";
- }
- strHTML += "</div></fieldset></form></div></div>"
- objDiv.innerHTML = strHTML;
- showOnlyOneMain(objDiv);
-
-
+ callbackhelper("viewlog.xsl", objDiv);
+ showOnlyOneMain(objDiv);
}
-function getLogLineColor(str_line_type) {
- if (str_line_type == "TRACE ") return TRACE_color;
- if (str_line_type == "DEBUG ") return DEBUG_color;
- if (str_line_type == " INFO ") return INFO_color;
- if (str_line_type == " WARN ") return WARN_color;
- if (str_line_type == "ERROR ") return ERROR_color;
- if (str_line_type == "FATAL ") return FATAL_color;
-}
Modified: esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/trace.js
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/trace.js (original)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/js/trace.js Mon Feb 5 04:31:13 2007
@@ -36,7 +36,7 @@
}
var objDiv = document.getElementById("divTracer");
var data = getBody(xhReq.responseXML);
- callbackhelper("veiwtracelogs.xsl", objDiv);
+ callbackhelper("viewtracelogs.xsl", objDiv);
showOnlyOneMain(objDiv);
}
Added: esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
==============================================================================
--- (empty file)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl Mon Feb 5 04:31:13 2007
@@ -0,0 +1,111 @@
+<!--
+ ~ Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="html"/>
+ <xsl:template match="*">
+ <div id='formset'>
+ <h2 id="moduleHeader">System Logs</h2>
+ <br></br>
+ <form>
+ <fieldset>
+ <legend>System Log</legend>
+ <xsl:choose>
+ <xsl:when test="count(//return)!=0">
+ <div class="trace">
+ <table class="log">
+ <tbody>
+ <xsl:call-template name="print-row">
+ <xsl:with-param name="value">
+ <xsl:value-of select="count(//return)"/>
+ </xsl:with-param>
+ <xsl:with-param name="limit">
+ <xsl:value-of select="count(//return)"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </tbody>
+ </table>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <br/>
+ <i>
+ <font style='color: brown'>Currently there are no Log Messages
+ Present</font>
+ </i>
+ <br/>
+ <br/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fieldset>
+ </form>
+ </div>
+ </xsl:template>
+ <xsl:template name="print-row">
+ <xsl:param name="value"/>
+ <xsl:param name="limit"/>
+ <xsl:if test="$value != 0">
+ <xsl:if test="$value mod 2 = 0">
+ <tr>
+ <xsl:call-template name="print-logs">
+ <xsl:with-param name="index" select="($limit +1) - $value"/>
+ </xsl:call-template>
+ </tr>
+ <xsl:call-template name="print-row">
+ <xsl:with-param name="value" select="$value - 1"/>
+ <xsl:with-param name="limit" select="$limit"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="$value mod 2 = 1">
+ <tr bgcolor="#E3E4FA">
+ <xsl:call-template name="print-logs">
+ <xsl:with-param name="index" select="($limit +1) - $value"/>
+ </xsl:call-template>
+ </tr>
+ <xsl:call-template name="print-row">
+ <xsl:with-param name="value" select="$value - 1"/>
+ <xsl:with-param name="limit" select="$limit"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="print-logs">
+ <xsl:param name="index"/>
+ <xsl:variable name="logStr" select="substring(//return[$index]/child::text(),0,6)"/>
+ <td border-bottom="gray" border-bottom-style="inset">
+ <xsl:if test="$logStr='ERROR'">
+ <img src="extensions/core/images/_delete.gif"/>
+ </xsl:if>
+ <xsl:if test="$logStr=' INFO'">
+ <img src="extensions/core/images/help.gif"/>
+ </xsl:if>
+ <xsl:if test="$logStr='TRACE'">
+ <img src="extensions/core/images/_delete.gif"/>
+ </xsl:if>
+ <xsl:if test="$logStr=' WARN'">
+ <img src="extensions/core/images/help.gif"/>
+ </xsl:if>
+ <xsl:if test="$logStr='DEBUG'">
+ <img src="extensions/core/images/_delete.gif"/>
+ </xsl:if>
+ <xsl:if test="$logStr='FATAL'">
+ <img src="extensions/core/images/_delete.gif"/>
+ </xsl:if>
+   <xsl:value-of select="//return[$index]/child::text()"/>
+ </td>
+ </xsl:template>
+</xsl:stylesheet>
Copied: esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl (from r725, esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl)
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl (original)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl Mon Feb 5 04:31:13 2007
@@ -27,7 +27,7 @@
<xsl:choose>
<xsl:when test="count(//return)!=0">
<div class="trace">
- <table width="70%">
+ <table class="log">
<tbody>
<xsl:call-template name="print-row">
<xsl:with-param name="value">
More information about the Esb-java-dev
mailing list