Author: wsmoak
Date: Sun Sep 11 21:25:46 2005
New Revision: 280249
URL: http://svn.apache.org/viewcvs?rev=280249&view=rev
Log:
Modified the Maven build files to work from their new location in shale/build/,
as suggested by James Mitchell. See the build/README.txt file for more
information.
Added:
struts/shale/trunk/build/README.txt
struts/shale/trunk/build/clay-plugin/project.properties
struts/shale/trunk/build/core-test/maven.xml
struts/shale/trunk/build/core-test/project.properties
struts/shale/trunk/build/core-test/project.xml
struts/shale/trunk/build/spring/project.properties
struts/shale/trunk/build/spring/webflow/project.properties
struts/shale/trunk/build/spring/webflow/project.xml
struts/shale/trunk/build/test-framework/project.properties
struts/shale/trunk/build/tiles/project.properties
struts/shale/trunk/build/tiles/project.xml
Modified:
struts/shale/trunk/build/clay-plugin/project.xml
struts/shale/trunk/build/core-library/maven.xml
struts/shale/trunk/build/core-library/project.properties
struts/shale/trunk/build/core-library/project.xml
struts/shale/trunk/build/maven.xml
struts/shale/trunk/build/myfaces-project.xml
struts/shale/trunk/build/project.properties
struts/shale/trunk/build/project.xml
struts/shale/trunk/build/spring/project.xml
struts/shale/trunk/build/test-framework/project.xml
struts/shale/trunk/build/use-cases/maven.xml
struts/shale/trunk/build/use-cases/project.properties
struts/shale/trunk/build/use-cases/project.xml
Added: struts/shale/trunk/build/README.txt
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/README.txt?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/README.txt (added)
+++ struts/shale/trunk/build/README.txt Sun Sep 11 21:25:46 2005
@@ -0,0 +1,76 @@
+
+Shale Framework Build
+=====================
+
+This directory contains the Maven build files for the Shale Framework
+
+NOTE: Shale depends on SNAPSHOT builds of both MyFaces and Standalone Tiles.
+After allowing Maven to retrieve these files from Apache's internal Maven
+repository, please use the "-o" (offline) switch on the command line.
+
+To build the entire project and install the .jar files into your local
+repository (and build the binary and source distributions,) execute the default
+'build-all' goal:
+
+$ maven
+ or
+$ maven build-all
+
+To clean the project, which deletes all of the 'target' directories:
+
+$ maven multiproject:clean
+
+To build the multiproject website:
+
+$ maven multiproject:site -Dmaven.multiproject.excludes=spring/*,tiles/*
+
+
+Choosing a JSF Implementation
+-----------------------------
+
+The Shale Framework can be built with either Apache MyFaces or the JSF
Reference
+Implementation from Sun. To switch implementations, set the
+'maven.shale.jsf.impl' property to either 'jsfri' or 'myfaces'. (Or leave it
+blank and the build will default to MyFaces.) Example:
+
+$ maven -Dmaven.shale.jsf.impl=jsfri
+
+or
+
+build.properties:
+maven.shale.jsf.impl=myfaces
+
+Known Issues
+------------
+
+* The checkstyle report is disabled because it breaks the build of any
+sub-project containing <sourceModifications>.
+
+* The source distributions do not include the source code
+
+* The javadoc goal in the spring sub-project does not exclude the webflow
+source files.
+
+
+Spring Webflow
+--------------
+
+The Shale Framework project currently includes source code intended for the
+Spring Webflow project. To build the related .jar file and install it into your
+local repository, change to the build/spring/webflow directory and execute the
+'jar:install' goal:
+
+$ maven jar:install
+
+
+FAQs
+----
+
+Q: What does 'x.y.z.Class' mean in <sourceModifications>?
+
+A: Because the core-library sub-project includes the source for the shale-core,
+shale-tiles, and shale-spring artifacts, it's necessary to tell Maven to
include
+and exclude the right source code files. The <sourceModifications> are
triggered
+when the named class is *NOT* found, so we use a class that doesn't exist.
+
+
Added: struts/shale/trunk/build/clay-plugin/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/clay-plugin/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/clay-plugin/project.properties (added)
+++ struts/shale/trunk/build/clay-plugin/project.properties Sun Sep 11 21:25:46
2005
@@ -0,0 +1,8 @@
+
+shale.subdir=clay-plugin
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
Modified: struts/shale/trunk/build/clay-plugin/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/clay-plugin/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/clay-plugin/project.xml (original)
+++ struts/shale/trunk/build/clay-plugin/project.xml Sun Sep 11 21:25:46 2005
@@ -22,27 +22,30 @@
<extend>../project.xml</extend>
<id>shale-clay</id>
<name>Shale Clay Plugin</name>
- <packageName>org.apache.shale.clay</packageName>
+ <shortDescription/>
+ <description/>
+ <packageName>org.apache.shale.clay</packageName>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/Test*.java</include>
+ <include>**/*TestCase.java</include>
</includes>
<resources>
<resource>
- <directory>src/conf</directory>
+ <directory>${maven.src.dir}/conf</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.dtd</include>
</includes>
</resource>
<resource>
- <directory>src/test</directory>
+ <directory>${maven.src.dir}/test</directory>
<includes>
<include>**/*.xml</include>
+ <include>**/*.html</include>
</includes>
</resource>
</resources>
@@ -51,7 +54,7 @@
<resources>
<!-- Copy non-Java Sources -->
<resource>
- <directory>src/java</directory>
+ <directory>${maven.src.dir}/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.dtd</include>
@@ -59,7 +62,7 @@
</includes>
</resource>
<resource>
- <directory>src/conf</directory>
+ <directory>${maven.src.dir}/conf</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>*.xml</include>
@@ -67,13 +70,14 @@
</includes>
</resource>
<resource>
+ <directory>${maven.src.dir}/..</directory>
<targetPath>META-INF</targetPath>
<includes>
- <include>NOTICE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
</resource>
</resources>
-
</build>
<dependencies>
Modified: struts/shale/trunk/build/core-library/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-library/maven.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/core-library/maven.xml (original)
+++ struts/shale/trunk/build/core-library/maven.xml Sun Sep 11 21:25:46 2005
@@ -6,10 +6,8 @@
<preGoal name="jar:jar">
<!-- Copy the validator default message bundle to avoid problems if the
server locale is not English. -->
- <ant:copy
file="${basedir}/src/java/org/apache/shale/validator/messages.properties"
+ <ant:copy
file="${maven.src.dir}/java/org/apache/shale/validator/messages.properties"
tofile="${maven.build.dest}/org/apache/shale/validator/messages_en.properties"
/>
</preGoal>
-
- <!-- TODO: Split up the files for the three artifacts -->
</project>
Modified: struts/shale/trunk/build/core-library/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-library/project.properties?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/core-library/project.properties (original)
+++ struts/shale/trunk/build/core-library/project.properties Sun Sep 11
21:25:46 2005
@@ -1,6 +1,8 @@
-#Circular dependency exists between test-framework and the tests in
core-library
-maven.test.skip=true
+shale.subdir=core-library
-# Standalone Tiles SNAPSHOTs are on cvs.apache.org
-maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
Modified: struts/shale/trunk/build/core-library/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-library/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/core-library/project.xml (original)
+++ struts/shale/trunk/build/core-library/project.xml Sun Sep 11 21:25:46 2005
@@ -23,35 +23,37 @@
<id>shale-core</id>
<name>Shale Core Library</name>
<currentVersion>1.0.0-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://struts.apache.org/</url>
+ </organization>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
<build>
- <sourceDirectory>src/java</sourceDirectory>
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <!-- Tests are run from core-test -->
+ <unitTestSourceDirectory/>
- <!-- Unit test cases -->
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <resources>
- <resource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
+ <sourceModifications>
+ <sourceModification>
+ <className>x.y.z.Class</className>
+ <property/>
+ <excludes>
+ <exclude>org/apache/shale/spring/**</exclude>
+ <exclude>org/apache/shale/tiles/**</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
+ <unitTest/>
<resources>
<resource>
- <directory>src/conf</directory>
+ <directory>${maven.src.dir}/conf</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>**/*.xml</include>
@@ -60,7 +62,7 @@
</resource>
<!-- Copy DTD for dialog configuration resources -->
<resource>
- <directory>src/conf</directory>
+ <directory>${maven.src.dir}/conf</directory>
<targetPath>org/apache/shale/dialog</targetPath>
<includes>
<include>dialog.dtd</include>
@@ -68,34 +70,31 @@
</resource>
<!-- Copy non-Java Sources -->
<resource>
- <directory>src/java</directory>
+ <directory>${maven.src.dir}/java</directory>
<includes>
+ <include>**/*.html</include>
<include>**/*.xml</include>
<include>**/*.dtd</include>
<include>**/*.properties</include>
</includes>
+ <excludes>
+ <exclude>org/apache/shale/spring/**</exclude>
+ <exclude>org/apache/shale/tiles/**</exclude>
+ </excludes>
</resource>
- <resource>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
- </resource>
- </resources>
+ </resource>
+ </resources>
</build>
<dependencies>
- <!-- See build.properties.sample for JSF Implementation dependency -->
-
- <!-- TODO: Fix circular dependency between core & test-framework
- <dependency>
- <groupId>shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.0-dev</version>
- </dependency>
- -->
-
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
@@ -127,111 +126,6 @@
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-dao</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-hibernate</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-support</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-webflow</artifactId>
- <version>PR4</version>
- <url>http://www.springframework.org/download</url>
</dependency>
</dependencies>
Added: struts/shale/trunk/build/core-test/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/maven.xml?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/core-test/maven.xml (added)
+++ struts/shale/trunk/build/core-test/maven.xml Sun Sep 11 21:25:46 2005
@@ -0,0 +1,15 @@
+<project default="jar:jar"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <goal name="dist">
+ <attainGoal name="war"/>
+ </goal>
+
+ <goal name="jar:jar">
+ <ant:echo>[INFO] There is no jar artifact for this sub-project.
+ Use 'maven test' instead.</ant:echo>
+ </goal>
+
+</project>
\ No newline at end of file
Added: struts/shale/trunk/build/core-test/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/core-test/project.properties (added)
+++ struts/shale/trunk/build/core-test/project.properties Sun Sep 11 21:25:46
2005
@@ -0,0 +1,9 @@
+
+shale.subdir=core-library
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
+
Added: struts/shale/trunk/build/core-test/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/project.xml?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/core-test/project.xml (added)
+++ struts/shale/trunk/build/core-test/project.xml Sun Sep 11 21:25:46 2005
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<!--
+
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project>
+ <extend>../project.xml</extend>
+ <id>shale-core-test</id>
+ <name>Shale Core Library Tests</name>
+ <currentVersion>1.0.0-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://struts.apache.org/</url>
+ </organization>
+
+ <!-- Gump integration -->
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+
+ <build>
+
+ <sourceDirectory/>
+
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
+
+ <!-- Unit test cases -->
+ <unitTest>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${maven.src.dir}/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <defaultGoal>test</defaultGoal>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>1.0.0-dev</version>
+ </dependency>
+
+ <dependency>
+ <groupId>shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.0-dev</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: struts/shale/trunk/build/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/maven.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/maven.xml (original)
+++ struts/shale/trunk/build/maven.xml Sun Sep 11 21:25:46 2005
@@ -19,5 +19,14 @@
<postGoal name="dist">
<attainGoal name="jar:install"/>
</postGoal>
-
+
+ <postGoal name="clean:clean">
+ <ant:delete file="jcoverage.ser"/>
+ <ant:delete dir="xdocs"/>
+ </postGoal>
+
+ <postGoal name="multiproject:clean">
+ <attainGoal name="clean"/>
+ </postGoal>
+
</project>
Modified: struts/shale/trunk/build/myfaces-project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/myfaces-project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/myfaces-project.xml (original)
+++ struts/shale/trunk/build/myfaces-project.xml Sun Sep 11 21:25:46 2005
@@ -31,8 +31,8 @@
<dependency>
<groupId>myfaces</groupId>
- <artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.9</version>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.0.10-SNAPSHOT</version>
<url>http://myfaces.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -42,22 +42,12 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
<url>http://myfaces.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-extensions</artifactId>
- <version>1.0.9</version>
- <url>http://myfaces.apache.org/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
</dependencies>
Modified: struts/shale/trunk/build/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/project.properties?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/project.properties (original)
+++ struts/shale/trunk/build/project.properties Sun Sep 11 21:25:46 2005
@@ -12,4 +12,7 @@
maven.multiproject.includes = */project.xml
maven.multiproject.aggregateDir =
+maven.docs.src=../xdocs
+
maven.shale.jsf.impl.default=myfaces
+
Modified: struts/shale/trunk/build/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/project.xml (original)
+++ struts/shale/trunk/build/project.xml Sun Sep 11 21:25:46 2005
@@ -122,26 +122,11 @@
dev@struts.apache.org
</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-checkstyle-plugin</report> -->
<report>maven-changelog-plugin</report>
<report>maven-changes-plugin</report>
<report>maven-developer-activity-plugin</report>
Added: struts/shale/trunk/build/spring/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/spring/project.properties (added)
+++ struts/shale/trunk/build/spring/project.properties Sun Sep 11 21:25:46 2005
@@ -0,0 +1,7 @@
+
+shale.subdir=core-library
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
Modified: struts/shale/trunk/build/spring/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/spring/project.xml (original)
+++ struts/shale/trunk/build/spring/project.xml Sun Sep 11 21:25:46 2005
@@ -20,82 +20,60 @@
<project>
<extend>../project.xml</extend>
- <id>shale-core</id>
- <name>Shale Core Library</name>
+ <id>shale-spring</id>
+ <name>Shale Spring Integration</name>
<currentVersion>1.0.0-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://struts.apache.org/</url>
+ </organization>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
<build>
- <sourceDirectory>src/java</sourceDirectory>
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
- <!-- Unit test cases -->
+ <sourceModifications>
+ <sourceModification>
+ <className>x.y.z.Class</className>
+ <includes>
+ <include>org/apache/shale/spring/*</include>
+ </includes>
+ </sourceModification>
+ </sourceModifications>
+
+ <!-- Unit test cases -->
<unitTest>
<includes>
- <include>**/*Test.java</include>
+ <include>org/apache/shale/spring/*TestCase.java</include>
</includes>
- <resources>
- <resource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
+ </unitTest>
<resources>
<resource>
- <directory>src/conf</directory>
+
<directory>${maven.src.dir}/java/org/apache/shale/spring</directory>
<targetPath>META-INF</targetPath>
<includes>
- <include>**/*.xml</include>
- <include>**/*.tld</include>
- </includes>
- </resource>
- <!-- Copy DTD for dialog configuration resources -->
- <resource>
- <directory>src/conf</directory>
- <targetPath>org/apache/shale/dialog</targetPath>
- <includes>
- <include>dialog.dtd</include>
+ <include>*.xml</include>
</includes>
</resource>
- <!-- Copy non-Java Sources -->
- <resource>
- <directory>src/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
- </resource>
- </resources>
+ </resource>
+ </resources>
</build>
<dependencies>
- <!-- See build.properties.sample for JSF Implementation dependency -->
-
- <!-- TODO: Fix circular dependency between core & test-framework
- <dependency>
- <groupId>shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.0-dev</version>
- </dependency>
- -->
-
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
@@ -104,13 +82,6 @@
</dependency>
<dependency>
- <groupId>tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>SNAPSHOT</version>
-
<url>http://cvs.apache.org/builds/struts/nightly/sandbox/tiles-core/</url>
- </dependency>
-
- <dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
@@ -224,13 +195,6 @@
<groupId>springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>1.2.2</version>
- <url>http://www.springframework.org/download</url>
- </dependency>
-
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-webflow</artifactId>
- <version>PR4</version>
<url>http://www.springframework.org/download</url>
</dependency>
Added: struts/shale/trunk/build/spring/webflow/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/webflow/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/spring/webflow/project.properties (added)
+++ struts/shale/trunk/build/spring/webflow/project.properties Sun Sep 11
21:25:46 2005
@@ -0,0 +1,8 @@
+
+shale.subdir=core-library
+
+maven.src.dir=../../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../../${shale.subdir}/LICENSE.txt
+
+
Added: struts/shale/trunk/build/spring/webflow/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/webflow/project.xml?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/spring/webflow/project.xml (added)
+++ struts/shale/trunk/build/spring/webflow/project.xml Sun Sep 11 21:25:46 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+
+<!--
+
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project>
+ <extend>../project.xml</extend>
+ <id>shale-spring-webflow</id>
+ <name>Shale Spring WebFlow Integration</name>
+ <currentVersion>1.0.0-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://struts.apache.org/</url>
+ </organization>
+
+ <!-- Gump integration -->
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+
+ <build>
+
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
+
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
+
+ <sourceModifications>
+ <sourceModification>
+ <className>x.y.z.Class</className>
+ <includes>
+ <include>org/apache/shale/spring/webflow/*</include>
+ </includes>
+ </sourceModification>
+ </sourceModifications>
+
+ <!-- Unit test cases -->
+ <unitTest>
+ <includes>
+ <include>org/apache/shale/spring/webflow/*TestCase.java</include>
+ </includes>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <version>PR4</version>
+ <url>http://www.springframework.org/download</url>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: struts/shale/trunk/build/test-framework/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/test-framework/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/test-framework/project.properties (added)
+++ struts/shale/trunk/build/test-framework/project.properties Sun Sep 11
21:25:46 2005
@@ -0,0 +1,9 @@
+
+shale.subdir=test-framework
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
+
Modified: struts/shale/trunk/build/test-framework/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/test-framework/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/test-framework/project.xml (original)
+++ struts/shale/trunk/build/test-framework/project.xml Sun Sep 11 21:25:46 2005
@@ -24,15 +24,19 @@
<name>Shale Test Framework</name>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
</includes>
+ </unitTest>
+
+ <defaultGoal>jar</defaultGoal>
+
<resources>
<resource>
- <directory>conf/share</directory>
+ <directory>${maven.src.dir}/conf/share</directory>
<targetPath>org/apache/struts/resources</targetPath>
<includes>
<include>**/*.xml</include>
@@ -40,13 +44,20 @@
</includes>
</resource>
<resource>
- <directory>src/test</directory>
+ <directory>${maven.src.dir}/test</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- </unitTest>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
Added: struts/shale/trunk/build/tiles/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiles/project.properties?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/tiles/project.properties (added)
+++ struts/shale/trunk/build/tiles/project.properties Sun Sep 11 21:25:46 2005
@@ -0,0 +1,12 @@
+
+# Standalone Tiles SNAPSHOT is on cvs.apache.org
+maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository
+
+shale.subdir=core-library
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
+
Added: struts/shale/trunk/build/tiles/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiles/project.xml?rev=280249&view=auto
==============================================================================
--- struts/shale/trunk/build/tiles/project.xml (added)
+++ struts/shale/trunk/build/tiles/project.xml Sun Sep 11 21:25:46 2005
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+
+<!--
+
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project>
+ <extend>../project.xml</extend>
+ <id>shale-tiles</id>
+ <name>Shale Tiles Integration</name>
+ <currentVersion>1.0.0-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://struts.apache.org/</url>
+ </organization>
+
+ <!-- Gump integration -->
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+
+ <build>
+
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
+
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
+
+ <sourceModifications>
+ <sourceModification>
+ <className>x.y.z.Class</className>
+ <includes>
+ <include>org/apache/shale/tiles/**</include>
+ </includes>
+ </sourceModification>
+ </sourceModifications>
+
+ <!-- Unit test cases -->
+ <unitTest>
+ <includes>
+ <include>org/apache/shale/tiles/**/*Test.java</include>
+ </includes>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${maven.src.dir}/java/org/apache/shale/tiles</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <!-- Copy non-Java Sources -->
+ <resource>
+ <directory>${maven.src.dir}/java</directory>
+ <includes>
+ <include>org/apache/shale/tiles/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ <url>jakarta.apache.org/commons/validator/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>SNAPSHOT</version>
+
<url>http://cvs.apache.org/builds/struts/nightly/sandbox/tiles-core/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <url>jakarta.apache.org/commons/validator/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: struts/shale/trunk/build/use-cases/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/maven.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/maven.xml (original)
+++ struts/shale/trunk/build/use-cases/maven.xml Sun Sep 11 21:25:46 2005
@@ -13,39 +13,34 @@
<preGoal name="war:war">
<ant:echo>maven.shale.jsf.impl is ${maven.shale.jsf.impl}</ant:echo>
-
- <j:if test="${maven.shale.jsf.impl=='myfaces' ||
maven.shale.jsf.impl==null}">
- <ant:echo>Building Use Cases with Apache MyFaces</ant:echo>
- <ant:replace dir="${maven.war.webapp.dir}/WEB-INF"
- token="MYFACES_BEGIN"
- value="<!-- MyFaces Listener -->"/>
- <ant:replace dir="${maven.war.webapp.dir}/WEB-INF"
- token="MYFACES_END"
- value=""/>
- </j:if>
- <j:if test="${maven.shale.jsf.impl=='jsfri'}">
- <ant:echo>Building Use Cases with JSF Reference
Implementation</ant:echo>
+ <!-- MyFaces Listener no longer required as of 1.0.10 -->
<ant:replace dir="${maven.war.webapp.dir}/WEB-INF"
token="MYFACES_BEGIN"
value="<!-- MyFaces Listener"/>
<ant:replace dir="${maven.war.webapp.dir}/WEB-INF"
token="MYFACES_END"
value="-->"/>
- </j:if>
+
<!-- Include source code in the .war file -->
<ant:copy todir="${maven.war.webapp.dir}/WEB-INF/src/"
overwrite="false">
- <ant:fileset dir="${basedir}/src/java"
+ <ant:fileset dir="${maven.src.dir}/java"
excludes="**/.svn/**">
</ant:fileset>
</ant:copy>
<!-- Copy the default message bundle to avoid problems if the
server locale is not English. -->
- <ant:copy
file="${basedir}/src/java/org/apache/shale/usecases/view/Bundle.properties"
+ <ant:copy
file="${maven.src.dir}/java/org/apache/shale/usecases/view/Bundle.properties"
tofile="${maven.war.webapp.dir}/WEB-INF/classes/org/apache/shale/usecases/view/Bundle_en.properties"/>
</preGoal>
+
+ <goal name="jar:jar">
+ <ant:echo>[INFO] There is no jar artifact for this sub-project.
+ Use 'maven war' instead.</ant:echo>
+ </goal>
+
</project>
Modified: struts/shale/trunk/build/use-cases/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/project.properties?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/project.properties (original)
+++ struts/shale/trunk/build/use-cases/project.properties Sun Sep 11 21:25:46
2005
@@ -1,3 +1,11 @@
-maven.war.src=src/web
+shale.subdir=use-cases
+
+maven.src.dir=../../${shale.subdir}/src
+
+maven.checkstyle.header.file=../${shale.subdir}/LICENSE.txt
+
+maven.docs.src=../${shale.subdir}/xdocs
+
+maven.war.src=${maven.src.dir}/web
Modified: struts/shale/trunk/build/use-cases/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/project.xml?rev=280249&r1=280248&r2=280249&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/project.xml (original)
+++ struts/shale/trunk/build/use-cases/project.xml Sun Sep 11 21:25:46 2005
@@ -25,33 +25,44 @@
<name>Shale Use Cases</name>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>${maven.src.dir}/java</sourceDirectory>
+ <unitTestSourceDirectory>${maven.src.dir}/test</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
</includes>
<resources>
<resource>
- <directory>src/conf</directory>
+ <directory>${maven.src.dir}/conf</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.dtd</include>
</includes>
</resource>
<resource>
- <directory>src/test</directory>
+ <directory>${maven.src.dir}/test</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
+ <resource>
+ <directory>${maven.src.dir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+
</resources>
</unitTest>
+ <defaultGoal>war:war</defaultGoal>
+
<resources>
<resource>
- <directory>src/java</directory>
+ <directory>${maven.src.dir}/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.gif</include>
@@ -82,6 +93,15 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>shale</groupId>
+ <artifactId>shale-spring</artifactId>
+ <version>1.0.0-dev</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>shale</groupId>
<artifactId>shale-test</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
