brekke 02/04/10 05:29:43
Modified: . build-maven.xml default.properties project.xml
src/rttest/org/apache/turbine
ConditionalValveServletTest.java
Log:
Updated project descriptor to be a little more readable and added updated delagators
to build-maven.xml
Revision Changes Path
1.3 +91 -74 jakarta-turbine-3/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-maven.xml 9 Apr 2002 17:29:34 -0000 1.2
+++ build-maven.xml 10 Apr 2002 12:29:43 -0000 1.3
@@ -18,80 +18,97 @@
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
- <target
- name="maven:site">
- <ant antfile="${maven.home}/build-docs.xml" target="site"/>
- </target>
-
- <target
- name="maven:pdf">
- <ant antfile="${maven.home}/build-docs.xml" target="docs:pdf"/>
- </target>
-
- <target
- name="maven:jar">
- <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
- </target>
-
- <target
- name="maven:install-jar">
- <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
- </target>
-
- <target
- name="maven:env">
- <ant antfile="${maven.home}/build-maven.xml" target="env"/>
- </target>
-
- <target
- name="maven:docs">
- <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
- </target>
-
- <target
- name="maven:test">
- <ant antfile="${maven.home}/build-test.xml" target="test"/>
- </target>
-
- <target
- name="maven:clean">
- <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
- </target>
-
- <target
- name="maven:metrics">
- <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
- </target>
-
- <target
- name="maven:dist">
- <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
- </target>
-
- <target
- name="maven:deploy-site">
- <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
- </target>
-
- <target
- name="maven:gump-descriptor">
- <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
- </target>
-
- <target
- name="maven:javadocs">
- <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
- </target>
-
- <target
- name="maven:compile">
- <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
- </target>
-
- <target
- name="maven:update-jars">
- <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
- </target>
+ <target name="maven:site">
+ <ant antfile="${maven.home}/build-docs.xml" target="site"/>
+ </target>
+
+ <target name="maven:fo">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs:fo"/>
+ </target>
+
+ <target name="maven:pdf">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs:pdf"/>
+ </target>
+
+ <target name="maven:jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
+ </target>
+
+ <target name="maven:install-jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
+ </target>
+
+ <target name="maven:env">
+ <ant antfile="${maven.home}/build-maven.xml" target="env"/>
+ </target>
+
+ <target name="maven:docs">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
+ </target>
+
+ <target name="maven:test">
+ <ant antfile="${maven.home}/build-test.xml" target="test"/>
+ </target>
+
+ <target name="maven:iutest">
+ <ant antfile="${maven.home}/build-iutest.xml" target="test"/>
+ </target>
+
+ <target name="maven:clean">
+ <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
+ </target>
+
+ <target name="maven:metrics">
+ <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
+ </target>
+
+ <target name="maven:dist">
+ <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
+ </target>
+
+ <target name="maven:deploy-site">
+ <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
+ </target>
+
+ <target name="maven:gump-descriptor">
+ <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
+ </target>
+
+ <target name="maven:javadocs">
+ <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
+ </target>
+
+ <target name="maven:compile">
+ <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
+ </target>
+
+ <target name="maven:check-source">
+ <ant antfile="${maven.home}/build-maven.xml" target="check-source"/>
+ </target>
+
+ <target name="maven:update-jars">
+ <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
+ </target>
+
+ <target name="maven:announce">
+ <ant antfile="${maven.home}/build-maven.xml" target="announce"/>
+ </target>
+
+ <target name="maven:update-descriptor">
+ <ant antfile="${maven.home}/build-maven.xml" target="update-descriptor"/>
+ </target>
+
+ <target name="maven:updates-available">
+ <ant antfile="${maven.home}/build-maven.xml" target="updates-available"/>
+ </target>
+
+ <target name="maven:validate-pom">
+ <ant antfile="${maven.home}/build-maven.xml" target="validate-pom"/>
+ </target>
+
+ <target name="maven:maven-update">
+ <ant antfile="${maven.home}/build-maven.xml" target="maven-update"/>
+ </target>
<!-- maven:end -->
1.22 +1 -0 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- default.properties 9 Apr 2002 17:29:34 -0000 1.21
+++ default.properties 10 Apr 2002 12:29:43 -0000 1.22
@@ -50,6 +50,7 @@
httpclient.jar = ${lib.repo}/httpclient.jar
jgen.jar = ${lib.repo}/jgen-1.4-dev.jar
commons-jxpath.jar = ${lib.repo}/commons-jxpath-0.1-dev.jar
+commons-fileupload.jar = ${lib.repo}/commons-fileupload-1.0-dev.jar
# -------------------------------------------------------------------
# T E S T I N G
1.21 +24 -7 jakarta-turbine-3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 10 Apr 2002 02:05:23 -0000 1.20
+++ project.xml 10 Apr 2002 12:29:43 -0000 1.21
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
+
<version>2</version>
<name>jakarta-turbine-3</name>
<id>turbine</id>
@@ -10,12 +11,21 @@
<package>org.apache.turbine</package>
<gumpRepositoryId>jakarta</gumpRepositoryId>
<shortDescription>A servlet based framework.</shortDescription>
- <description>Turbine is a servlet based framework that allows experienced Java
developers to quickly build secure web applications. Parts of Turbine can also be used
independently of the web portion of Turbine as well. In other words, we strive to make
portions of Turbine easily available for use in other applications.</description>
+
+ <description>
+ Turbine is a servlet based framework that allows experienced
+ Java developers to quickly build secure web applications. Parts
+ of Turbine can also be used independently of the web portion of
+ Turbine as well. In other words, we strive to make portions of
+ Turbine easily available for use in other applications.
+ </description>
+
<url>http://jakarta.apache.org/turbine/turbine-3/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-3/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/turbine-3/</siteDirectory>
+
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -30,6 +40,7 @@
<archive>http://nagoya.apache.org:8080/eyebrowse/SummarizeList?[EMAIL PROTECTED]</archive>
</mailingList>
</mailingLists>
+
<developers>
<developer>
<name>Jeff Brekke</name>
@@ -80,6 +91,7 @@
<organization>Zenplex</organization>
</developer>
</developers>
+
<dependencies>
<dependency>
<name>jaf</name>
@@ -244,26 +256,31 @@
<jar>jgen-1.4-dev.jar</jar>
</dependency>
</dependencies>
+
<build>
<sourceDirectories>
<sourceDirectory>src/java</sourceDirectory>
<sourceDirectory>src/tool</sourceDirectory>
</sourceDirectories>
+
+ <aspectSourceDirectories/>
+
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
<integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
- <aspectSourceDirectories></aspectSourceDirectories>
<unitTestPatterns>
<unitTestPattern>include = **/*Test.java</unitTestPattern>
- <unitTestPattern>exclude = **/*ServletTest.java</unitTestPattern>
- <unitTestPattern>exclude =
org/mycompany/newapp/modules/screens/JGenTest.java</unitTestPattern>
</unitTestPatterns>
+
+
<integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
<integrationUnitTestPatterns>
- <integrationUnitTestPattern>include =
**/*ServletTest.java</integrationUnitTestPattern>
+ <integrationUnitTestPattern>include =
**/*Test.java</integrationUnitTestPattern>
</integrationUnitTestPatterns>
+
<jarResources>
<jarResource>conf/**/*pipeline.xml</jarResource>
<jarResource>conf/**/*valve.xml</jarResource>
</jarResources>
- <jars></jars>
+
+ <jars/>
+
</build>
</project>
1.5 +2 -2
jakarta-turbine-3/src/rttest/org/apache/turbine/ConditionalValveServletTest.java
Index: ConditionalValveServletTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/rttest/org/apache/turbine/ConditionalValveServletTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConditionalValveServletTest.java 18 Mar 2002 13:19:32 -0000 1.4
+++ ConditionalValveServletTest.java 10 Apr 2002 12:29:43 -0000 1.5
@@ -79,10 +79,10 @@
* different renderers -- velocity, jsp, and jgenerator -- all in the same
* pipeline.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Jeff Brekke</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jeff Brekke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- * @version $Id: ConditionalValveServletTest.java,v 1.4 2002/03/18 13:19:32 jtaylor
Exp $
+ * @version $Id: ConditionalValveServletTest.java,v 1.5 2002/04/10 12:29:43 brekke
Exp $
*/
public class ConditionalValveServletTest
extends ServletTestCase
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
