Return-Path: 
 <scm-return-24403-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 61119 invoked from network); 17 Jan 2008 03:36:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Jan 2008 03:36:48 -0000
Received: (qmail 81438 invoked by uid 500); 17 Jan 2008 03:36:38 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 81385 invoked by uid 500); 17 Jan 2008 03:36:38 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 81372 invoked by uid 99); 17 Jan 2008 03:36:38 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2008 19:36:38 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2008 03:36:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2ED8F1A9832; Wed, 16 Jan 2008 19:36:25 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r612698 -
 /geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
Date: Thu, 17 Jan 2008 03:36:24 -0000
To: scm@geronimo.apache.org
From: ecraig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080117033625.2ED8F1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecraig
Date: Wed Jan 16 19:36:24 2008
New Revision: 612698

URL: http://svn.apache.org/viewvc?rev=612698&view=rev
Log:
GERONIMO-3753

monitoring portlet is not up to date with dojo 1.0
Patch by Viet Nguyen

Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp?rev=612698&r1=612697&r2=612698&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp Wed Jan 16 19:36:24 2008
@@ -37,16 +37,16 @@
 String divNameString = graph.getName();
 %>
 
-<style type="text/css">
-    #graph0Container { margin: 0px; width: 670px; height: 240px; }
-</style>
-<script type='text/javascript' src='/dojo/dojo.js'></script>
+<script type='text/javascript' src='/dojo/1.0/dojo/dojo.js' djConfig='isDebug: false, parseOnLoad: true'></script>
 <script type='text/javascript'>
-    var dojoConfig = { isDebug:true };
-    dojo.require("dojo.collections.Store")
-    dojo.require("dojo.charting.Chart")
-    dojo.require("dojo.json")
-    <%=graphString%>
+    dojo.require("dojox.charting.Chart2D");
+    dojo.require("dojox.charting.themes.PlotKit.blue");
+    dojo.require("dojox.fx.easing");
+
+    makeObjects = function() {
+        <%=graphString%>
+    };
+    dojo.addOnLoad(makeObjects);
 </script>
-<div id="<%=divNameString%>Head" "style="background-color: #f2f2f2; border-top: 1px solid #2581c7; margin: 0px; width: 670px; height: 16px;"><div align="left" style="background-color: #f2f2f2; float:left; text-align:left; width:500px;"><%=divNameString%></div><div align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a href="#" onClick="hide(\'<%=divNameString%>\')"><img border=0 src="/monitoring/images/min-b.png"></a>&nbsp;<a href="#" onClick="show(\'<%=divNameString%>\')"><img border=0 src="/monitoring/images/max-b.png"></a>&nbsp;<a href="#" onClick="hide(\'<%=divNameString%>\');hide(\'<%=divNameString%>Head\');"><img border=0 src="/monitoring/images/close-b.png"> </a></div></div>
-<%=divImplString %>
\ No newline at end of file
+<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top: 1px solid #2581c7; margin: 0px; width: 670px; height: 16px;"><div align="left" style="background-color: #f2f2f2; float:left; text-align:left; width:500px;"><%=divNameString%></div><div align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a href="#" onClick="hide(\'<%=graph.getDivName()%>\')"><img border=0 src="/monitoring/images/min-b.png"></a>&nbsp;<a href="#" onClick="show(\'<%=graph.getDivName()%>\')"><img border=0 src="/monitoring/images/max-b.png"></a>&nbsp;<a href="#" onClick="hide(\'<%=graph.getDivName()%>\');hide(\'<%=graph.getDivName()%>Head\');"><img border=0 src="/monitoring/images/close-b.png"> </a></div></div>
+<%=divImplString %>