geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecr...@apache.org
Subject svn commit: r599251 - in /geronimo/sandbox/monitoring/client/client-war/src/main/webapp: WEB-INF/ WEB-INF/view/ images/
Date Thu, 29 Nov 2007 02:30:14 GMT
Author: ecraig
Date: Wed Nov 28 18:30:12 2007
New Revision: 599251

URL: http://svn.apache.org/viewvc?rev=599251&view=rev
Log:
GERONIMO-3647
Monitoring client should have icons instead of linked ascii chars like 
+, -, _, X for certain action links.

Added icons and updated jsps to use them.


Added:
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/close-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max.png   (with props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min.png   (with props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm-b.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm.png   (with
props)
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/view.png   (with
props)
Removed:
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringMbean.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringTimeframe.jsp
Modified:
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/portlet.xml
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Nov 28 18:30:12 2007
@@ -38,7 +38,7 @@
         </dependencies>
     </environment>
     
-    <context-root>/MonitoringPortlet</context-root>
+    <context-root>/monitoring</context-root>
    <!-- define a reference name to the db pool-->
     <resource-ref>
         <ref-name>MonitoringClientDS</ref-name>
@@ -50,8 +50,8 @@
     </resource-ref> 
     <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/Monitoring</attribute>
-        <attribute name="portletContext">/MonitoringPortlet</attribute>
-        <attribute name="portletList">[MonitoringPortlet]</attribute>
+        <attribute name="portletContext">/monitoring</attribute>
+        <attribute name="portletList">[monitoring]</attribute>
     </gbean>
   
 </web-app>

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/portlet.xml?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/portlet.xml Wed
Nov 28 18:30:12 2007
@@ -25,7 +25,7 @@
 
     <portlet>
         <description>Monitoring Portlet</description>
-        <portlet-name>MonitoringPortlet</portlet-name>
+        <portlet-name>monitoring</portlet-name>
         <display-name>Monitoring Portlet</display-name>
         <portlet-class>org.apache.geronimo.plugins.monitoring.client.MonitoringPortlet</portlet-class>
         <supports> <!-- Defines which views are avaliable [view,edit,help] -->

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
Wed Nov 28 18:30:12 2007
@@ -383,7 +383,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br>
             <%
  if (!message.equals(""))
  {

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
Wed Nov 28 18:30:12 2007
@@ -93,7 +93,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br/><br/><b>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br/><br/><b>
             <%
  if (!message.equals(""))
  {

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
Wed Nov 28 18:30:12 2007
@@ -71,7 +71,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br>
             <%
  if (!message.equals(""))
  {
@@ -133,7 +133,7 @@
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="showGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>"><%=rs.getString("name")%></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>"
/></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
-            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>">~</a></td>
+            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
             </tr>
       <%
 

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
Wed Nov 28 18:30:12 2007
@@ -429,7 +429,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br>
             <%
  if (!message.equals(""))
  {

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
Wed Nov 28 18:30:12 2007
@@ -140,7 +140,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br/><br/><b>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br/><br/><b>
             <%
  if (!message.equals(""))
  {

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
Wed Nov 28 18:30:12 2007
@@ -87,7 +87,7 @@
 //-->
 </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br>
             <%
  if (!message.equals(""))
  {
@@ -166,7 +166,7 @@
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="showGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>"><%=rs.getString("name")%></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>"
/></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
-            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>">~</a></td>
+            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>"
/></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
             </tr>
       <%
 

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
Wed Nov 28 18:30:12 2007
@@ -69,15 +69,15 @@
   <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param
name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>">Edit</a></td>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="disableView" /><portlet:param
name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>">Disable</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param
name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="disableView" /><portlet:param
name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/close-b.png">Disable</a></td>
  </tr>
  <%
  }
  rs.close();
  %>
 </table>
-<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showAddView" /></portlet:actionURL>">Create View</a></div>
+<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png">Create
View</a></div>
 <table width="100%" style="border-style: solid;
 border-width: 1px;">
  <thead align="center"><strong>Servers</strong></thead>
@@ -177,7 +177,7 @@
 <%
 } else if(enabled){         // offline
 %>
-  <td class="${backgroundClass}" width="15%" align="center"><font color="red">Offline</font></td>
+  <td class="${backgroundClass}" width="15%" align="center"><font color="red"><img
border=0 src="/monitoring/images/help-b.png">Offline</font></td>
 <%
 } else {         // Disabled
      %>
@@ -190,7 +190,7 @@
 <%
     if(enabled) {   // enable the links
 %>
-        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param
name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration"
value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>">Enable
Query</a></td>
+        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param
name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration"
value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/max-b.png">Enable Query</a></td>
 <%
     } else {        // do not provide links
 %>
@@ -198,15 +198,15 @@
 <%
     }
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Edit</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
 <%
 } else {            // collecting statistics
     if (enabled)
     {
 %>
   <td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+"
min. (running)"%></td>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable
Query</a></td>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Edit</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/close-b.png">Disable Query</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
 <%
     }
     else
@@ -214,17 +214,17 @@
         %>
         <td class="${backgroundClass}" width="15%" align="center">Stopped</td>
         <td class="${backgroundClass}" width="10%" align="center">Disable Query</td>
-        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Edit</a></td>
+        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
       <%        
     }
 }
 if(enabled) {   // enabled server
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/close-b.png">Disable</a></td>
 <%
 } else {        // disabled server
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Enable</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL
portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param
name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/max-b.png">Enable</a></td>
 <%
 }
 %>
@@ -232,4 +232,4 @@
  <%}
 %>
 </table>
-<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showAddServer" /></portlet:actionURL>">Add Server</a></div>
+<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param
name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png">Add
Server</a></div>

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
Wed Nov 28 18:30:12 2007
@@ -122,7 +122,7 @@
     <tr>
         <!-- Body -->
         <td width="90%" align="left" valign="top">
-            <a HREF="javascript:history.go(-1)"><< Back</a>
+            <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a>
             <p>
             <font face="Verdana" size="+1">
             <%=name%>
@@ -137,7 +137,7 @@
 {
 %>
 <p>
-<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 670px; height: 10px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:500px;"><%=graph.getName() %></div><div
align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a
href="#" onClick="hide('<%=graph.getDivName()%>')">_</a>&nbsp;<a href="#"
onClick="show('<%=graph.getDivName()%>')">+</a>&nbsp;<a href="#" onClick="hide('<%=graph.getDivName()%>');hide('<%=graph.getDivName()%>Head');">X</a></div></div>
+<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 670px; height: 10px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:500px;"><%=graph.getName() %></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>
 <%=graph.getDivImplement()%>
 </p>
 <%

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
(original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
Wed Nov 28 18:30:12 2007
@@ -162,7 +162,7 @@
     %>
     </script>
 <!-- </head> -->
-        <a HREF="javascript:history.go(-1)"><< Back</a><br>
+        <a HREF="javascript:history.go(-1)"><img border=0 src="/monitoring/images/view.png">Back</a><br>
             <%
  if (!message.equals(""))
  {
@@ -294,7 +294,7 @@
 {
 %>
 <p>
-<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 670px; height: 10px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:500px;"><%=graph.getName()%></div><div
align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a
href="#" onClick="hide('<%=graph.getDivName()%>')">_</a>&nbsp;<a href="#"
onClick="show('<%=graph.getDivName()%>')">+</a>&nbsp;<a href="#" onClick="hide('<%=graph.getDivName()%>');hide('<%=graph.getDivName()%>Head');">X</a></div></div>
+<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 670px; height: 10px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:500px;"><%=graph.getName()%></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>
 <%=graph.getDivImplement()%>
 </p>
 <%
@@ -355,7 +355,7 @@
                            <%=prettyBean%>
                            </td>
                     <td align="right" width=5% bgcolor="#f2f2f2" nowrap>
-                    <a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="stopTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>"
/><portlet:param name="mbean" value="<%=trackedBeansMap.get(prettyBean)%>" /></portlet:actionURL>">X</a><br>
+                    <a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="stopTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>"
/><portlet:param name="mbean" value="<%=trackedBeansMap.get(prettyBean)%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/close-b.png"></a><br>
                                         </td>     
                 </tr>
                         <%
@@ -389,7 +389,7 @@
                            <%=prettyBean%>
                            </td>
                     <td align="right" width=5% bgcolor="#f2f2f2" nowrap>
-                    <a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="startTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>"
/><portlet:param name="mbean" value="<%=availableBeansMap.get(prettyBean)%>" /></portlet:actionURL>">+</a><br>
+                    <a href="<portlet:actionURL portletMode="view"><portlet:param
name="action" value="startTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>"
/><portlet:param name="mbean" value="<%=availableBeansMap.get(prettyBean)%>" /></portlet:actionURL>"><img
border=0 src="/monitoring/images/max-b.png"></a><br>
                                         </td>     
                 </tr>
                         <%

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/web.xml?rev=599251&r1=599250&r2=599251&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/web.xml Wed Nov
28 18:30:12 2007
@@ -20,18 +20,18 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <servlet>
-        <servlet-name>MonitoringPortlet</servlet-name>
+        <servlet-name>monitoring</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
-            <param-value>MonitoringPortlet</param-value>
+            <param-value>monitoring</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>MonitoringPortlet</servlet-name>
-        <url-pattern>/PlutoInvoker/MonitoringPortlet</url-pattern>
+        <servlet-name>monitoring</servlet-name>
+        <url-pattern>/PlutoInvoker/monitoring</url-pattern>
     </servlet-mapping>
     <!-- reference name exposed as a datasource -->
     <resource-ref>

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/close-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/close-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/close-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/edit.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/help.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/max.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/min.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm-b.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm-b.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm-b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/norm.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/view.png
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/view.png?rev=599251&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/images/view.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message