Author: wsmoak
Date: Sun Aug 28 20:11:35 2005
New Revision: 264039
URL: http://svn.apache.org/viewcvs?rev=264039&view=rev
Log:
Updated Maven build files for general project info, dependencies, and website
generation.
Modified:
struts/shale/trunk/project.properties
struts/shale/trunk/project.xml
Modified: struts/shale/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/project.properties?rev=264039&r1=264038&r2=264039&view=diff
==============================================================================
--- struts/shale/trunk/project.properties (original)
+++ struts/shale/trunk/project.properties Sun Aug 28 20:11:35 2005
@@ -1,5 +1,4 @@
# $Id: $
-# EXPERIMENTAL properties file for Maven build
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
@@ -9,5 +8,8 @@
maven.repo.remote=http://cvs.apache.org/repository/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://www.bluesunrise.com/maven/
-#keep ant & maven directories separate.
-maven.build.dir=m-target
+maven.multiproject.basedir = .
+maven.multiproject.includes = */project.xml
+maven.multiproject.aggregateDir =
+
+
Modified: struts/shale/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/project.xml?rev=264039&r1=264038&r2=264039&view=diff
==============================================================================
--- struts/shale/trunk/project.xml (original)
+++ struts/shale/trunk/project.xml Sun Aug 28 20:11:35 2005
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
-
<!--
- Copyright 2004 The Apache Software Foundation.
+ Copyright 2004-2005 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.
@@ -19,30 +18,15 @@
-->
-<!--
-
- EXPERIMENTAL Maven build
-
- [TODO]
-
- * Incorporate proposal documentation into site.
-
- * Refine project XML so that it builds a respectable project site.
-
- * Add developers guide, when available.
-
- $Id: $
-
--->
-
<project>
<pomVersion>3</pomVersion>
<id>shale</id>
- <name>shale</name>
- <currentVersion>0.0.1</currentVersion>
+ <groupId>shale</groupId>
+ <name>Shale Framework</name>
+ <currentVersion>1.0.0-dev</currentVersion>
<organization>
<name>Apache Software Foundation</name>
- <url>http://struts.apache.org/</url>
+ <url>http://struts.apache.org/shale</url>
</organization>
<inceptionYear>2004</inceptionYear>
<package>org.apache.shale</package>
@@ -58,9 +42,7 @@
<shortDescription>Shale web controller framework for JavaServer
Faces</shortDescription>
<url>http://struts.apache.org/</url>
- <issueTrackingUrl>
- http://jakarta.apache.org/site/bugs.html
- </issueTrackingUrl>
+ <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
<siteAddress>struts.apache.org</siteAddress>
<siteDirectory>
/www/struts.apache.org/
@@ -71,10 +53,10 @@
<repository>
<connection>
- scm|svn|https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts-shale
+ scm|svn|https://svn.apache.org/repos/asf/struts/shale/trunk/
</connection>
<url>
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts-shale?root=Apache-SVN
+ http://svn.apache.org/viewcvs.cgi/struts/shale/trunk?root=Apache-SVN
</url>
</repository>
@@ -131,73 +113,124 @@
</developers>
+ <build>
+
+ <nagEmailAddress>
+ [email protected]
+ </nagEmailAddress>
+
+ <sourceDirectory>src/java</sourceDirectory>
+
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <aspectSourceDirectory/>
+
+ <!-- Unit test cases -->
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+
+ <!-- J A R R E S O U R C E S -->
+ <!-- Resources that are packaged up inside the JAR file -->
+ <resources/>
+ </build>
+
+ <reports>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-faq-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <!--report>maven-linkcheck-plugin</report-->
+ <report>maven-pmd-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+ <!--report>maven-findbugs-plugin</report-->
+ </reports>
+
+
<dependencies>
<dependency>
<groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.4-20040521</version>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<url>http://java.sun.com/products/servlet/</url>
</dependency>
<dependency>
<groupId>jspapi</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0-20040521</version>
+ <version>2.0</version>
<url>http://java.sun.com/products/jsp/</url>
</dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ </dependency>
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
<version>1.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>jakarta.apache.org/commons/chain/</url>
</dependency>
-
-
<dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.8-beta</version>
- <url>http://myfaces.org/</url>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>jakarta.apache.org/commons/collections/</url>
</dependency>
- <!--
- <dependency>
- <groupId>jsf</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1</version>
- <url>http://java.sun.com/j2ee/javaserverfaces/download.html</url>
- </dependency>
-
- <dependency>
- <groupId>jsf</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1</version>
- <url>http://java.sun.com/j2ee/javaserverfaces/download.html</url>
- </dependency>
-
- -->
-
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>jakarta.apache.org/commons/digester/</url>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <url>jakarta.apache.org/commons/logging/</url>
+ <url>jakarta.apache.org/commons/logging/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>1.1.5</version>
- <url>http://www.springframework.org/</url>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ <url>jakarta.apache.org/commons/validator/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
@@ -207,31 +240,6 @@
<url>http://www.junit.org/</url>
</dependency>
-
</dependencies>
-
- <build>
-
- <nagEmailAddress>
- [email protected]
- </nagEmailAddress>
-
- <sourceDirectory>src/java</sourceDirectory>
-
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
- <aspectSourceDirectory/>
-
- <!-- Unit test cases -->
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
- <resources/>
- </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
