geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r614448 - in /geronimo/server/trunk/buildsupport/car-maven-plugin: ./ src/it/j2ee-system-2/ src/it/j2ee-system-2/src/test/resources/META-INF/ src/it/j2ee-system/ src/it/j2ee-system/src/test/resources/META-INF/ src/it/metadatageneration-2/ s...
Date Wed, 23 Jan 2008 08:07:04 GMT
Author: djencks
Date: Wed Jan 23 00:07:00 2008
New Revision: 614448

URL: http://svn.apache.org/viewvc?rev=614448&view=rev
Log:
GERONIMO-3747 fixed itests

Modified:
    geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/goals.txt
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/goals.txt
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/goals.txt
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/goals.txt
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Wed Jan 23 00:07:00 2008
@@ -145,11 +145,6 @@
     
     <build>
         <plugins>
-            <!--
-            FIXME: These test modules are a bit whacky WRT pom parents... 
-                   so turn them off for now, then fix after the o.a.g.buildsupport
-                   change is finished.
-            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>shitty-maven-plugin</artifactId>
@@ -173,7 +168,6 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>
     

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/goals.txt?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/goals.txt (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/goals.txt Wed
Jan 23 00:07:00 2008
@@ -1 +1 @@
-org.apache.geronimo.plugins:car-maven-plugin:validate-configuration org.apache.geronimo.plugins:car-maven-plugin:prepare-plan
org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata 
+org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan
org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata 

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml Wed Jan
23 00:07:00 2008
@@ -23,12 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.buildsupport.it</groupId>
     <artifactId>j2ee-system</artifactId>
     <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
Wed Jan 23 00:07:00 2008
@@ -8,23 +8,23 @@
     <license osi-approved="true">The Apache Software License, Version 2.0</license>
     <plugin-artifact>
         <module-id>
-            <groupId>org.apache.geronimo.plugins</groupId>
+            <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>car</type>
         </module-id>
         <dependency start="true">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <type>jar</type>
         </dependency>
         <dependency start="true">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <type>jar</type>
         </dependency>
         <dependency start="true">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-util</artifactId>
             <type>jar</type>
         </dependency>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
Wed Jan 23 00:07:00 2008
@@ -23,24 +23,24 @@
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <environment>
     <moduleId>
-      <groupId>org.apache.geronimo.plugins</groupId>
+      <groupId>org.apache.geronimo.buildsupport.it</groupId>
       <artifactId>j2ee-system</artifactId>
       <version>2.1-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-common</artifactId>
         <type>jar</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-system</artifactId>
         <type>jar</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-util</artifactId>
         <type>jar</type>
       </dependency>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/goals.txt?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/goals.txt (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/goals.txt Wed Jan
23 00:07:00 2008
@@ -1 +1 @@
-org.apache.geronimo.plugins:car-maven-plugin:validate-configuration org.apache.geronimo.plugins:car-maven-plugin:prepare-plan
org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata 
+org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan
org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata 

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml Wed Jan
23 00:07:00 2008
@@ -23,12 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.buildsupport.it</groupId>
     <artifactId>j2ee-system</artifactId>
     <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Wed Jan 23 00:07:00 2008
@@ -8,7 +8,7 @@
     <license osi-approved="true">The Apache Software License, Version 2.0</license>
     <plugin-artifact>
         <module-id>
-            <groupId>org.apache.geronimo.plugins</groupId>
+            <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>car</type>
@@ -26,7 +26,7 @@
             <type>jar</type>
         </dependency>
         <dependency start="false">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>jar</type>
@@ -38,7 +38,7 @@
             <type>jar</type>
         </dependency>
         <dependency start="false">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-util</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>jar</type>
@@ -92,7 +92,7 @@
             <type>jar</type>
         </dependency>
         <dependency start="false">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>jar</type>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
Wed Jan 23 00:07:00 2008
@@ -23,7 +23,7 @@
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <environment>
     <moduleId>
-      <groupId>org.apache.geronimo.plugins</groupId>
+      <groupId>org.apache.geronimo.buildsupport.it</groupId>
       <artifactId>j2ee-system</artifactId>
       <version>2.1-SNAPSHOT</version>
       <type>car</type>
@@ -44,7 +44,7 @@
         <import>classes</import>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-common</artifactId>
         <version>2.1-SNAPSHOT</version>
         <type>jar</type>
@@ -58,7 +58,7 @@
         <import>classes</import>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-util</artifactId>
         <version>2.1-SNAPSHOT</version>
         <type>jar</type>
@@ -121,7 +121,7 @@
         <import>classes</import>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-system</artifactId>
         <version>2.1-SNAPSHOT</version>
         <type>jar</type>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/goals.txt?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/goals.txt
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/goals.txt
Wed Jan 23 00:07:00 2008
@@ -1 +1 @@
-org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata
+org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
Wed Jan 23 00:07:00 2008
@@ -25,15 +25,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins.it</groupId>
-    <artifactId>car-maven-plugin</artifactId>
-    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <groupId>org.apache.geronimo.buildsupport.it</groupId>
+    <artifactId>metadatatest-2</artifactId>
+    <name>Metadata test 2</name>
     <packaging>jar</packaging>
 
     <dependencies>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
Wed Jan 23 00:07:00 2008
@@ -8,7 +8,7 @@
     <license osi-approved="true">The Apache Software License, Version 2.0</license>
     <plugin-artifact>
         <module-id>
-            <groupId>org.apache.geronimo.plugins.it</groupId>
+            <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>car-maven-plugin</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>jar</type>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/goals.txt?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/goals.txt
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/goals.txt
Wed Jan 23 00:07:00 2008
@@ -1 +1 @@
-org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata
+org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
Wed Jan 23 00:07:00 2008
@@ -25,14 +25,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins.it</groupId>
-    <artifactId>car-maven-plugin</artifactId>
-    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <groupId>org.apache.geronimo.buildsupport.it</groupId>
+    <artifactId>metadatageneration</artifactId>
+    <name>Metadata generation test</name>
     <packaging>jar</packaging>
 
     <dependencies>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=614448&r1=614447&r2=614448&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
Wed Jan 23 00:07:00 2008
@@ -8,7 +8,7 @@
     <license osi-approved="true">The Apache Software License, Version 2.0</license>
     <plugin-artifact>
         <module-id>
-            <groupId>org.apache.geronimo.plugins.it</groupId>
+            <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>car-maven-plugin</artifactId>
             <version>2.1-SNAPSHOT</version>
             <type>jar</type>
@@ -35,7 +35,7 @@
             <type>jar</type>
         </dependency>
         <dependency start="false">
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>2.1-SNAPSHOT</version>
         </dependency>



Mime
View raw message