Author: wsmoak
Date: Thu Oct 13 23:03:44 2005
New Revision: 321023
URL: http://svn.apache.org/viewcvs?rev=321023&view=rev
Log:
Decoupled Struts Flow from the common Maven build files.
Fixed artifact id for the Struts 1.2.7 dependency.
Added:
struts/flow/trunk/maven.xml (with props)
struts/flow/trunk/project.properties (with props)
Modified:
struts/flow/trunk/project.xml (contents, props changed)
Added: struts/flow/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/maven.xml?rev=321023&view=auto
==============================================================================
--- struts/flow/trunk/maven.xml (added)
+++ struts/flow/trunk/maven.xml Thu Oct 13 23:03:44 2005
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<project default="dist"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <postGoal name="dist">
+ <attainGoal name="jar:install"/>
+ </postGoal>
+
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+</project>
Propchange: struts/flow/trunk/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/flow/trunk/maven.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/flow/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/project.properties?rev=321023&view=auto
==============================================================================
--- struts/flow/trunk/project.properties (added)
+++ struts/flow/trunk/project.properties Thu Oct 13 23:03:44 2005
@@ -0,0 +1,8 @@
+
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+maven.changelog.range = 120
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+
+maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository
Propchange: struts/flow/trunk/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/flow/trunk/project.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange: struts/flow/trunk/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/flow/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/project.xml?rev=321023&r1=321022&r2=321023&view=diff
==============================================================================
--- struts/flow/trunk/project.xml (original)
+++ struts/flow/trunk/project.xml Thu Oct 13 23:03:44 2005
@@ -19,7 +19,7 @@
-->
- <extend>build/project.xml</extend>
+ <!--<extend>build/project.xml</extend>-->
<id>struts-flow</id>
<name>Struts Flow</name>
<currentVersion>0.5-SNAPSHOT</currentVersion>
@@ -44,7 +44,7 @@
<dependency>
<groupId>struts</groupId>
- <artifactId>struts-core</artifactId>
+ <artifactId>struts</artifactId>
<version>1.2.7</version>
<properties>
<war.bundle>true</war.bundle>
@@ -52,6 +52,13 @@
<url>http://struts.apache.org/</url>
</dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <url>http://java.sun.com/products/servlet/</url>
+ </dependency>
+
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
@@ -63,6 +70,16 @@
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
<version>1.0</version>
@@ -72,6 +89,47 @@
<url>http://jakarta.apache.org/commons/chain/</url>
</dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.6</version>
+ <url>http://jakarta.apache.org/commons/digester/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.3</version>
+ <url>http://jakarta.apache.org/commons/validator/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+
<dependency>
<groupId>xdoclet</groupId>
<artifactId>xjavadoc</artifactId>
@@ -116,12 +174,65 @@
</dependencies>
<build>
- <!-- flow specific build stuff here -->
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.conf</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <!-- J A R R E S O U R C E S -->
+ <!-- Resources that are packaged up inside the JAR file -->
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.template</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<reports>
<!-- flow specific reports here -->
+
+ <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>
</project>
Propchange: struts/flow/trunk/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
