geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r449699 - in /geronimo/server/branches/sachin/applications/console: geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/ geronimo-console-framework/src/main/webapp/WEB-INF/data/ geronimo-console-standard/src/main/java/org/apache/...
Date Mon, 25 Sep 2006 15:00:45 GMT
Author: sppatel
Date: Mon Sep 25 08:00:44 2006
New Revision: 449699

URL: http://svn.apache.org/viewvc?view=rev&rev=449699
Log:
update from trunk

Added:
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/
      - copied from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
      - copied unchanged from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerPortlet.java
      - copied unchanged from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerPortlet.java
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/
      - copied from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
      - copied unchanged from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
      - copied unchanged from r449697, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
Modified:
    geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/Head.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
    geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/dwr.xml
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/Head.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/Head.jsp?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/Head.jsp
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/aggregation/Head.jsp
Mon Sep 25 08:00:44 2006
@@ -19,4 +19,32 @@
     <link rel="stylesheet" href="<%=request.getContextPath()%>/main.css" type="text/css">
     <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
     <script language="Javascript" src="<%=request.getContextPath()%>/js/forms.js"
type="text/javascript"></script>
+
+    <script type="text/javascript">
+    	// var djConfig = { isDebug: true, debugAtAllCosts: true };
+    </script>
+    
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+    
+    <script type="text/javascript">
+    	dojo.require("dojo.lang.*");
+    	dojo.require("dojo.widget.*");
+    	// Pane includes
+    	dojo.require("dojo.widget.ContentPane");
+    	dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+    	dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+    	dojo.require("dojo.widget.Tree");
+    	dojo.require("dojo.widget.TreeBasicController");
+    	dojo.require("dojo.widget.TreeContextMenu");
+    	dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+    	// Includes Dojo source for debugging
+    	// dojo.hostenv.writeIncludes();
+    </script>
 </HEAD>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
Mon Sep 25 08:00:44 2006
@@ -592,4 +592,20 @@
                 </fragment>
             </fragment>
     </fragment>
+    
+    <fragment name="JMXViewer" type="page">
+        <navigation>
+            <title>JMX Viewer</title>
+            <description>ico_filetree_16x16.gif Manage the internal LDAP server</description>

+        </navigation>
+    
+        <fragment name="row1" type="row">
+            <fragment name="col1" type="column">
+                <fragment name="p1" type="portlet">
+                    <property name="portlet" value="5.72"/>
+                </fragment>
+            </fragment>
+        </fragment>
+    </fragment>
+
 </portal>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
Mon Sep 25 08:00:44 2006
@@ -148,6 +148,9 @@
         <portlet id="70">
             <definition-id>console-standard.ImportExport</definition-id>
         </portlet>
+        <portlet id="72">
+            <definition-id>console-standard.JMXViewer</definition-id>
+        </portlet>
         <!-- Leave some free numbers for the portlets that are in HEAD but not 1.1 yet
-->
         <portlet id="80">
             <definition-id>console-standard.ThreadPool</definition-id>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/dwr.xml?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/dwr.xml
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/dwr.xml
Mon Sep 25 08:00:44 2006
@@ -12,5 +12,8 @@
     <create creator="new" javascript="ProgressMonitor">
       <param name="class" value="org.apache.geronimo.console.ajax.ProgressMonitor"/>
     </create>
+    <create creator="new" javascript="JMXHelper">
+      <param name="class" value="org.apache.geronimo.console.jmxmanager.JMXManagerHelper"/>
+    </create>
   </allow>
-</dwr>
\ No newline at end of file
+</dwr>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
Mon Sep 25 08:00:44 2006
@@ -1102,15 +1102,38 @@
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Create and Install Plugins</title>
+            <short-title>Create/Install Plugins</short-title>
+            <keywords>Import Export Create Install Plugins Modules</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for viewing JMX server</description>
+        <portlet-name>JMXViewer</portlet-name>
+        <display-name>JMX Viewer Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.jmxmanager.JMXManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
 
         <supported-locale>en</supported-locale>
 
         <portlet-info>
-            <title>Import/Export Configurations</title>
-            <short-title>Import/Export</short-title>
-            <keywords>Import Export CAR Configuration</keywords>
+            <title>JMX Viewer</title>
+            <short-title>JMX Viewer</short-title>
+            <keywords>JMX Viewer</keywords>
         </portlet-info>
     </portlet>
 

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml?view=diff&rev=449699&r1=449698&r2=449699
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
Mon Sep 25 08:00:44 2006
@@ -742,54 +742,67 @@
         </init-param>
     </servlet>
 
-
-
-<servlet>
-  <display-name>DWR Servlet</display-name>
-  <servlet-name>dwr-invoker</servlet-name>
-  <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
-  <init-param>
-     <param-name>debug</param-name>
-     <param-value>true</param-value>
-  </init-param>
-</servlet>
-<servlet>
-  <display-name>CAR Export Servlet</display-name>
-  <servlet-name>car-export</servlet-name>
-  <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
-</servlet>
-<servlet>
-  <display-name>Geronimo as Maven Repo Servlet</display-name>
-  <servlet-name>maven-repo</servlet-name>
-  <servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
-</servlet>
-<servlet>
-  <display-name>Plan Export Servlet</display-name>
-  <servlet-name>plan-export</servlet-name>
-  <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
-</servlet>
+    <servlet>
+      <display-name>DWR Servlet</display-name>
+      <servlet-name>dwr-invoker</servlet-name>
+      <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
+      <init-param>
+         <param-name>debug</param-name>
+         <param-value>true</param-value>
+      </init-param>
+    </servlet>
+    <servlet>
+      <display-name>CAR Export Servlet</display-name>
+      <servlet-name>car-export</servlet-name>
+      <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
+    </servlet>
+    <servlet>
+      <display-name>Geronimo as Maven Repo Servlet</display-name>
+      <servlet-name>maven-repo</servlet-name>
+      <servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
+    </servlet>
+    <servlet>
+      <display-name>Plan Export Servlet</display-name>
+      <servlet-name>plan-export</servlet-name>
+      <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <description>Automated generated Portlet Wrapper</description>
+        <display-name>Pluto Wrapper for JMX Viewer Portlet</display-name>
+        <servlet-name>JMXViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-class</param-name>
+            <param-value>org.apache.geronimo.console.jmxmanager.JMXManagerPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.JMXViewer</param-value>
+        </init-param>
+    </servlet>
 
 <!-- [INSERT FRAGMENT HERE] -->
 
-<servlet-mapping>
-  <servlet-name>dwr-invoker</servlet-name>
-  <url-pattern>/dwr/*</url-pattern>
-</servlet-mapping>
-<servlet-mapping>
-  <servlet-name>car-export</servlet-name>
-  <url-pattern>/car-export</url-pattern>
-</servlet-mapping>
-<servlet-mapping>
-  <servlet-name>maven-repo</servlet-name>
-  <url-pattern>/maven-repo/*</url-pattern>
-</servlet-mapping>
-<servlet-mapping>
-  <servlet-name>plan-export</servlet-name>
-  <url-pattern>/plan-export</url-pattern>
-</servlet-mapping>
-
-
-
+    <servlet-mapping>
+        <servlet-name>JMXViewer</servlet-name>
+        <url-pattern>/JMXViewer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>dwr-invoker</servlet-name>
+      <url-pattern>/dwr/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>car-export</servlet-name>
+      <url-pattern>/car-export</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>maven-repo</servlet-name>
+      <url-pattern>/maven-repo/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>plan-export</servlet-name>
+      <url-pattern>/plan-export</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>Welcome</servlet-name>
         <url-pattern>/Welcome/*</url-pattern>



Mime
View raw message