You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/04 22:22:54 UTC
svn commit: r419081 - in /tapestry/tapestry4/trunk: pom.xml
src/site/site.xml tapestry-annotations/pom.xml tapestry-contrib/pom.xml
tapestry-examples/pom.xml tapestry-framework/pom.xml tapestry-portlet/pom.xml
Author: jkuhnert
Date: Tue Jul 4 13:22:54 2006
New Revision: 419081
URL: http://svn.apache.org/viewvc?rev=419081&view=rev
Log:
Fixed refactored project layout build/report plugins
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/src/site/site.xml
tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Tue Jul 4 13:22:54 2006
@@ -252,6 +252,22 @@
<reporting>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <licenseLocation>
+ ${user.home}/.m2/repository/com/cenqua/clover/clover.license
+ </licenseLocation>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
Modified: tapestry/tapestry4/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/site.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/src/site/site.xml Tue Jul 4 13:22:54 2006
@@ -33,6 +33,8 @@
<link rel="shortcut icon" href="http://tapestry.apache.org/tapestry4.1/favicon.ico" />
</head>
+ <menu ref="parent" />
+
<menu name="Quick Links" inherit="top" >
<item name="Home" href="/index.html" />
<item name="Download" href="/download.html" />
@@ -72,8 +74,6 @@
<item name="Examples" href="/exampleapps/index.html" />
</menu>
-
- <menu ref="parent" />
<menu ref="modules" />
Modified: tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/pom.xml Tue Jul 4 13:22:54 2006
@@ -14,6 +14,7 @@
</parent>
<name>Annotations</name>
<inceptionYear>2006</inceptionYear>
+
<dependencies>
<dependency>
<groupId>org.apache.tapestry</groupId>
@@ -50,6 +51,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
@@ -89,16 +91,46 @@
</includes>
</testResource>
</testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <licenseLocation>
+ ${user.home}/.m2/repository/com/cenqua/clover/clover.license
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
- <outputDirectory>../target/site/annotations</outputDirectory>
+ <outputDirectory>../target/site/tapestry-annotations</outputDirectory>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
@@ -125,19 +157,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <licenseLocation>
- ${user.home}/.m2/repository/com/cenqua/clover/clover.license
- </licenseLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<linksource>true</linksource>
- <destDir>../target/site/annotations/apidocs</destDir>
+ <destDir>../target/site/tapestry-annotations/apidocs</destDir>
<tags>
<tag>
<name>todo</name>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Tue Jul 4 13:22:54 2006
@@ -14,6 +14,7 @@
</parent>
<name>Contrib</name>
<inceptionYear>2006</inceptionYear>
+
<dependencies>
<dependency>
<groupId>org.apache.tapestry</groupId>
@@ -85,16 +86,46 @@
</excludes>
</testResource>
</testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <licenseLocation>
+ ${user.home}/.m2/repository/com/cenqua/clover/clover.license
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
- <outputDirectory>../target/site/contrib</outputDirectory>
+ <outputDirectory>../target/site/tapestry-contrib</outputDirectory>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
@@ -138,15 +169,6 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>${basedir}/../tapestry-checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <licenseLocation>
- ${user.home}/.m2/repository/com/cenqua/clover/clover.license
- </licenseLocation>
</configuration>
</plugin>
</plugins>
Modified: tapestry/tapestry4/trunk/tapestry-examples/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/pom.xml Tue Jul 4 13:22:54 2006
@@ -43,7 +43,7 @@
</dependencyManagement>
<reporting>
- <outputDirectory>../target/site/examples</outputDirectory>
+ <outputDirectory>../target/site/tapestry-examples</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Tue Jul 4 13:22:54 2006
@@ -158,11 +158,37 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <licenseLocation>
+ ${user.home}/.m2/repository/com/cenqua/clover/clover.license
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
- <outputDirectory>../target/site/framework</outputDirectory>
+ <outputDirectory>../target/site/tapestry-framework</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -187,7 +213,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<linksource>true</linksource>
- <destDir>../target/site/framework/apidocs</destDir>
+ <destDir>../target/site/tapestry-framework/apidocs</destDir>
<tags>
<tag>
<name>todo</name>
Modified: tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/pom.xml?rev=419081&r1=419080&r2=419081&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/pom.xml Tue Jul 4 13:22:54 2006
@@ -52,6 +52,40 @@
</includes>
</testResource>
</testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <licenseLocation>
+ ${user.home}/.m2/repository/com/cenqua/clover/clover.license
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -97,13 +131,9 @@
</dependencies>
<reporting>
- <outputDirectory>../target/site/portlet</outputDirectory>
+ <outputDirectory>../target/site/tapestry-portlet</outputDirectory>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
@@ -118,7 +148,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<linksource>true</linksource>
- <destDir>../target/site/portlet/apidocs</destDir>
+ <destDir>../target/site/tapestry-portlet/apidocs</destDir>
<tags>
<tag>
<name>todo</name>
@@ -145,14 +175,6 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>${basedir}/../tapestry-checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <licenseLocation>
- ${user.home}/.m2/repository/com/cenqua/clover/clover.license
- </licenseLocation>
</configuration>
</plugin>
</plugins>