You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/10/03 21:56:34 UTC
svn commit: r581709 [2/2] - in /geronimo/sandbox/monitoring: ./ mrc-client/
mrc-client/src/main/java/org/apache/geronimo/console/stats/
mrc-client/src/main/webapp/WEB-INF/ mrc-client/src/main/webapp/WEB-INF/view/
Modified: geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMaximized.jsp?rev=581709&r1=581708&r2=581709&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMaximized.jsp (original)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMaximized.jsp Wed Oct 3 12:56:32 2007
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
---%>
-<%@ include file="statsMbean.jsp" %>
Modified: geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMbean.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMbean.jsp?rev=581709&r1=581708&r2=581709&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMbean.jsp (original)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMbean.jsp Wed Oct 3 12:56:32 2007
@@ -1,86 +1 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.stats.StatsGraph" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.Set" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
-<portlet:defineObjects/>
-
-<%
-Vector <StatsGraph> GraphVector = (Vector<StatsGraph>) request.getAttribute("GraphVector");
-Set <String> trackedBeans = (Set<String>) request.getAttribute("trackedBeans");
-Integer time = (Integer) request.getAttribute("time");
-%>
-<head>
- <style type='text/css'>
- <% for (StatsGraph graph : GraphVector)
- out.println(graph.getDiv());
- %>
- </style>
- <script type='text/javascript' src='/dojo/dojo.js'>
- </script>
- <script type='text/javascript'>
- var dojoConfig =
- {
- isDebug:true
- };
- dojo.require("dojo.collections.Store");
- dojo.require("dojo.charting.Chart");
- dojo.require('dojo.json');
- <% for (StatsGraph graph : GraphVector)
- out.println(graph.getJS());
- %>
- </script>
-</head>
-<table>
- <tr>
- <!-- Body -->
- <td width="90%" align="left" valign="top">
- <p>
- <font face="Verdana" size="+1">
- <left>
- <b>By MBean | <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="timeframe" /><portlet:param name="time" value="60" /></portlet:actionURL>">By
- Timeframe</a></b>
- </left>
- </font>
- </p>
- |
-<% for (String Bean : trackedBeans)
-{
-%>
- <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="mbean" /><portlet:param name="time" value="60" /><portlet:param name="draw" value="all" /><portlet:param name="bean" value="<%=Bean%>" /></portlet:actionURL>"><%=Bean%></a>
- |
-<%
-}
-%>
-
-<% for (StatsGraph graph : GraphVector)
-{
-%>
- <p>
-<%=graph.getDivImplement()%>
- </p>
-<%
-}
-%>
-
- </td>
- </tr>
-</table>
Modified: geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsTimeframe.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsTimeframe.jsp?rev=581709&r1=581708&r2=581709&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsTimeframe.jsp (original)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsTimeframe.jsp Wed Oct 3 12:56:32 2007
@@ -1,73 +1 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.stats.StatsGraph" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
-<portlet:defineObjects/>
-
-<%
-Vector <StatsGraph> GraphVector = (Vector<StatsGraph>) request.getAttribute("GraphVector");
-Integer time = (Integer) request.getAttribute("time");
-%>
-<head>
- <style type='text/css'>
- <% for (StatsGraph graph : GraphVector)
- out.println(graph.getDiv());
- %>
- </style>
- <script type='text/javascript' src='/dojo/dojo.js'>
- </script>
- <script type='text/javascript'>
- var dojoConfig =
- {
- isDebug:true
- };
- dojo.require("dojo.collections.Store");
- dojo.require("dojo.charting.Chart");
- dojo.require('dojo.json');
- <% for (StatsGraph graph : GraphVector)
- out.println(graph.getJS());
- %>
- </script>
-</head>
-<table>
- <tr>
- <!-- Body -->
- <td width="90%" align="left" valign="top">
- <p>
- <font face="Verdana" size="+1">
- <left>
- <b><a href="<portlet:actionURL portletMode="view"><portlet:param name="bean" value="TomcatWebConnector" /><portlet:param name="mode" value="mbean" /><portlet:param name="time" value="60" /></portlet:actionURL>">By
- MBean</a> | By Timeframe</b>
- </left>
- </font>
- </p>
- <a href="<portlet:actionURL portletMode="view"><portlet:param name="time" value="60" /><portlet:param name="mode" value="timeframe" /></portlet:actionURL>">Hour</a>
- | <a href="<portlet:actionURL portletMode="view"><portlet:param name="time" value="1440" /><portlet:param name="mode" value="timeframe" /></portlet:actionURL>">Day</a>
- | <a href="<portlet:actionURL portletMode="view"><portlet:param name="time" value="10080" /><portlet:param name="mode" value="timeframe" /></portlet:actionURL>">Week</a>
- | <a href="<portlet:actionURL portletMode="view"><portlet:param name="time" value="43200" /><portlet:param name="mode" value="timeframe" /></portlet:actionURL>">30
- day</a>
- <% for (StatsGraph graph : GraphVector)
- out.println("<p>"+graph.getDivImplement()+"</p>");
- %>
-
- </td>
- </tr>
-</table>
Modified: geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/web.xml?rev=581709&r1=581708&r2=581709&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/web.xml Wed Oct 3 12:56:32 2007
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <servlet>
- <servlet-name>StatsPortlet</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>StatsPortlet</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>StatsPortlet</servlet-name>
- <url-pattern>/PlutoInvoker/StatsPortlet</url-pattern>
- </servlet-mapping>
-
-</web-app>
Modified: geronimo/sandbox/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/pom.xml?rev=581709&r1=581708&r2=581709&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/pom.xml (original)
+++ geronimo/sandbox/monitoring/pom.xml Wed Oct 3 12:56:32 2007
@@ -28,11 +28,11 @@
- <parent>
+ <!-- <parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
<version>1.2</version>
- </parent>
+ </parent> -->
@@ -63,11 +63,6 @@
<xbeanVersion>3.0.1</xbeanVersion>
<!-- deployers needed to create the CAR files -->
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
</properties>
<dependencyManagement>
@@ -92,12 +87,6 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>${geronimoServletSpecVersion}</version>
@@ -107,7 +96,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimoVersion}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -248,11 +237,11 @@
<goals>
<goal>copy-legal-files</goal>
</goals>
- <configuration>
+ <configuration>
<!-- Fail the build if no legal files were copied -->
- <strict>true</strict>
+ <strict>true</strict>
</configuration>
- </execution>
+ </execution>
<!-- <execution>
<id>verify-legal-files</id>
@@ -327,8 +316,8 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>mrc-client</module>
<module>mrc-server</module>
+ <module>client</module>
</modules>
</profile>
</profiles>