geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422634 - in /geronimo/sandbox/svkmerge/genesis: bootstrap config/project-config/pom.xml pom.xml
Date Mon, 17 Jul 2006 06:27:09 GMT
Author: jdillon
Date: Sun Jul 16 23:27:09 2006
New Revision: 422634

URL: http://svn.apache.org/viewvc?rev=422634&view=rev
Log:
Strip down needed config from the root
Clean up project-config

Modified:
    geronimo/sandbox/svkmerge/genesis/bootstrap
    geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml
    geronimo/sandbox/svkmerge/genesis/pom.xml

Modified: geronimo/sandbox/svkmerge/genesis/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/bootstrap?rev=422634&r1=422633&r2=422634&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/bootstrap (original)
+++ geronimo/sandbox/svkmerge/genesis/bootstrap Sun Jul 16 23:27:09 2006
@@ -25,9 +25,12 @@
     done
 }
 
-clean
-
-"$DIRNAME/build"
-
-echo "Done"
+main() {
+    clean
+    
+    "$DIRNAME/build"
+    
+    echo "Done"
+}
 
+main | 2>&1 tee bootstrap.log

Modified: geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml?rev=422634&r1=422633&r2=422634&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml (original)
+++ geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml Sun Jul 16 23:27:09 2006
@@ -52,7 +52,6 @@
     </licenses>
     
     <!--
-    
     NOTE: Project pom should define something like:
     
     <scm>
@@ -60,7 +59,6 @@
         <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo</developerConnection>
         <url>https://svn.apache.org/repos/asf/geronimo</url>
     </scm>
-    
     -->
     
     <mailingLists>
@@ -308,7 +306,6 @@
             </plugin>
             
             <!--
-            
             NOTE: Project pom should define:
             
             <plugin>
@@ -329,6 +326,13 @@
                 </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>
@@ -362,26 +366,6 @@
             </releases>
         </repository>
         
-        <!--
-        
-        FIXME: Should remove this guy...
-        
-        -->
-        <repository>
-            <id>apache-m1</id>
-            <name>Apache Maven 1 Repository</name>
-            <url>http://people.apache.org/repository</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        
         <repository>
             <id>codehaus</id>
             <name>Codehaus Repository</name>
@@ -410,26 +394,6 @@
             </releases>
         </repository>
         
-        <!--
-        
-        FIXME: Should remove this guy...
-        
-        -->
-        <repository>
-            <id>codehaus-m1</id>
-            <name>Codehaus Maven 1 Repository</name>
-            <url>http://dist.codehaus.org</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        
     </repositories>
     
     <pluginRepositories>
@@ -490,6 +454,29 @@
         </pluginRepository>
     </pluginRepositories>
     
+    <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>
+        
+        <!--
+        NOTE: Project pom should define something like:
+        
+        <site>
+            <id>geronimo-website</id>
+            <url>scp://people.apache.org/www/geronimo.apache.org/maven/${pom.groupId}</url>
+        </site>
+        -->
+    </distributionManagement>
+    
     <profiles>
         <profile>
             <id>default</id>
@@ -498,62 +485,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
-        
-        <profile>
-            <id>release-environment</id>
-            
-            <activation>
-                <property>
-                    <name>env</name>
-                    <value>release</value>
-                </property>
-            </activation>
-            
-            <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>
-                
-                <!--
-                
-                NOTE: Project pom should define something like:
-                
-                <site>
-                    <id>geronimo-website</id>
-                    <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
-                </site>
-                
-                -->
-            </distributionManagement>
-            
-            <build>
-                <defaultGoal>deploy</defaultGoal>
-                
-                <!--
-                
-                NOTE: Project pom should define something like:
-                
-                <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>
     
     <reporting>
@@ -576,20 +507,24 @@
                     <verbose>false</verbose>
                     <source>1.4</source>
                     <!--
-                    
                     FIXME: This worked in m1, but m2 complains about it being an invalid
flag
                     
                     <additionalparam>-J-Djava.awt.headless=true</additionalparam>
                     -->
                     <linksource>true</linksource>
                     <links>
+                        <!-- JSE -->
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
                         <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
                         <link>http://java.sun.com/j2se/1.3/docs/api/</link>
+                        
+                        <!-- JEE -->
                         <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
                         <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+                        
+                        <!-- Libraries -->
                         <link>http://jakarta.apache.org/commons/collections/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/logging/api/</link>
+                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
                         <link>http://www.junit.org/junit/javadoc/</link>
                         <link>http://logging.apache.org/log4j/docs/api/</link>
                         <link>http://jakarta.apache.org/regexp/apidocs/</link>

Modified: geronimo/sandbox/svkmerge/genesis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/pom.xml?rev=422634&r1=422633&r2=422634&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/genesis/pom.xml Sun Jul 16 23:27:09 2006
@@ -21,6 +21,12 @@
     
     <modelVersion>4.0.0</modelVersion>
     
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>2</version>
+    </parent>
+    
     <groupId>org.apache.geronimo.genesis</groupId>
     <artifactId>genesis</artifactId>
     <name>Genesis</name>
@@ -30,23 +36,8 @@
     
     <url>http://geronimo.apache.org</url>
     
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-    
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    
     <!--
-    
     FIXME: When Genesis has a real home update this...
-    
     -->
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/genesis</connection>
@@ -54,65 +45,6 @@
         <url>https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/genesis</url>
     </scm>
     
-    <mailingLists>
-        <mailingList>
-            <name>Geronimo User List</name>
-            <subscribe>user-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>user-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>mailto:user@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-user</archive>
-            <otherArchives>
-                <otherArchive>http://www.nabble.com/Apache-Geronimo---Users-f135.html</otherArchive>
-            </otherArchives>
-        </mailingList>
-        
-        <mailingList>
-            <name>Geronimo Developer List</name>
-            <subscribe>dev-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>mailto:dev@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev</archive>
-            <otherArchives>
-                <otherArchive>http://www.nabble.com/Apache-Geronimo---Dev-f136.html</otherArchive>
-            </otherArchives>
-        </mailingList>
-        
-        <mailingList>
-            <name>Source Control List</name>
-            <subscribe>scm-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>scm-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>scm@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm</archive>
-        </mailingList>
-        
-        <!-- ASF-wide lists -->
-        
-        <mailingList>
-            <name>Apache Announce List</name>
-            <subscribe>announce-subscribe@apache.org</subscribe>
-            <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
-            <post>announce@apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
-        </mailingList>
-    </mailingLists>
-    
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/GERONIMO</url>
-    </issueManagement>
-    
-    <ciManagement>
-        <system>continuum</system>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <sendOnError/>
-                <sendOnFailure/>
-                <address>dev@geronimo.apache.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-    
     <properties>
         <maven.version>2.0.4</maven.version>
     </properties>
@@ -127,6 +59,20 @@
                 <version>1.0-beta-1</version>
             </extension>
         </extensions>
+        
+        <!--
+        TODO: Use a real value here when moved out of the sandbox...
+        
+        <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>
     
     <repositories>
@@ -142,48 +88,26 @@
                 <enabled>true</enabled>
             </releases>
         </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>
     </repositories>
     
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache</id>
-            <name>Apache Repository</name>
-            <url>http://www.apache.org/dist/maven-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
+    <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>
         
-        <pluginRepository>
-            <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>
-        </pluginRepository>
-    </pluginRepositories>
+        <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/${pom.groupId}</url>
+        </site>
+    </distributionManagement>
     
     <profiles>
         <profile>
@@ -200,12 +124,11 @@
         </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>
             
@@ -220,67 +143,6 @@
                 <module>config/clover-config</module>
                 <module>config/checkstyle-config</module>
             </modules>
-        </profile>
-        
-        <profile>
-            <id>release-environment</id>
-            
-            <activation>
-                <property>
-                    <name>env</name>
-                    <value>release</value>
-                </property>
-            </activation>
-            
-            <modules>
-                <module>config</module>
-                <module>plugins</module>
-            </modules>
-            
-            <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>
-                
-                <!--
-                
-                NOTE: Project pom should define something like:
-                
-                <site>
-                    <id>geronimo-website</id>
-                    <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
-                </site>
-                
-                -->
-            </distributionManagement>
-            
-            <build>
-                <defaultGoal>deploy</defaultGoal>
-                
-                <!--
-                
-                NOTE: Project pom should define something like:
-                
-                <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>
     



Mime
View raw message