You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/24 22:23:17 UTC

svn commit: r434508 - in /geronimo/server/trunk: bootstrap.xml m2-plugins/ maven-plugins/ maven-plugins/car-maven-plugin/pom.xml maven-plugins/geronimo-deployment-plugin/pom.xml maven-plugins/pom.xml pom.xml

Author: jdillon
Date: Thu Aug 24 13:23:16 2006
New Revision: 434508

URL: http://svn.apache.org/viewvc?rev=434508&view=rev
Log:
(GERONIMO-2331) Rename m2-plugins to maven-plugins

Added:
    geronimo/server/trunk/maven-plugins/
      - copied from r434494, geronimo/server/trunk/m2-plugins/
Removed:
    geronimo/server/trunk/m2-plugins/
Modified:
    geronimo/server/trunk/bootstrap.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/bootstrap.xml?rev=434508&r1=434507&r2=434508&view=diff
==============================================================================
--- geronimo/server/trunk/bootstrap.xml (original)
+++ geronimo/server/trunk/bootstrap.xml Thu Aug 24 13:23:16 2006
@@ -108,7 +108,7 @@
                 <include name="org/apache/geronimo/configs/**"/>
                 <include name="org/apache/geronimo/applications/**"/>
                 <include name="org/apache/geronimo/assemblies/**"/>
-                <include name="org/apache/geronimo/plugins/**"/>
+                <include name="org/apache/geronimo/maven-plugins/**"/>
             </fileset>
         </delete>
     </target>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=434508&r1=434494&r2=434508&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Thu Aug 24 13:23:16 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plugins</artifactId>
+        <artifactId>maven-plugins</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/pom.xml?rev=434508&r1=434494&r2=434508&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/pom.xml Thu Aug 24 13:23:16 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plugins</artifactId>
+        <artifactId>maven-plugins</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/pom.xml?rev=434508&r1=434494&r2=434508&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/pom.xml Thu Aug 24 13:23:16 2006
@@ -29,23 +29,9 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>plugins</artifactId>
+    <artifactId>maven-plugins</artifactId>
     <name>Geronimo Maven2 Plugins</name>
     <packaging>pom</packaging>
-    
-    <!--
-    
-    HACK: Need to explicitly configure SCM for this module since its artifactId
-          does not match the directory it lives in.
-    
-    FIXME: Rename module directory.
-    
-    -->
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/trunk/m2-plugins</connection>
-        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/m2-plugins</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins</url>
-    </scm>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=434508&r1=434507&r2=434508&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 24 13:23:16 2006
@@ -1065,7 +1065,7 @@
 
             <modules>
                 <module>modules</module>
-                <module>m2-plugins</module>
+                <module>maven-plugins</module>
                 <module>applications</module>
                 <module>configs</module>
                 <module>assemblies</module>
@@ -1097,7 +1097,7 @@
                       Fix this when the modules are reorganized.
                 -->
                 <module>modules</module>
-                <module>m2-plugins</module>
+                <module>maven-plugins</module>
             </modules>
         </profile>
 
@@ -1130,7 +1130,7 @@
 
             <modules>
                 <module>modules</module>
-                <module>m2-plugins</module>
+                <module>maven-plugins</module>
                 <module>applications</module>
                 
                 <!--
@@ -1154,7 +1154,7 @@
 
             <modules>
                 <module>modules</module>
-                <module>m2-plugins</module>
+                <module>maven-plugins</module>
                 <module>applications</module>
             </modules>
         </profile>
@@ -1171,7 +1171,7 @@
 
             <modules>
                 <module>modules</module>
-                <module>m2-plugins</module>
+                <module>maven-plugins</module>
                 <module>applications</module>
             </modules>