[maven-release-plugin] copy for tag genesis-1.4
git-svn-id: https://svn.apache.org/repos/asf/geronimo/genesis/tags/genesis-1.4@636214 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README
similarity index 85%
rename from README.txt
rename to README
index d45e734..e1116c6 100644
--- a/README.txt
+++ b/README
@@ -6,8 +6,8 @@
Building for the first time
===========================
-Genesis currently must be bootstrapped, which will build all modules that are
-used as extensions by config/project-config.
+Genesis currently must be bootstrapped, which will build partial builds until
+all plugins are available.
You will need Ant installed and available in the search path of your shell.
diff --git a/bootstrap.xml b/bootstrap.xml
index 359693b..211c278 100644
--- a/bootstrap.xml
+++ b/bootstrap.xml
@@ -38,7 +38,7 @@
<attribute name="name"/>
<sequential>
<exec executable="mvn${platform.script.ext}" dir="${basedir}">
- <arg value="-Dstage=@{name}"/>
+ <arg value="-N"/>
<arg value="install"/>
</exec>
</sequential>
@@ -69,17 +69,21 @@
<!-- Steps -->
<!-- ===== -->
- <target name="bootstrap" depends="clean, stage1, stage2"/>
+ <target name="bootstrap" depends="clean, stage1, stage2, stage3"/>
<target name="stage1" depends="init">
<build-stage name="bootstrap"/>
</target>
<target name="stage2" depends="init">
- <mvn goal="install"/>
+ <mvn goal="install" dir="plugins"/>
</target>
-
+ <target name="stage3" depends="init">
+ <mvn goal="install"/>
+ </target>
+
+
<!-- ======== -->
<!-- Cleaning -->
<!-- ======== -->
diff --git a/config/checkstyle-config/pom.xml b/config/checkstyle-config/pom.xml
deleted file mode 100644
index ae3cb42..0000000
--- a/config/checkstyle-config/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>checkstyle-config</artifactId>
- <name>Genesis Configuration :: Checkstyle</name>
- <packaging>jar</packaging>
-
- <description>
- Provides the common Checkstyle configuration used by all modules.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
-
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- </resource>
- </resources>
- </build>
-
-</project>
-
diff --git a/config/checkstyle-config/src/main/resources/org/apache/geronimo/checkstyle.xml b/config/checkstyle-config/src/main/resources/org/apache/geronimo/checkstyle.xml
deleted file mode 100644
index 687090d..0000000
--- a/config/checkstyle-config/src/main/resources/org/apache/geronimo/checkstyle.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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$ -->
-
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="PackageHtml"/>
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
-
- <module name="TreeWalker">
-
- <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocMethod"/>
- <module name="JavadocType"/>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle"/>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="FileLength"/>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
- </module>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <!--module name="DesignForExtension"/-->
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/>
-
- </module>
-
-</module>
diff --git a/config/checkstyle-config/src/site/apt/usage.apt b/config/checkstyle-config/src/site/apt/usage.apt
deleted file mode 100644
index 0c7712f..0000000
--- a/config/checkstyle-config/src/site/apt/usage.apt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you 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.
-~~
-
- ------
- Genesis Checkstyle Configuration
- ------
- ???
- ------
- ???
-
-Usage
-
-* Setup
-
- To use, the module must first be installed as an extention.
-
-+----------+
-<build>
- <extensions>
- <extension>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>checkstyle-config</artifactId>
- </extension>
- </extensions>
-</build>
-+----------+
-
-* Configure Checkstyle
-
- Configure the <<<maven-checkstyle-plugin>>> to know about the <<<checkstyle.xml>>>
- resource which is contained in the <<<checkstyle-config>>> module.
-
-+----------+
-<reporting>
- <plugind>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
-</reporting>
-+----------+
diff --git a/config/checkstyle-config/src/site/site.xml b/config/checkstyle-config/src/site/site.xml
deleted file mode 100644
index 35594ff..0000000
--- a/config/checkstyle-config/src/site/site.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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 name="${project.name}">
-
- <body>
-
- ${parentProject}
-
- ${modules}
-
- <menu name="${project.name}">
- <item name="Overview" href="index.html"/>
- <item name="Usage" href="usage.html"/>
- </menu>
-
- ${reports}
-
- </body>
-
-</project>
-
-
diff --git a/config/geronimo-skin/pom.xml b/config/geronimo-skin/pom.xml
index d468ad7..28ac684 100644
--- a/config/geronimo-skin/pom.xml
+++ b/config/geronimo-skin/pom.xml
@@ -43,22 +43,5 @@
<maven.test.skip>true</maven.test.skip>
</properties>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
-
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- </resource>
- </resources>
- </build>
-
</project>
diff --git a/config/geronimo-skin/src/main/resources/images/maven-feather.png b/config/geronimo-skin/src/main/resources/images/logos/maven-feather.png
similarity index 100%
rename from config/geronimo-skin/src/main/resources/images/maven-feather.png
rename to config/geronimo-skin/src/main/resources/images/logos/maven-feather.png
Binary files differ
diff --git a/config/geronimo-skin/src/site/site.xml b/config/geronimo-skin/src/site/site.xml
index 35594ff..7486407 100644
--- a/config/geronimo-skin/src/site/site.xml
+++ b/config/geronimo-skin/src/site/site.xml
@@ -23,18 +23,13 @@
<project name="${project.name}">
<body>
-
- ${parentProject}
-
- ${modules}
-
+ <menu ref="parent" />
+ <menu ref="modules" />
<menu name="${project.name}">
<item name="Overview" href="index.html"/>
<item name="Usage" href="usage.html"/>
</menu>
-
- ${reports}
-
+ <menu ref="reports" />
</body>
</project>
diff --git a/config/logging-config/pom.xml b/config/logging-config/pom.xml
deleted file mode 100644
index e5139dd..0000000
--- a/config/logging-config/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>logging-config</artifactId>
- <name>Genesis Configuration :: Logging</name>
- <packaging>jar</packaging>
-
- <description>
- Provides the common logging configuration used by the build process,
- primarily used to collect test output into 'target/test.log'.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
-
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- </resource>
- </resources>
- </build>
-
-</project>
-
diff --git a/config/logging-config/src/main/resources/org/apache/geronimo/test-log4j.properties b/config/logging-config/src/main/resources/org/apache/geronimo/test-log4j.properties
deleted file mode 100644
index 42d524d..0000000
--- a/config/logging-config/src/main/resources/org/apache/geronimo/test-log4j.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you 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$
-##
-
-log4j.rootLogger=DEBUG, CONSOLE, FILE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.Threshold=ERROR
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-
-log4j.appender.FILE=org.apache.log4j.FileAppender
-log4j.appender.FILE.File=${basedir}/target/test.log
-log4j.appender.FILE.Threshold=DEBUG
-log4j.appender.FILE.Append=false
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p (%t) [%c] %m%n
-
-#
-# Example: enable trace logging from CONSOLE appender
-#
-#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
-
-#
-# Example: enable trace messages from foo.bar category
-#
-#log4j.logger.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
-
diff --git a/config/logging-config/src/site/apt/usage.apt b/config/logging-config/src/site/apt/usage.apt
deleted file mode 100644
index 938f2f2..0000000
--- a/config/logging-config/src/site/apt/usage.apt
+++ /dev/null
@@ -1,47 +0,0 @@
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you 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.
-~~
-
- ------
- Genesis Logging Configuration
- ------
- ???
- ------
- ???
-
-Usage
-
-* Setup
-
- To use, the module must first be installed a test dependency. This will setup
- the build to include the default <<<log4j.properties>>>.
-
- Minimal output will be displayed on the console, and full detail will be captured
- for each module in <<<$\{basedir\}/target/test.log>>>
-
-+----------+
-<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>logging-config</artifactId>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
-</dependencies>
-+----------+
-
diff --git a/config/logging-config/src/site/site.xml b/config/logging-config/src/site/site.xml
deleted file mode 100644
index 35594ff..0000000
--- a/config/logging-config/src/site/site.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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 name="${project.name}">
-
- <body>
-
- ${parentProject}
-
- ${modules}
-
- <menu name="${project.name}">
- <item name="Overview" href="index.html"/>
- <item name="Usage" href="usage.html"/>
- </menu>
-
- ${reports}
-
- </body>
-
-</project>
-
-
diff --git a/config/pom.xml b/config/pom.xml
index 9d9b9a7..7400e7b 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -37,10 +37,64 @@
<packaging>pom</packaging>
<modules>
- <module>logging-config</module>
- <module>checkstyle-config</module>
<module>project-config</module>
<module>geronimo-skin</module>
</modules>
+ <build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${legalBundleVersion}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were found -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/config/project-config/pom.xml b/config/project-config/pom.xml
index 401a2f0..47180f3 100644
--- a/config/project-config/pom.xml
+++ b/config/project-config/pom.xml
@@ -41,7 +41,7 @@
</description>
<organization>
- <name>Apache Software Foundation</name>
+ <name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
@@ -130,23 +130,11 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>logging-config</artifactId>
- <version>1.4</version>
- </dependency>
-
+
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>logging-config</artifactId>
- <scope>test</scope>
- </dependency>
-
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -171,22 +159,10 @@
<directory>${pom.basedir}/src/test/resources</directory>
</testResource>
- <!--
- TODO: Drop this... its not got much meaning
- -->
- <testResource>
- <directory>${pom.basedir}/src/test/data</directory>
- </testResource>
</testResources>
<extensions>
<extension>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>checkstyle-config</artifactId>
- <version>1.4</version>
- </extension>
-
- <extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-beta-2</version>
@@ -195,6 +171,7 @@
<pluginManagement>
<plugins>
+ <!-- maven-remote-resources-plugin and tools-maven-plugin are in parent pom -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -260,24 +237,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${legalBundleVersion}</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
@@ -338,12 +297,6 @@
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <version>1.4</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
@@ -373,10 +326,6 @@
</plugin>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
</plugins>
</build>
@@ -459,25 +408,12 @@
<profiles>
<profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
-
- <profile>
<id>tools</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -549,15 +485,19 @@
<version>2.0.1</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 -->
+ -->
+<!-- Pulled as resource from checkstyle-config plugin -->
+<!--
<configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
</configuration>
</plugin>
+-->
</plugins>
</reporting>
diff --git a/config/project-config/src/site/site.xml b/config/project-config/src/site/site.xml
index 728fe3b..fd11224 100644
--- a/config/project-config/src/site/site.xml
+++ b/config/project-config/src/site/site.xml
@@ -21,27 +21,10 @@
<!-- $Rev$ $Date$ -->
<project name="${project.name}">
-<!--
- <skin>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>geronimo-skin</artifactId>
- <version>1.4-SNAPSHOT</version>
- </skin>
--->
- <publishDate format="dd MMM yyyy"/>
-
- <bannerLeft>
- <src>images/topleft_logo_437x64.gif</src>
- <href>http://geronimo.apache.org</href>
- </bannerLeft>
-
<body>
-
<menu ref="parent" />
-
- ${reports}
-
+ <menu ref="reports" />
</body>
</project>
diff --git a/config/src/site/site.xml b/config/src/site/site.xml
index e517196..bc93a62 100644
--- a/config/src/site/site.xml
+++ b/config/src/site/site.xml
@@ -25,9 +25,7 @@
<body>
<menu ref="parent" />
<menu ref="modules" />
-
- ${reports}
-
+ <menu ref="reports" />
</body>
</project>
diff --git a/legal-bundle/src/main/resources/META-INF/NOTICE.vm b/legal-bundle/src/main/resources/META-INF/NOTICE.vm
index 376634a..43dab2a 100644
--- a/legal-bundle/src/main/resources/META-INF/NOTICE.vm
+++ b/legal-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -23,4 +23,4 @@
Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
This product includes software developed at
-Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/plugins/maven-maven-plugin/src/site/site.xml b/plugins/maven-maven-plugin/src/site/site.xml
index 4b20836..3128cdc 100644
--- a/plugins/maven-maven-plugin/src/site/site.xml
+++ b/plugins/maven-maven-plugin/src/site/site.xml
@@ -23,19 +23,14 @@
<project name="${project.name}">
<body>
-
- ${parentProject}
-
- ${modules}
-
+ <menu ref="parent" />
+ <menu ref="modules" />
<menu name="${project.name}">
<item name="Overview" href="index.html"/>
<item name="Usage" href="usage.html"/>
<item name="Configuration" href="plugin-info.html"/>
</menu>
-
- ${reports}
-
+ <menu ref="reports" />
</body>
</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a9c7c4e..228f833 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -73,15 +73,7 @@
<directory>${pom.basedir}/src/main/resources</directory>
</resource>
</resources>
-
- <extensions>
- <extension>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>checkstyle-config</artifactId>
- <version>1.4</version>
- </extension>
- </extensions>
-
+
<pluginManagement>
<plugins>
<plugin>
@@ -185,16 +177,20 @@
<version>2.0.1</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 -->
+ -->
+<!-- Pulled as resource from checkstyle-config plugin -->
+<!--
<configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
</configuration>
</plugin>
-
+-->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
diff --git a/plugins/src/site/site.xml b/plugins/src/site/site.xml
index 80f99dd..bc93a62 100644
--- a/plugins/src/site/site.xml
+++ b/plugins/src/site/site.xml
@@ -23,13 +23,9 @@
<project name="${project.name}">
<body>
-
- ${parentProject}
-
- ${modules}
-
- ${reports}
-
+ <menu ref="parent" />
+ <menu ref="modules" />
+ <menu ref="reports" />
</body>
</project>
diff --git a/plugins/tools-maven-plugin/src/site/site.xml b/plugins/tools-maven-plugin/src/site/site.xml
index 4b20836..3128cdc 100644
--- a/plugins/tools-maven-plugin/src/site/site.xml
+++ b/plugins/tools-maven-plugin/src/site/site.xml
@@ -23,19 +23,14 @@
<project name="${project.name}">
<body>
-
- ${parentProject}
-
- ${modules}
-
+ <menu ref="parent" />
+ <menu ref="modules" />
<menu name="${project.name}">
<item name="Overview" href="index.html"/>
<item name="Usage" href="usage.html"/>
<item name="Configuration" href="plugin-info.html"/>
</menu>
-
- ${reports}
-
+ <menu ref="reports" />
</body>
</project>
diff --git a/pom.xml b/pom.xml
index 552c9e4..281ecdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,41 +175,13 @@
</site>
</distributionManagement>
+ <modules>
+ <module>legal-bundle</module>
+ <module>config</module>
+ <module>plugins</module>
+ </modules>
+
<profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>legal-bundle</module>
- <module>config</module>
- <module>plugins</module>
- </modules>
- </profile>
-
- <!--
- NOTE: The staged build is used to get around a problem with Maven
- and extension 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/checkstyle-config</module>
- </modules>
- </profile>
<profile>
<id>release</id>
diff --git a/src/site/site.xml b/src/site/site.xml
index 04c3a00..872bbca 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -41,9 +41,9 @@
<item name="Apache" href="http://apache.org/"/>
</links>
- ${modules}
-
- ${reports}
+ <menu ref="parent" />
+ <menu ref="modules" />
+ <menu ref="reports" />
</body>
</project>
