Author: jmitchell
Date: Tue Aug 30 00:08:09 2005
New Revision: 264716
URL: http://svn.apache.org/viewcvs?rev=264716&view=rev
Log:
Refactoring the build for Struts Ti.
* move core to jars/core
* move java5 to jars/java5
* add first set of targets for top level pom
* small formatting changes
* change // TODO: to javadoc (@todo)
Added:
struts/sandbox/trunk/ti/maven.xml
Modified:
struts/sandbox/trunk/ti/README.txt
struts/sandbox/trunk/ti/core/project.xml
struts/sandbox/trunk/ti/example/project.xml
struts/sandbox/trunk/ti/java5/project.xml
struts/sandbox/trunk/ti/java5/src/java/org/apache/ti/pageflow/annotations/ti.java
struts/sandbox/trunk/ti/project.properties
struts/sandbox/trunk/ti/project.xml
struts/sandbox/trunk/ti/samples/project.xml
Modified: struts/sandbox/trunk/ti/README.txt
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/README.txt?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/README.txt (original)
+++ struts/sandbox/trunk/ti/README.txt Tue Aug 30 00:08:09 2005
@@ -75,6 +75,36 @@
$ cd core
$ maven dist
+
+
+ The build plan:
+
+ ${jdk} - replace this with either 1.4 or 1.5
+ ${ver} - replace with current version 1.0-dev (or YYYYMMDD for
nightly)
+
+ Target Artifact(s) Description
+ ______ ___________ ___________
+ dist target/ creates a full distribution of
core and example apps
+ ti-core${jdk}-${ver}.jar
+ ti-sample${jdk}.war
+
+ jar target/ creates only core archive
+ ti-core15.jar
+
+ test (nothing) run full set of (1.5 based) junit
tests
+
+ cactus (nothing) run full set of (1.5 based) junit
and cactus tests
+
+ site target/docs/ create ti web site (includes build
reports)
+ **/*.html
+
+ nightly target/ creates nightly distribution that
gets uploaded to
+ ti-core${jdk}
http://svn.apache.org/builds/struts/maven/trunk/nightly/struts-sandbox/ti/
+ ti-sample${jdk}-${ver}.war
+
+
+
+
STATUS
A working, if feature sparce, framework is in place.
Modified: struts/sandbox/trunk/ti/core/project.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/core/project.xml?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/core/project.xml (original)
+++ struts/sandbox/trunk/ti/core/project.xml Tue Aug 30 00:08:09 2005
@@ -20,13 +20,9 @@
<project>
- <extend>../project.xml</extend>
- <id>struts-ti-core</id>
+ <extend>../../project.xml</extend>
+ <groupId>struts</groupId>
+ <artifactId>struts-ti-core</artifactId>
<name>Struts Ti Core</name>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- </build>
</project>
Modified: struts/sandbox/trunk/ti/example/project.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/example/project.xml?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/example/project.xml (original)
+++ struts/sandbox/trunk/ti/example/project.xml Tue Aug 30 00:08:09 2005
@@ -20,7 +20,7 @@
<project>
- <extend>../project.xml</extend>
+ <extend>../../project.xml</extend>
<id>struts-ti-example</id>
<name>Struts Ti Example</name>
Modified: struts/sandbox/trunk/ti/java5/project.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/java5/project.xml?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/java5/project.xml (original)
+++ struts/sandbox/trunk/ti/java5/project.xml Tue Aug 30 00:08:09 2005
@@ -20,8 +20,9 @@
<project>
- <extend>../project.xml</extend>
- <id>struts-ti-java5</id>
+ <extend>../../project.xml</extend>
+ <groupId>struts</groupId>
+ <artifactId>struts-ti-java5</artifactId>
<name>Struts Ti Java5 Support</name>
</project>
Modified:
struts/sandbox/trunk/ti/java5/src/java/org/apache/ti/pageflow/annotations/ti.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/java5/src/java/org/apache/ti/pageflow/annotations/ti.java?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/java5/src/java/org/apache/ti/pageflow/annotations/ti.java
(original)
+++
struts/sandbox/trunk/ti/java5/src/java/org/apache/ti/pageflow/annotations/ti.java
Tue Aug 30 00:08:09 2005
@@ -40,7 +40,7 @@
public enum MultipartHandler {
/**
- * Indicates that multipart handling is disabled in this controller. *
+ * Indicates that multipart handling is disabled in this controller.
*/
disabled,
@@ -105,8 +105,8 @@
* ([EMAIL PROTECTED]
org.apache.ti.pageflow.SharedFlowController}-derived) classes.
*/
@Target(TYPE)
- @Retention(RUNTIME)
- public @interface controller {
+ @Retention(RUNTIME)
+ public @interface controller {
//-----------------------
// Optional attributes...
@@ -258,7 +258,9 @@
*/
ValidatorVersion validatorVersion() default ValidatorVersion.oneZero;
- // TODO: doc
+ /**
+ * @todo doc
+ */
boolean inheritLocalPaths() default false;
}
Added: struts/sandbox/trunk/ti/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/maven.xml?rev=264716&view=auto
==============================================================================
--- struts/sandbox/trunk/ti/maven.xml (added)
+++ struts/sandbox/trunk/ti/maven.xml Tue Aug 30 00:08:09 2005
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
+ default="multiproject:build">
+
+ <goal name="dist">
+ <attainGoal name="usage"/>
+ </goal>
+
+ <goal name="usage">
+ <echo> Usage: (this is specific to the ti build)</echo>
+ <echo> maven [-option] [target] </echo>
+ <echo> [see README.txt for a list of valid targets]</echo>
+ </goal>
+
+ <goal name="dist-all">
+ <attainGoal name="jar-all"/>
+ <attainGoal name="war-all"/>
+
+ </goal>
+
+ <goal name="jar-all">
+ <maven:reactor
+ basedir="."
+ banner="Creating Source and Binary Distribution"
+ includes="${maven.multiproject.jar.includes}"
+ excludes="${maven.multiproject.jar.excludes}"
+ postProcessing="true"
+ goals="jar:install"
+ ignoreFailures="false"/>
+ </goal>
+
+ <goal name="war-all">
+ <maven:reactor
+ basedir="."
+ banner="Creating Source and Binary Distribution"
+ includes="${maven.multiproject.war.includes}"
+ excludes="${maven.multiproject.war.excludes}"
+ postProcessing="true"
+ goals="war:install"
+ ignoreFailures="false"/>
+ </goal>
+
+
+</project>
Modified: struts/sandbox/trunk/ti/project.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/project.properties?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/project.properties (original)
+++ struts/sandbox/trunk/ti/project.properties Tue Aug 30 00:08:09 2005
@@ -20,3 +20,8 @@
maven.javadoc.additionalparam=-tag todo:a:"To Do:"
maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+
+maven.multiproject.includes=*/*/project.xml
+maven.multiproject.jar.includes=jars/*/project.xml
+maven.multiproject.war.includes=wars/*/project.xml
+maven.multiproject.war.excludes=wars/example/project.xml
Modified: struts/sandbox/trunk/ti/project.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/project.xml?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/project.xml (original)
+++ struts/sandbox/trunk/ti/project.xml Tue Aug 30 00:08:09 2005
@@ -21,7 +21,7 @@
<project>
<pomVersion>3</pomVersion>
- <id>struts-ti</id>
+ <id>struts</id>
<name>Struts Ti</name>
<currentVersion>1.0-SNAPSHOT</currentVersion>
<organization>
@@ -114,8 +114,8 @@
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>core/src/java</sourceDirectory>
- <unitTestSourceDirectory>core/src/test</unitTestSourceDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
Modified: struts/sandbox/trunk/ti/samples/project.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/samples/project.xml?rev=264716&r1=264715&r2=264716&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/samples/project.xml (original)
+++ struts/sandbox/trunk/ti/samples/project.xml Tue Aug 30 00:08:09 2005
@@ -20,9 +20,10 @@
<project>
- <extend>../project.xml</extend>
- <id>struts-ti-samples</id>
- <name>Struts Ti Samples</name>
+ <extend>../../project.xml</extend>
+ <groupId>struts</groupId>
+ <artifactId>struts-ti</artifactId>
+ <name>Struts Ti Sample Application</name>
<build>
<resources>
@@ -37,7 +38,7 @@
</build>
<dependencies>
<dependency>
- <groupId>struts-ti</groupId>
+ <groupId>struts</groupId>
<artifactId>struts-ti-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -45,7 +46,7 @@
</properties>
</dependency>
<dependency>
- <groupId>struts-ti</groupId>
+ <groupId>struts</groupId>
<artifactId>struts-ti-java5</artifactId>
<version>${pom.currentVersion}</version>
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
