Return-Path: 
 <scm-return-13571-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 55427 invoked from network); 17 Jul 2006 19:51:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Jul 2006 19:51:11 -0000
Received: (qmail 92549 invoked by uid 500); 17 Jul 2006 19:51:10 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 92527 invoked by uid 500); 17 Jul 2006 19:51:10 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 92516 invoked by uid 99); 17 Jul 2006 19:51:10 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2006 12:51:10 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2006 12:51:09 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7DE401A981A; Mon, 17 Jul 2006 12:50:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r422823 - /geronimo/sandbox/svkmerge/m2migration/pom.xml
Date: Mon, 17 Jul 2006 19:50:48 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060717195049.7DE401A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Mon Jul 17 12:50:48 2006
New Revision: 422823

URL: http://svn.apache.org/viewvc?rev=422823&view=rev
Log:
Reduce duplication from stuff in Genesis

Modified:
    geronimo/sandbox/svkmerge/m2migration/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=422823&r1=422822&r2=422823&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Mon Jul 17 12:50:48 2006
@@ -39,7 +39,6 @@
     </description>
     
     <!--
-    
     FIXME: Replace when merged back to trunk
     
     <scm>
@@ -58,10 +57,8 @@
         <genesis.version>1.0.0-SNAPSHOT</genesis.version>
         
         <!--
-        
         HACK: These properties are currently needed in child poms, so we need to keep them around.
               Usage of these properties should be removed whenever possible.
-        
         -->
         
         <asn1Version>0.3.2</asn1Version>
@@ -494,7 +491,6 @@
                 <exclusions>
                     <!-- Exclude commons-logging (uses 1.3) -->
                     <!--
-                    
                     HACK: For some crazy reason, if we exclude this here, then
                           modules/jetty will fail to compile and there is no
                           way to convince m2 to put the jar back on the classpath
@@ -604,8 +600,11 @@
     </dependencyManagement>
     
     <build>
-        <!-- FIXME: Need to reorganize modules to use the standard maven module layout -->
+        <!--
         
+        FIXME: Need to reorganize modules to use the standard maven module layout
+        
+        -->
         <sourceDirectory>src/java</sourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
         
@@ -660,10 +659,8 @@
                 </plugin>
                 
                 <!--
-                
                 NOTE: WAR & JSPC are overridden here (from project-config) to specify non-standard paths.
                       Remove once modules have been reorganized to use the m2 standard layout.
-                
                 -->
                 
                 <plugin>
@@ -715,16 +712,23 @@
                     <linkModules>true</linkModules>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <tagBase>https://svn.apache.org/repos/asf/geronimo/tags</tagBase>
+                </configuration>
+            </plugin>
          </plugins>
     </build>
     
-    <!--
-    
-    TODO: We will pick up the default repos from Genesis, so only need to list the
-          repo's where genesis is, as well as any custom repos here...
-    
-    -->
     <repositories>
+        <!--
+        NOTE: The default repositories are picked up by Genesis, but need to 
+              specify where Genesis lives to pick it up + any additional repositories.
+        -->
+        
         <repository>
             <id>apache</id>
             <name>Apache Repository</name>
@@ -754,9 +758,8 @@
         </repository>
         
         <!--
-        
-        FIXME: Should remove this guy...
-        
+        FIXME: Include the legacy Apache and Codehaus repositories... should eventually
+               ween ourselves off of them...
         -->
         <repository>
             <id>apache-m1</id>
@@ -774,39 +777,6 @@
         </repository>
         
         <repository>
-            <id>codehaus</id>
-            <name>Codehaus Repository</name>
-            <url>http://repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        
-        <repository>
-            <id>codehaus-snapshots</id>
-            <name>Codehaus Snapshots Repository</name>
-            <url>http://snapshots.repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        
-        <!--
-        
-        FIXME: Should remove this guy...
-        
-        -->
-        <repository>
             <id>codehaus-m1</id>
             <name>Codehaus Maven 1 Repository</name>
             <url>http://dist.codehaus.org</url>
@@ -823,6 +793,17 @@
         
     </repositories>
     
+    <distributionManagement>
+        <!--
+        NOTE: The repository and snapshotRepository are picked up from Genesis.
+        -->
+        
+        <site>
+            <id>geronimo-website</id>
+            <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
+        </site>
+    </distributionManagement>
+    
     <profiles>
         <profile>
             <id>default</id>
@@ -841,12 +822,12 @@
         </profile>
         
         <!--
-           | NOTE: The staged build is used to get around a problem with Maven
-           |       and extention plugins.
-           |
-           |       See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
-         -->
-         
+        NOTE: The staged build is used to get around a problem with Maven
+              and extention plugins.
+              
+              See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
+        -->
+        
         <profile>
             <id>stage-bootstrap</id>
             
@@ -859,7 +840,6 @@
             
             <modules>
                 <!--
-                
                 NOTE: This should really only include the bare minimum set of modules
                       that are required to build the plugins.  But right now that set
                       includes most modules, so for now just build everything.
@@ -902,54 +882,13 @@
                 <module>m2-plugins</module>
                 
                 <!--
-                
                 NOTE: Probably do not want to publish these to the repo...  Or do we?
                 
                 <module>applications</module>
                 <module>configs</module>
                 <module>m2-assemblies</module>
-                
                 -->
             </modules>
-            
-            <!--
-            
-            TODO: See if we can inherit a profile to enable these, or just make them default
-                  and pick up from Genesis
-            
-            -->
-            <distributionManagement>
-                <repository>
-                    <id>apache-releases</id>
-                    <name>Apache Release Distribution Repository</name>
-                    <url>scp://people.apache.org/www/www.apache.org/dist/maven-repository</url>
-                </repository>
-                
-                <snapshotRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Development Snapshot Repository</name>
-                    <url>scp://people.apache.org/www/people.apache.org/maven-snapshot-repository</url>
-                </snapshotRepository>
-                
-                <site>
-                    <id>geronimo-website</id>
-                    <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
-                </site>
-            </distributionManagement>
-            
-            <build>
-                <defaultGoal>deploy</defaultGoal>
-                
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                        <configuration>
-                            <tagBase>https://svn.apache.org/repos/asf/geronimo/tags</tagBase>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>