You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/11 07:13:01 UTC
svn commit: r635811 - in /geronimo/genesis/trunk: ./ config/
config/checkstyle-config/ config/geronimo-skin/
config/geronimo-skin/src/main/resources/images/
config/geronimo-skin/src/main/resources/images/logos/
config/logging-config/ config/project-con...
Author: djencks
Date: Mon Mar 10 23:12:56 2008
New Revision: 635811
URL: http://svn.apache.org/viewvc?rev=635811&view=rev
Log:
Remove checkstyle-config and logging-config per jdillons suggestion. Add legal files to geronimo-skin. Fix NOTICE file text. Fix logo location in skin.
Added:
geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/images/logos/
geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/images/logos/maven-feather.png (props changed)
- copied unchanged from r635662, geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/images/maven-feather.png
Removed:
geronimo/genesis/trunk/bootstrap
geronimo/genesis/trunk/bootstrap.bat
geronimo/genesis/trunk/bootstrap.xml
geronimo/genesis/trunk/config/checkstyle-config/
geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/images/maven-feather.png
geronimo/genesis/trunk/config/logging-config/
Modified:
geronimo/genesis/trunk/config/geronimo-skin/pom.xml
geronimo/genesis/trunk/config/pom.xml
geronimo/genesis/trunk/config/project-config/pom.xml
geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm
geronimo/genesis/trunk/plugins/pom.xml
geronimo/genesis/trunk/pom.xml
Modified: geronimo/genesis/trunk/config/geronimo-skin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/geronimo-skin/pom.xml?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/geronimo-skin/pom.xml (original)
+++ geronimo/genesis/trunk/config/geronimo-skin/pom.xml Mon Mar 10 23:12:56 2008
@@ -43,22 +43,16 @@
<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>
Propchange: geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/images/logos/maven-feather.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: geronimo/genesis/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/pom.xml?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/pom.xml (original)
+++ geronimo/genesis/trunk/config/pom.xml Mon Mar 10 23:12:56 2008
@@ -37,10 +37,38 @@
<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>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Mon Mar 10 23:12:56 2008
@@ -41,7 +41,7 @@
</description>
<organization>
- <name>Apache Software Foundation</name>
+ <name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
@@ -171,22 +171,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-SNAPSHOT</version>
- </extension>
-
- <extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-beta-2</version>
@@ -549,15 +537,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>
Modified: geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm (original)
+++ geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm Mon Mar 10 23:12:56 2008
@@ -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/).
Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Mon Mar 10 23:12:56 2008
@@ -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-SNAPSHOT</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>
Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=635811&r1=635810&r2=635811&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Mon Mar 10 23:12:56 2008
@@ -55,7 +55,7 @@
<!-- set siteId to artifactId for any "top level" project rooting a website -->
<siteId>genesis</siteId>
<!-- IMPORTANT update this to the release version before releasing -->
- <legalBundleVersion>1.4</legalBundleVersion>
+ <legalBundleVersion>1.5-SNAPSHOT</legalBundleVersion>
</properties>
<build>
@@ -175,41 +175,13 @@
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>default</id>
+ <modules>
+ <module>legal-bundle</module>
+ <module>config</module>
+ <module>plugins</module>
+ </modules>
- <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>
+ <profiles>
<profile>
<id>release</id>