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/07/09 23:29:37 UTC

svn commit: r420353 - in /geronimo/sandbox/svkmerge/genesis: bootstrap build build.bat config/pom.xml config/project-config/ config/project-config/pom.xml plugins/pom.xml pom.xml

Author: jdillon
Date: Sun Jul  9 14:29:36 2006
New Revision: 420353

URL: http://svn.apache.org/viewvc?rev=420353&view=rev
Log:
Adding project-config module which contains the bulk of common configuration shared by all/most G projects
Adding build & bootstrap scripts; as we need to have a staged build here to handle extentions

Added:
    geronimo/sandbox/svkmerge/genesis/bootstrap   (with props)
    geronimo/sandbox/svkmerge/genesis/build   (with props)
    geronimo/sandbox/svkmerge/genesis/build.bat   (with props)
    geronimo/sandbox/svkmerge/genesis/config/project-config/
    geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml   (with props)
Modified:
    geronimo/sandbox/svkmerge/genesis/config/pom.xml
    geronimo/sandbox/svkmerge/genesis/plugins/pom.xml
    geronimo/sandbox/svkmerge/genesis/pom.xml

Added: geronimo/sandbox/svkmerge/genesis/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/bootstrap?rev=420353&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/bootstrap (added)
+++ geronimo/sandbox/svkmerge/genesis/bootstrap Sun Jul  9 14:29:36 2006
@@ -0,0 +1,31 @@
+#!/bin/sh
+##
+## $Id$
+##
+
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+warn() {
+    echo "${PROGNAME}: $*"
+}
+
+die() {
+    warn "$*"
+    exit 1
+}
+
+clean() {
+    echo "Cleaning..."
+    
+    rm -rf ~/.m2/repository/org/apache/geronimo/genesis
+    
+    find "$DIRNAME" -name target -type d -exec rm -rf \{\} \;
+}
+
+clean
+
+"$DIRNAME/build"
+
+echo "Done"
+

Propchange: geronimo/sandbox/svkmerge/genesis/bootstrap
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: geronimo/sandbox/svkmerge/genesis/bootstrap
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/svkmerge/genesis/bootstrap
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/genesis/bootstrap
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/genesis/build
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/build?rev=420353&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/build (added)
+++ geronimo/sandbox/svkmerge/genesis/build Sun Jul  9 14:29:36 2006
@@ -0,0 +1,50 @@
+#!/bin/sh
+##
+## $Id$
+##
+
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+warn() {
+    echo "${PROGNAME}: $*"
+}
+
+die() {
+    warn "$*"
+    exit 1
+}
+
+now() {
+    date +'%H:%M:%S %Z %Y'
+}
+
+begin() {
+    warn "Starting multi-stage build..."
+}
+
+abort() {
+    die "Aborted ($startdate to `now`)"
+}
+
+complete() {
+    if [ "$1" == "0" ]; then
+        warn "Completed ($startdate to `now`)"
+    else
+        die "Failed ($startdate to `now`)"
+    fi
+}
+
+startdate=`now`
+
+trap abort STOP KILL INT ABRT
+
+(
+    begin && (
+        mvn -Dstage=bootstrap "$@" && \
+        mvn "$@"
+    ) && complete $?
+)
+
+exit 0
+

Propchange: geronimo/sandbox/svkmerge/genesis/build
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: geronimo/sandbox/svkmerge/genesis/build
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/svkmerge/genesis/build
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/genesis/build
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/genesis/build.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/build.bat?rev=420353&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/build.bat (added)
+++ geronimo/sandbox/svkmerge/genesis/build.bat Sun Jul  9 14:29:36 2006
@@ -0,0 +1,43 @@
+@if "%DEBUG%" == "" @echo off
+@rem 
+@rem $Id$
+@rem 
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%eval[2+2]" == "4" goto 4NT_args
+
+@rem Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto execute
+
+:win9xME_args
+@rem Slurp the command line arguments.  This loop allows for an unlimited number
+set CMD_LINE_ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+
+mvn -Dstage=bootstrap %CMD_LINE_ARGS%
+mvn %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" endlocal
+
+@rem Optional pause the batch file
+if "%DBCOPY_BATCH_PAUSE%" == "on" pause
+

Propchange: geronimo/sandbox/svkmerge/genesis/build.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/sandbox/svkmerge/genesis/build.bat
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/genesis/build.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/svkmerge/genesis/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/config/pom.xml?rev=420353&r1=420352&r2=420353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/config/pom.xml (original)
+++ geronimo/sandbox/svkmerge/genesis/config/pom.xml Sun Jul  9 14:29:36 2006
@@ -37,6 +37,7 @@
         <module>logging-config</module>
         <module>clover-config</module>
         <module>checkstyle-config</module>
+        <module>project-config</module>
     </modules>
     
 </project>

Added: 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=420353&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml (added)
+++ geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml Sun Jul  9 14:29:36 2006
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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.genesis.config</groupId>
+        <artifactId>config</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>project-config</artifactId>
+    <name>Genesis Configuration :: Project</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Provides the common project configuration shared by all Apache Geronimo projects.
+    </description>
+    
+    <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>
+    
+    <!--
+        
+        NOTE: Project pom should define something like:
+    
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo</developerConnection>
+        <url>https://svn.apache.org/repos/asf/geronimo</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>
+            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm</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>
+        <genesis.version>1.0.0-SNAPSHOT</genesis.version>
+    </properties>
+    
+    <dependencyManagement>
+        <dependencies>
+            
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
+    
+    <dependencies>
+        
+        <!-- Test Dependencies -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.genesis.config</groupId>
+            <artifactId>logging-config</artifactId>
+            <version>${genesis.version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        
+    </dependencies>
+    
+    <build>
+        <defaultGoal>install</defaultGoal>
+        
+        <extensions>
+            <extension>
+                <groupId>org.apache.geronimo.genesis.config</groupId>
+                <artifactId>clover-config</artifactId>
+                <version>${genesis.version}</version>
+            </extension>
+            
+            <extension>
+                <groupId>org.apache.geronimo.genesis.config</groupId>
+                <artifactId>checkstyle-config</artifactId>
+                <version>${genesis.version}</version>
+            </extension>
+            
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>1.0-beta-1</version>
+            </extension>
+        </extensions>
+            
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <forkMode>once</forkMode>
+                        <argLine>-enableassertions</argLine>
+                        <workingDirectory>${pom.basedir}/target</workingDirectory>
+                        
+                        <!-- Override the default, do not accept Test* as test classes -->
+                        <excludes>
+                            <exclude>**/Abstract*.java</exclude>
+                            <exclude>**/Test*.java</exclude>
+                        </excludes>
+                        <includes>
+                            <include>**/*Test.java</include>
+                        </includes>
+                    </configuration>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clover-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-one-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-4</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-one-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-rar-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jspc-maven-plugin</artifactId>
+                    <version>1.4.4</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>dependency-maven-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${pom.basedir}</directory>
+                            <includes>
+                                <include>*.log</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clover-plugin</artifactId>
+                <configuration>
+                    <generateHtml>true</generateHtml>
+                    <jdk>1.4</jdk>
+                    <!-- Pulled as resource from clover-config plugin -->
+                    <licenseLocation>org/apache/geronimo/clover.license</licenseLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <!--
+            
+            NOTE: Project pom should define:
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+             </plugin>
+             
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+            
+            -->
+         </plugins>
+    </build>
+    
+    <repositories>
+        
+        <!-- TODO: Remove; setup mirror configuration for central instead. -->
+        <repository>
+            <id>mergere</id>
+            <name>Mergere Repository</name>
+            <url>http://repo.mergere.com/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        
+        <!--
+        
+        FIXME: Do we need to enable this?
+        
+        <repository>
+            <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>
+        </repository>
+        -->
+        
+        <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>apache-snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://people.apache.org/maven-snapshot-repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</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>
+        
+        <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>
+        
+        <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>
+        
+        <!-- TODO: Remove; setup mirror configuration for central instead. -->
+        <pluginRepository>
+            <id>mergere</id>
+            <name>Mergere Repository</name>
+            <url>http://repo.mergere.com/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+        
+        <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>
+        
+        <pluginRepository>
+            <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>
+        </pluginRepository>
+        
+    </pluginRepositories>
+    
+    <profiles>
+        <profile>
+            <id>default</id>
+            
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        
+        <profile>
+            <id>release-environment</id>
+            
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>release</value>
+                </property>
+            </activation>
+            
+            <!--
+               | TODO: Verfiy that these are the correct URL's
+             -->
+            <distributionManagement>
+                <repository>
+                    <id>apache-repo</id>
+                    <name>Apache CVS Repository</name>
+                    <url>scp://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+                </repository>
+                
+                <snapshotRepository>
+                    <id>apache-snapshots</id>
+                    <name>Apache CVS Development Repository</name>
+                    <url>scp://cvs.apache.org/www/cvs.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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <minmemory>128m</minmemory>
+                    <maxmemory>512</maxmemory>
+                    <breakiterator>true</breakiterator>
+                    <quiet>true</quiet>
+                    <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>
+                        <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>
+                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+                        <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+                    </links>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.0.1</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clover-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <!-- Pulled as resource from checkstyle-config plugin -->
+                    <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>

Propchange: geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/genesis/config/project-config/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/svkmerge/genesis/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/plugins/pom.xml?rev=420353&r1=420352&r2=420353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/plugins/pom.xml (original)
+++ geronimo/sandbox/svkmerge/genesis/plugins/pom.xml Sun Jul  9 14:29:36 2006
@@ -57,10 +57,6 @@
         </dependency>
     </dependencies>
     
-    <modules>
-        <module>plugin-support</module>
-    </modules>
-    
     <build>
         <pluginManagement>
             <plugins>
@@ -72,5 +68,9 @@
             </plugins>
         </pluginManagement>
     </build>
+    
+    <modules>
+        <module>plugin-support</module>
+    </modules>
     
 </project>

Modified: geronimo/sandbox/svkmerge/genesis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/genesis/pom.xml?rev=420353&r1=420352&r2=420353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/genesis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/genesis/pom.xml Sun Jul  9 14:29:36 2006
@@ -204,10 +204,43 @@
         </pluginRepository>
     </pluginRepositories>
     
-    <modules>
-        <module>config</module>
-        <module>plugins</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>default</id>
+            
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            
+            <modules>
+                <module>config</module>
+                <module>plugins</module>
+            </modules>
+        </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.
+         -->
+         
+        <profile>
+            <id>stage-bootstrap</id>
+            
+            <activation>
+                <property>
+                    <name>stage</name>
+                    <value>bootstrap</value>
+                </property>
+            </activation>
+            
+            <modules>
+                <module>config/clover-config</module>
+                <module>config/checkstyle-config</module>
+            </modules>
+        </profile>
+    </profiles>
     
 </project>