svn commit: r620044 - in /geronimo/server/branches/2.1.0: assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql

[ke...@apache.org]

Author: kevan
Date: Fri Feb  8 15:52:27 2008
New Revision: 620044

URL: http://svn.apache.org/viewvc?rev=620044&view=rev
Log:
some more version changes for 2.1

Modified:
    geronimo/server/branches/2.1.0/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
    geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql

Modified: geronimo/server/branches/2.1.0/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.0/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=620044&r1=620043&r2=620044&view=diff
==============================================================================
--- geronimo/server/branches/2.1.0/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1.0/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Fri Feb  8 15:52:27 2008
@@ -47,12 +47,12 @@
     load ${gshell.home}/lib/log4j-*.jar
     load ${gshell.home}/lib/cglib-nodep-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1-SNAPSHOT/geronimo-cli-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1-SNAPSHOT/geronimo-deploy-config-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1-SNAPSHOT/geronimo-deploy-jsr88-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1-SNAPSHOT/geronimo-deploy-tool-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1-SNAPSHOT/geronimo-system-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1-SNAPSHOT/geronimo-plugin-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1-SNAPSHOT/geronimo-common-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1/geronimo-cli-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1/geronimo-deploy-config-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1/geronimo-deploy-jsr88-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1/geronimo-deploy-tool-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1/geronimo-system-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1/geronimo-plugin-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1/geronimo-common-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-*.jar

Modified: geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql?rev=620044&r1=620043&r2=620044&view=diff
==============================================================================
--- geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql (original)
+++ geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql Fri Feb  8 15:52:27 2008
@@ -119,7 +119,7 @@
     'TomcatWebBytesSentSecond60Min',
     'KiloBytes sent per second from the Tomcat Web Connector',
     DEFAULT,
-    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
+    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1/car,j2eeType=GBean,name=TomcatWebConnector',
     'D',
     'Bytes Sent',
     '/1024/',
@@ -142,7 +142,7 @@
     'TomcatWebBytesReceivedSecond60Min',
     'KiloBytes received per second from the Tomcat Web Connector',
     DEFAULT,
-    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
+    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1/car,j2eeType=GBean,name=TomcatWebConnector',
     'D',
     'Bytes Received',
     '/1024/',
@@ -165,7 +165,7 @@
     'TomcatWebRequestTimeSecond60Min',
     'Request processing time over time from the Tomcat Web Connector',
     DEFAULT,
-    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
+    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1/car,j2eeType=GBean,name=TomcatWebConnector',
     'D',
     'Request Time CurrentTime',
     '/',
@@ -188,7 +188,7 @@
     'TomcatWebErrorCountSecond60Min',
     'Error count over time from the Tomcat Web Connector',
     DEFAULT,
-    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
+    'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1/car,j2eeType=GBean,name=TomcatWebConnector',
     'D',
     'Error Count',
     '/',