geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecr...@apache.org
Subject svn commit: r599543 - in /geronimo/sandbox/monitoring: ./ client/ client/client-ds-car/ client/client-ds-car/src/main/plan/ client/client-ear/ client/client-ear/src/main/resources/META-INF/ client/client-jetty/ client/client-tomcat/ client/client-war/ ...
Date Thu, 29 Nov 2007 19:01:54 GMT
Author: ecraig
Date: Thu Nov 29 11:01:47 2007
New Revision: 599543

URL: http://svn.apache.org/viewvc?rev=599543&view=rev
Log:
GERONIMO-3645: Monitoring plugins build fails when there is a clean 
(empty) local maven repository due to lack of the artifacts

Further work still needs to be done, running into issues on the openejb 
dependency now when building from clean repo, but this is an 
improvement.


Modified:
    geronimo/sandbox/monitoring/client/client-ds-car/pom.xml
    geronimo/sandbox/monitoring/client/client-ds-car/src/main/plan/plan.xml
    geronimo/sandbox/monitoring/client/client-ear/pom.xml
    geronimo/sandbox/monitoring/client/client-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/sandbox/monitoring/client/client-jetty/pom.xml
    geronimo/sandbox/monitoring/client/client-tomcat/pom.xml
    geronimo/sandbox/monitoring/client/client-war/pom.xml
    geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/monitoring/client/pom.xml
    geronimo/sandbox/monitoring/monitor-jetty/pom.xml
    geronimo/sandbox/monitoring/monitor-tomcat/pom.xml
    geronimo/sandbox/monitoring/mrc-server/MRC.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-car/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/src/main/plan/plan.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/pom.xml
    geronimo/sandbox/monitoring/mrc-server/pom.xml
    geronimo/sandbox/monitoring/pom.xml

Modified: geronimo/sandbox/monitoring/client/client-ds-car/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-ds-car/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-ds-car/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-ds-car/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,23 +21,15 @@
 <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>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>client</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    -->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
 
     <artifactId>client-ds-car</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Monitoring Client DataSource</name>
     <packaging>car</packaging>
 
@@ -45,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
@@ -57,7 +49,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/monitoring/client/client-ds-car/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-ds-car/src/main/plan/plan.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-ds-car/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/monitoring/client/client-ds-car/src/main/plan/plan.xml Thu Nov 29 11:01:47 2007
@@ -21,7 +21,7 @@
 <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.configs</dep:groupId>
+            <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>

Modified: geronimo/sandbox/monitoring/client/client-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-ear/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-ear/pom.xml Thu Nov 29 11:01:47 2007
@@ -29,7 +29,9 @@
         <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>
     <packaging>ear</packaging>
 

Modified: geronimo/sandbox/monitoring/client/client-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-ear/src/main/resources/META-INF/geronimo-application.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/sandbox/monitoring/client/client-ear/src/main/resources/META-INF/geronimo-application.xml Thu Nov 29 11:01:47 2007
@@ -31,7 +31,7 @@
         <dependencies>
             <!-- DataSource -->
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                 <artifactId>client-ds-car</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>car</type>

Modified: geronimo/sandbox/monitoring/client/client-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-jetty/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-jetty/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-jetty/pom.xml Thu Nov 29 11:01:47 2007
@@ -23,43 +23,43 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <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>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Jetty Monitoring Client CAR</name>
     <packaging>car</packaging>
 
     <dependencies>
        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>pluto-support</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-ear</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 		
@@ -123,7 +123,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                         <artifactId>client-ear</artifactId>
-                        <version>1.0-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <category>Administration</category>

Modified: geronimo/sandbox/monitoring/client/client-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-tomcat/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-tomcat/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-tomcat/pom.xml Thu Nov 29 11:01:47 2007
@@ -23,43 +23,43 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <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>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Tomcat Monitoring Client CAR</name>
     <packaging>car</packaging>
 
     <dependencies>
        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>pluto-support</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-ear</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 		
@@ -123,7 +123,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                         <artifactId>client-ear</artifactId>
-                        <version>1.0-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <category>Administration</category>

Modified: geronimo/sandbox/monitoring/client/client-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-war/pom.xml Thu Nov 29 11:01:47 2007
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>mrc-server-ejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
         </dependency>
         

Modified: geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/monitoring/client/client-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Nov 29 11:01:47 2007
@@ -32,7 +32,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                 <artifactId>client-ds-car</artifactId>
             </dependency>
         </dependencies>
@@ -43,7 +43,7 @@
     <resource-ref>
         <ref-name>MonitoringClientDS</ref-name>
         <pattern>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-ds-car</artifactId>
             <name>MonitoringClientDS</name>
         </pattern>

Modified: geronimo/sandbox/monitoring/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/pom.xml Thu Nov 29 11:01:47 2007
@@ -23,39 +23,29 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>client</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <name>Geronimo Stats :: Client</name>
     <packaging>pom</packaging>
     
     <description>
         Geronimo Stats
     </description>
-   
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
 
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
+    <properties>
         <version>1.0-SNAPSHOT</version>
         <consoleVersion>1.0-SNAPSHOT</consoleVersion>
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
         <geronimoServletSpecVersion>1.1</geronimoServletSpecVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
         <xbeanVersion>3.0.1</xbeanVersion>
-
-        <!-- deployers needed to create the CAR files -->
     </properties>
 
     <dependencyManagement>

Modified: geronimo/sandbox/monitoring/monitor-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/monitor-jetty/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/monitor-jetty/pom.xml (original)
+++ geronimo/sandbox/monitoring/monitor-jetty/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,75 +21,68 @@
 <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.mrc</groupId>
-        <artifactId>mrc-server</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>monitoring</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    -->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+    
     <artifactId>monitor-jetty</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Monitoring Bundle CAR (Jetty)</name>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-jetty</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-server-ear</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>mejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
@@ -117,7 +110,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>mrc-server-ear</artifactId>
-                        <version>1.0-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <category>Administration</category>

Modified: geronimo/sandbox/monitoring/monitor-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/monitor-tomcat/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/monitor-tomcat/pom.xml (original)
+++ geronimo/sandbox/monitoring/monitor-tomcat/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,75 +21,69 @@
 <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.mrc</groupId>
-        <artifactId>mrc-server</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>monitoring</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    -->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+    
     <artifactId>monitor-tomcat</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Monitoring Bundle CAR (Tomcat)</name>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>client-tomcat</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-server-ear</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>mejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+           <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
@@ -117,7 +111,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>mrc-server-ear</artifactId>
-                        <version>1.0-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <category>Administration</category>

Modified: geronimo/sandbox/monitoring/mrc-server/MRC.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/MRC.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/MRC.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/MRC.xml Thu Nov 29 11:01:47 2007
@@ -18,9 +18,9 @@
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment">
     <environment>
         <moduleId>
-            <groupId>org.apache.geronimo.monitor</groupId>
-            <artifactId>MRC</artifactId>
-            <version>1.0</version>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mrc-server</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </moduleId>
         <dependencies>
             <dependency>
@@ -35,12 +35,6 @@
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <!--dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>2.0.2-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency-->
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-server</artifactId>

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-car/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-car/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-car/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-car/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,68 +21,62 @@
 <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.mrc</groupId>
+        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>mrc-server</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    -->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    
+    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>mrc-server-car</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Monitoring CAR</name>
     <packaging>car</packaging>
 
     <dependencies>
        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-server-ear</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>mejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
@@ -110,7 +104,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>mrc-server-ear</artifactId>
-                        <version>1.0-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <category>Administration</category>

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,23 +21,16 @@
 <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>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    -->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>mrc-ds-car</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${version}</version>
     <name>Geronimo Plugins :: Monitoring CAR</name>
     <packaging>car</packaging>
 

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/src/main/plan/plan.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ds-car/src/main/plan/plan.xml Thu Nov 29 11:01:47 2007
@@ -2,9 +2,9 @@
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
     <environment>
         <moduleId>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </moduleId>
         <dependencies>
@@ -16,9 +16,9 @@
             </dependency>
             <!-- SQL files -->
 	        <dependency>
-	            <groupId>org.apache.geronimo.modules</groupId>
+	            <groupId>org.apache.geronimo.plugins</groupId>
 	            <artifactId>mrc-sql-jar</artifactId>
-	            <version>2.1-SNAPSHOT</version>
+	            <version>${version}</version>
 	            <type>jar</type>
 	        </dependency>
         </dependencies>

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml Thu Nov 29 11:01:47 2007
@@ -25,29 +25,24 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>mrc-server</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <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.configs</groupId>
-            <artifactId>mrc-server-ds-car</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <type>car</type>
-        </dependency>
-        -->
+
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>mrc-server-ejb</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -68,9 +63,9 @@
                     <version>5</version>
                     <modules>
                         <ejbModule>
-                            <groupId>org.apache.geronimo.modules</groupId>
+                            <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>mrc-server-ejb</artifactId>
-                            <bundleFileName>mrc-server-ejb-2.1-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>mrc-server-ejb-1.0-SNAPSHOT.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                     <resourcesDir>${project.build.outputDirectory}</resourcesDir>

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml Thu Nov 29 11:01:47 2007
@@ -33,7 +33,7 @@
         <dependencies>
             <!-- dependency on the DataSource plugin  -->
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>mrc-server-ds-car</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>car</type>

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml Thu Nov 29 11:01:47 2007
@@ -21,25 +21,26 @@
 <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>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
--->
-    <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <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>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -47,7 +48,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -55,7 +56,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -63,7 +64,7 @@
          <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-mejb</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -71,15 +72,9 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
     </dependencies>
-
-    <artifactId>mrc-server-ejb</artifactId>
-    <name>Geronimo Stats :: Server :: EJB</name>
-    <packaging>jar</packaging>
-
-    <description>Geronimo Stats. EJB Module</description>
-
 
 </project>
 

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/resources/META-INF/openejb-jar.xml Thu Nov 29 11:01:47 2007
@@ -10,7 +10,7 @@
         <sys:moduleId>
             <sys:groupId>org.apache.geronimo.plugins</sys:groupId>
             <sys:artifactId>MRCRemote</sys:artifactId>
-            <sys:version>1.0</sys:version>
+            <sys:version>1.0-SNAPSHOT</sys:version>
             <sys:type>car</sys:type>
         </sys:moduleId>
 

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-sql-jar/pom.xml Thu Nov 29 11:01:47 2007
@@ -18,11 +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.modules</groupId>
-        <artifactId>modules</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <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-sql-jar</artifactId>
+    <version>${version}</version>
     <name>Geronimo Modules :: Monitoring Database Module</name>
     <packaging>jar</packaging>
     <description>

Modified: geronimo/sandbox/monitoring/mrc-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/pom.xml Thu Nov 29 11:01:47 2007
@@ -19,24 +19,18 @@
 -->
 
 <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</artifactId>
+        <artifactId>monitoring</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-
-
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>mrc-server</artifactId>
+    <version>${version}</version>
     <name>Geronimo Stats :: Server</name>
     <packaging>pom</packaging>
     

Modified: geronimo/sandbox/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/pom.xml?rev=599543&r1=599542&r2=599543&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/pom.xml (original)
+++ geronimo/sandbox/monitoring/pom.xml Thu Nov 29 11:01:47 2007
@@ -31,7 +31,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mrc</artifactId>
+    <artifactId>monitoring</artifactId>
     <name>Monitoring and Remote Control</name>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>



Mime
View raw message