geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r604183 [1/2] - in /geronimo/sandbox/monitoring: ./ agent-ds/ agent-ds/src/main/plan/ agent-ear/ agent-ear/src/main/resources/META-INF/ agent-ejb/ agent-sql/ agent/ client/ mconsole-ds/ mconsole-ds/src/main/plan/ mconsole-ear/ mconsole-ear/...
Date Fri, 14 Dec 2007 13:04:25 GMT
Author: akulshreshtha
Date: Fri Dec 14 05:04:22 2007
New Revision: 604183

URL: http://svn.apache.org/viewvc?rev=604183&view=rev
Log:
GERONIMO-3697 Preparing for move to trunk, Yay!!!
              

Added:
    geronimo/sandbox/monitoring/agent/
      - copied from r603807, geronimo/sandbox/monitoring/mrc-server/mrc-car/
    geronimo/sandbox/monitoring/agent-ds/
      - copied from r603807, geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/
    geronimo/sandbox/monitoring/agent-ear/
      - copied from r603807, geronimo/sandbox/monitoring/mrc-server/mrc-ear/
    geronimo/sandbox/monitoring/agent-ejb/
      - copied from r603807, geronimo/sandbox/monitoring/mrc-server/mrc-ejb/
    geronimo/sandbox/monitoring/agent-sql/
      - copied from r603807, geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/
    geronimo/sandbox/monitoring/mconsole-ds/
      - copied from r603807, geronimo/sandbox/monitoring/client/client-ds-car/
    geronimo/sandbox/monitoring/mconsole-ear/
      - copied from r603807, geronimo/sandbox/monitoring/client/client-ear/
    geronimo/sandbox/monitoring/mconsole-jetty/
      - copied from r603807, geronimo/sandbox/monitoring/client/client-jetty/
    geronimo/sandbox/monitoring/mconsole-tomcat/
      - copied from r603807, geronimo/sandbox/monitoring/client/client-tomcat/
    geronimo/sandbox/monitoring/mconsole-war/
      - copied from r603807, geronimo/sandbox/monitoring/client/client-war/
Removed:
    geronimo/sandbox/monitoring/agent-ejb/readme.txt
    geronimo/sandbox/monitoring/client/
    geronimo/sandbox/monitoring/monitor-jetty/
    geronimo/sandbox/monitoring/monitor-tomcat/
    geronimo/sandbox/monitoring/mrc-server/
Modified:
    geronimo/sandbox/monitoring/agent-ds/pom.xml
    geronimo/sandbox/monitoring/agent-ds/src/main/plan/plan.xml
    geronimo/sandbox/monitoring/agent-ear/pom.xml
    geronimo/sandbox/monitoring/agent-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/sandbox/monitoring/agent-ejb/pom.xml
    geronimo/sandbox/monitoring/agent-sql/pom.xml
    geronimo/sandbox/monitoring/agent/pom.xml
    geronimo/sandbox/monitoring/mconsole-ds/pom.xml
    geronimo/sandbox/monitoring/mconsole-ds/src/main/plan/plan.xml
    geronimo/sandbox/monitoring/mconsole-ear/pom.xml
    geronimo/sandbox/monitoring/mconsole-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/sandbox/monitoring/mconsole-jetty/pom.xml
    geronimo/sandbox/monitoring/mconsole-tomcat/pom.xml
    geronimo/sandbox/monitoring/mconsole-war/pom.xml
    geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringMaximized.jsp
    geronimo/sandbox/monitoring/pom.xml

Modified: geronimo/sandbox/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-ds/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-ds/pom.xml (original)
+++ geronimo/sandbox/monitoring/agent-ds/pom.xml Fri Dec 14 05:04:22 2007
@@ -22,74 +22,57 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mrc-server</artifactId>
-        <version>${version}</version>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc-ds-car</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Plugins :: Monitoring CAR</name>
+    <artifactId>agent-ds</artifactId>
+    <name>Geronimo Plugins :: Monitoring Agent :: Datasource</name>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>2.1-SNAPSHOT</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <version>1.3</version>
             <type>rar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>2.1-SNAPSHOT</version>
             <type>car</type>
         </dependency>
+        <dependency>
+	    <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+	    <artifactId>agent-sql</artifactId>
+	    <version>${monitoringConsoleVersion}</version>
+	    </dependency>
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
-
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-derby-embed-local</artifactId>
-                        <version>1.3</version>
+                        <!-- <version>1.3</version> -->
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <source-repository>~/.m2/repository</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/monitoring/agent-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-ds/src/main/plan/plan.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-ds/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/monitoring/agent-ds/src/main/plan/plan.xml Fri Dec 14 05:04:22 2007
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
     <environment>
         <moduleId>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mrc-ds-car</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
             <version>${version}</version>
             <type>car</type>
         </moduleId>
@@ -11,14 +11,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>system-database</artifactId>
-                <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <!-- SQL files -->
 	        <dependency>
-	            <groupId>org.apache.geronimo.plugins</groupId>
-	            <artifactId>mrc-sql-jar</artifactId>
-	            <version>${version}</version>
+	            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+	            <artifactId>agent-sql</artifactId>
+	            <version>${monitoringConsoleVersion}</version>
 	            <type>jar</type>
 	        </dependency>
         </dependencies>

Modified: geronimo/sandbox/monitoring/agent-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-ear/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/agent-ear/pom.xml Fri Dec 14 05:04:22 2007
@@ -1,84 +1,76 @@
-<?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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mrc-server</artifactId>
-        <version>${version}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc-server-ear</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Stats :: Server :: EAR</name>
-    <packaging>ear</packaging>
-
-    <description>Geronimo Stats. EAR Module</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mrc-server-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Geronimo Sample EAR for MRC</displayName>
-                    <description>Geronimo Sample EAR for MRC</description>
-                    <version>5</version>
-                    <modules>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>mrc-server-ejb</artifactId>
-                            <bundleFileName>mrc-server-ejb-1.0-SNAPSHOT.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-
-
-
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>agent-ear</artifactId>
+    <name>Geronimo Monitoring :: Monitoring Agent :: EAR</name>
+    <packaging>ear</packaging>
+
+    <description>Geronimo Monitoring Agent EAR Module</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>agent-ejb</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>ejb</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <displayName>Geronimo Sample EAR for MRC</displayName>
+                    <description>Geronimo Sample EAR for MRC</description>
+                    <version>5</version>
+                    <modules>
+                        <ejbModule>
+                            <groupId>${pom.groupId}</groupId>
+                            <artifactId>agent-ejb</artifactId>
+                            <bundleFileName>agent-ejb.jar</bundleFileName>
+                        </ejbModule>
+                    </modules>
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+
+
+

Modified: geronimo/sandbox/monitoring/agent-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-ear/src/main/resources/META-INF/geronimo-application.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/sandbox/monitoring/agent-ear/src/main/resources/META-INF/geronimo-application.xml Fri Dec 14 05:04:22 2007
@@ -20,22 +20,22 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
 
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${pom.version}</version>
             <type>ear</type>
         </moduleId>
 
         <dependencies>
             <!-- dependency on the DataSource plugin  -->
             <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>mrc-server-ds-car</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>agent-ds</artifactId>
+                <version>${monitoringConsoleVersion}</version>
                 <type>car</type>
             </dependency>
         </dependencies>

Modified: geronimo/sandbox/monitoring/agent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-ejb/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-ejb/pom.xml (original)
+++ geronimo/sandbox/monitoring/agent-ejb/pom.xml Fri Dec 14 05:04:22 2007
@@ -1,81 +1,70 @@
-<?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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mrc-server</artifactId>
-        <version>${version}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc-server-ejb</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Stats :: Server :: EJB</name>
-    <packaging>jar</packaging>
-
-    <description>Geronimo Stats. EJB Module</description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-        
-         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
-            <artifactId>geronimo-mejb</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </dependency>
-    </dependencies>
-
-</project>
-
-
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>agent-ejb</artifactId>
+    <name>Geronimo Monitoring :: Monitoring Agent :: EJB</name>
+    <description>Geronimo Monitoring Agent EJB Module</description>
+    
+    <dependencies>
+        <!-- TODO get rid of this -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                <scope>provided</scope>
+            </dependency>
+
+           <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <scope>provided</scope>
+            </dependency>
+<!-- 
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency> -->
+    </dependencies>
+
+</project>
+
+

Modified: geronimo/sandbox/monitoring/agent-sql/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent-sql/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent-sql/pom.xml (original)
+++ geronimo/sandbox/monitoring/agent-sql/pom.xml Fri Dec 14 05:04:22 2007
@@ -18,17 +18,15 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mrc-server</artifactId>
-        <version>${version}</version>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc-sql-jar</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Modules :: Monitoring Database Module</name>
-    <packaging>jar</packaging>
+    <artifactId>agent-sql</artifactId>
+    <name>Geronimo Modules :: Monitoring Agent :: Database</name>
+
     <description>
        This module carries the Monitoring's SQL scripts for all databases.
     </description>
@@ -37,7 +35,7 @@
             <resource>
                 <directory>${pom.basedir}/src/main</directory>
                 <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
+                <!-- <filtering>true</filtering> -->
             </resource>
         </resources>
     </build>

Modified: geronimo/sandbox/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/agent/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/agent/pom.xml (original)
+++ geronimo/sandbox/monitoring/agent/pom.xml Fri Dec 14 05:04:22 2007
@@ -22,74 +22,41 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mrc-server</artifactId>
-        <version>${version}</version>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc-server-car</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Plugins :: Monitoring CAR</name>
+    <artifactId>agent</artifactId>
+    <name>Geronimo Plugins :: Monitoring Agent</name>
     <packaging>car</packaging>
 
     <dependencies>
        <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mrc-ds-car</artifactId>
-            <version>${version}</version>
+            <artifactId>agent-ds</artifactId>
+            <version>${monitoringConsoleVersion}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mrc-server-ear</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-ear</artifactId>
+            <version>${monitoringConsoleVersion}</version>
             <type>ear</type>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>mejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-        <dependency>
-        	<groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>2.1-SNAPSHOT</version>
-            <type>car</type>
-        </dependency>
-
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
 
@@ -102,27 +69,16 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>mrc-server-ear</artifactId>
-                        <version>${version}</version>
+                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+                        <artifactId>agent-ear</artifactId>
                         <type>ear</type>
                     </module>
-                    <category>Administration</category>
+                    <category>Monitoring</category>
                     <osiApproved>true</osiApproved>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-                            <source-repository>file:///C:/.m2/</source-repository>
-
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            </plugin-artifact>
-                        </commonInstance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-ds/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-ds/pom.xml Fri Dec 14 05:04:22 2007
@@ -1,96 +1,76 @@
-<?xml version="1.0" encoding="ISO-8859-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.
--->
-
-<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>client</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>client-ds-car</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Plugins :: Monitoring Client DataSource</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <version>1.3</version>
-            <type>rar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-local</artifactId>
-                        <version>1.3</version>
-                        <type>rar</type>
-                    </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <source-repository>~/.m2/repository</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="ISO-8859-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.
+-->
+
+<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-ds</artifactId>
+    <name>Geronimo Plugins :: Monitoring Console :: DataSource</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-local</artifactId>
+                        <!-- <version>1.3</version> -->
+                        <type>rar</type>
+                    </module>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/sandbox/monitoring/mconsole-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-ds/src/main/plan/plan.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-ds/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-ds/src/main/plan/plan.xml Fri Dec 14 05:04:22 2007
@@ -1,59 +1,59 @@
-<?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.
--->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <dep:moduleId>
-            <dep:groupId>org.apache.geronimo.plugins.monitoring</dep:groupId>
-            <dep:artifactId>client-ds-car</dep:artifactId>
-            <dep:version>1.0-SNAPSHOT</dep:version>
-            <dep:type>car</dep:type>
-        </dep:moduleId>
-        <dep:dependencies>
-            <dep:dependency>
-                <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                <dep:artifactId>system-database</dep:artifactId>
-                <dep:version>2.1-SNAPSHOT</dep:version>
-                <dep:type>car</dep:type>
-            </dep:dependency>
-        </dep:dependencies>
-    </dep:environment>
-    <resourceadapter>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>MonitoringClientDS</name>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <config-property-setting name="UserName">app</config-property-setting>
-                    <config-property-setting name="DatabaseName">MonitoringClientDB</config-property-setting>
-                    <connectionmanager>
-                        <local-transaction/>
-                        <single-pool>
-                            <max-size>10</max-size>
-                            <min-size>0</min-size>
-                            <match-one/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
-</connector>
+<?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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+    <environment>
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <type>car</type>
+            </dependency>
+        </dependencies>
+    </environment>
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>MonitoringClientDS</name>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <config-property-setting name="UserName">app</config-property-setting>
+                    <config-property-setting name="DatabaseName">MonitoringClientDB</config-property-setting>
+                    <connectionmanager>
+                        <local-transaction/>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+</connector>

Modified: geronimo/sandbox/monitoring/mconsole-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-ear/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-ear/pom.xml Fri Dec 14 05:04:22 2007
@@ -24,24 +24,22 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>client</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-    <artifactId>client-ear</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>Geronimo Stats :: Client :: EAR</name>
+    <artifactId>mconsole-ear</artifactId>
+    <name>Geronimo Monitoring :: Console :: EAR</name>
     <packaging>ear</packaging>
 
-    <description>Geronimo Stats Client. EAR Module</description>
+    <description>Geronimo Monitoring Console. EAR Module</description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-war</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>mconsole-war</artifactId>
+            <version>${monitoringConsoleVersion}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -51,17 +49,22 @@
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
-                    <displayName>Monitoring Client EAR</displayName>
-                    <description>Monitoring Client EAR</description>
+                    <displayName>Monitoring mconsole EAR</displayName>
+                    <description>Monitoring mconsole EAR</description>
                     <version>5</version>
                     <modules>
                         <webModule>
-                            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                            <artifactId>client-war</artifactId>
+                            <groupId>${pom.groupId}</groupId>
+                            <artifactId>mconsole-war</artifactId>
                             <contextRoot>/client</contextRoot>
-                            <bundleFileName>client-war-1.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>mconsole.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
                 </configuration>
             </plugin>
 

Modified: geronimo/sandbox/monitoring/mconsole-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-ear/src/main/resources/META-INF/geronimo-application.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-ear/src/main/resources/META-INF/geronimo-application.xml Fri Dec 14 05:04:22 2007
@@ -18,24 +18,24 @@
     under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
 
-    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-        <dep:moduleId>
-            <dep:groupId>${pom.groupId}</dep:groupId>
-            <dep:artifactId>${pom.artifactId}</dep:artifactId>
-            <dep:version>1.0-SNAPSHOT</dep:version>
-            <dep:type>ear</dep:type>
-        </dep:moduleId>
+    <environment>
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${pom.version}</version>
+            <type>ear</type>
+        </moduleId>
 
         <dependencies>
             <!-- DataSource -->
             <dependency>
-                <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                <artifactId>client-ds-car</artifactId>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>mconsole-ds</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
         </dependencies>
-    </dep:environment>
+    </environment>
 </application>

Modified: geronimo/sandbox/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-jetty/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-jetty/pom.xml Fri Dec 14 05:04:22 2007
@@ -1,148 +1,111 @@
-<?xml version="1.0" encoding="ISO-8859-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.
--->
-
-<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>client</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>client-jetty</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Plugins :: Jetty Monitoring Client CAR</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-       <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-ds-car</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                        <artifactId>client-ear</artifactId>
-                        <version>${version}</version>
-                        <type>ear</type>
-                    </module>
-                    <category>Administration</category>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-                            <source-repository>file:///C:/.m2/</source-repository>
-                            </plugin-artifact>
-                        </commonInstance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="ISO-8859-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.
+-->
+
+<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-jetty</artifactId>
+    <name>Geronimo Plugins :: Monitoring Console - Jetty</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mconsole-ds</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>mconsole-ear</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>ear</type>
+        </dependency>
+<!--		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+-->		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-jetty6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+                        <artifactId>mconsole-ear</artifactId>
+                        <version>${monitoringConsoleVersion}</version>
+                        <type>ear</type>
+                    </module>
+                    <category>Monitoring</category>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/sandbox/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-tomcat/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-tomcat/pom.xml Fri Dec 14 05:04:22 2007
@@ -1,148 +1,118 @@
-<?xml version="1.0" encoding="ISO-8859-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.
--->
-
-<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>client</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>client-tomcat</artifactId>
-    <version>${version}</version>
-    <name>Geronimo Plugins :: Tomcat Monitoring Client CAR</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-       <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-ds-car</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-tomcat</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                        <artifactId>client-ear</artifactId>
-                        <version>${version}</version>
-                        <type>ear</type>
-                    </module>
-                    <category>Administration</category>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-                            <source-repository>file:///C:/.m2/</source-repository>
-                            </plugin-artifact>
-                        </commonInstance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="ISO-8859-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.
+-->
+
+<!-- $Rev: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-tomcat</artifactId>
+    <name>Geronimo Plugins :: Monitoring Console - Tomcat</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mconsole-ds</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>mconsole-ear</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>ear</type>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+<!--		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+-->		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- see if openejb-client can be used -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+                        <artifactId>mconsole-ear</artifactId>
+                        <version>${monitoringConsoleVersion}</version>
+                        <type>ear</type>
+                    </module>
+                    <category>Monitoring</category>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/sandbox/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-war/pom.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-war/pom.xml Fri Dec 14 05:04:22 2007
@@ -24,25 +24,18 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>client</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <artifactId>monitoring</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>client-war</artifactId>
-    <name>Geronimo Stats :: Client :: WAR</name>
+    <artifactId>mconsole-war</artifactId>
+    <name>Geronimo Monitoring :: Monitoring Console :: WAR</name>
     <packaging>war</packaging>
 
-    <description>Geronimo Stats Client. WEB Module</description>
+    <description>Geronimo Monitorin Console :: WEB Module</description>
    
     <dependencies>
-
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-naming</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
@@ -50,12 +43,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -75,7 +62,7 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
+            <scope>provided</scope>
         </dependency>      
 
         <dependency>
@@ -83,20 +70,43 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-ejb</artifactId>
+            <version>${monitoringConsoleVersion}</version>
+            <type>jar</type>
+        </dependency>
 
+        <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
+        <!-- for jspc maven plugin -->
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mrc-server-ejb</artifactId>
+            <artifactId>pluto-support</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
-        
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Dec 14 05:04:22 2007
@@ -20,8 +20,8 @@
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>agent-war</artifactId>
+            <version>2.1-SNAPSHOT</version>
             <type>war</type>
         </moduleId>
         
@@ -30,10 +30,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>pluto-support</artifactId>
             </dependency>
-
+            <!-- ???? -->
             <dependency>
-                <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                <artifactId>client-ds-car</artifactId>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>mconsole-ds</artifactId>
             </dependency>
         </dependencies>
     </environment>
@@ -43,8 +43,8 @@
     <resource-ref>
         <ref-name>MonitoringClientDS</ref-name>
         <pattern>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>client-ds-car</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mconsole-ds</artifactId>
             <name>MonitoringClientDS</name>
         </pattern>
     </resource-ref> 

Modified: geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringMaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringMaximized.jsp?rev=604183&r1=603807&r2=604183&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringMaximized.jsp (original)
+++ geronimo/sandbox/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringMaximized.jsp Fri Dec 14 05:04:22 2007
@@ -14,4 +14,4 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ include file="monitoringMbean.jsp" %>
+<%@ include file="monitoringNormal.jsp" %>



Mime
View raw message