You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/01/20 04:10:48 UTC
svn commit: r125699 - /struts/core/trunk/build-tests.xml /struts/core/trunk/build-webapp.xml /struts/core/trunk/build-webapps.xml /struts/core/trunk/build.properties.sample /struts/core/trunk/build.xml /struts/core/trunk/conf/test /struts/core/trunk/project.xml
Author: jmitchell
Date: Wed Jan 19 19:10:46 2005
New Revision: 125699
URL: http://svn.apache.org/viewcvs?view=rev&rev=125699
Log:
move taglib tests and config to apps
Removed:
struts/core/trunk/build-tests.xml
struts/core/trunk/build-webapp.xml
struts/core/trunk/build-webapps.xml
struts/core/trunk/conf/test/
Modified:
struts/core/trunk/build.properties.sample
struts/core/trunk/build.xml
struts/core/trunk/project.xml
Deleted: /struts/core/trunk/build-tests.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build-tests.xml?view=auto&rev=125698
==============================================================================
Deleted: /struts/core/trunk/build-webapp.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build-webapp.xml?view=auto&rev=125698
==============================================================================
Deleted: /struts/core/trunk/build-webapps.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build-webapps.xml?view=auto&rev=125698
==============================================================================
Modified: struts/core/trunk/build.properties.sample
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.properties.sample?view=diff&rev=125699&p1=struts/core/trunk/build.properties.sample&r1=125698&p2=struts/core/trunk/build.properties.sample&r2=125699
==============================================================================
--- struts/core/trunk/build.properties.sample (original)
+++ struts/core/trunk/build.properties.sample Wed Jan 19 19:10:46 2005
@@ -15,7 +15,7 @@
compile.deprecation=true
# WARNING: The relative paths below assume that the build.xml file is in the
-# top-level directory of the jakarta-struts source distribution.
+# top-level directory of the struts source distribution.
# commons-lib.home Where the CVS toplevel commons live
commons-lib.home=D:/Projects/Apache/jakarta-commons
Modified: struts/core/trunk/build.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.xml?view=diff&rev=125699&p1=struts/core/trunk/build.xml&r1=125698&p2=struts/core/trunk/build.xml&r2=125699
==============================================================================
--- struts/core/trunk/build.xml (original)
+++ struts/core/trunk/build.xml Wed Jan 19 19:10:46 2005
@@ -3,9 +3,6 @@
<!--
Struts main build.xml file for building everything related to Struts.
- This script will delegate some of it's tasks to the other build*.xml
- scripts (build-webapps.xml, build-tests.xml, ...
-
For a complete list of executable tasks use -projecthelp when calling
this build file.
@@ -288,13 +285,6 @@
</target>
<!--
- Prepare static directories for web applications
--->
- <target name="static.webapps">
- <ant antfile="build-webapps.xml" target="static"/>
- </target>
-
-<!--
Compile core struts library directory components
-->
<target name="compile.library" depends="prepare.library"
@@ -338,14 +328,6 @@
</target>
<!--
- Compile code for web applications
--->
- <target name="compile.webapps" depends="compile.library,static.webapps"
- description="Compile Struts web applications">
- <ant antfile="build-webapps.xml" target="compile"/>
- </target>
-
-<!--
Create Javadoc documentation
-->
<target name="compile.javadoc"
@@ -392,7 +374,6 @@
<target name="prepare.dist" depends="init">
<mkdir dir="${dist.home}"/>
<mkdir dir="${dist.home}/lib"/>
- <mkdir dir="${dist.home}/webapps"/>
</target>
<!--
@@ -408,13 +389,6 @@
</target>
<!--
- Construct distributable web applications
--->
- <target name="dist.webapps" depends="compile.webapps,compile.javadoc">
- <ant antfile="build-webapps.xml" target="dist"/>
- </target>
-
-<!--
Copy sources for distribution
-->
<target name="dist.source" depends="prepare.dist">
@@ -465,7 +439,7 @@
<target name="dist"
depends="dist.library,dist.source"
description="Construct binary distribution"/>
-<!-- depends="dist.library,dist.webapps,dist.source,dist.contrib,dist.examples" -->
+
<!--
Construct complete release distributions
-->
@@ -519,249 +493,6 @@
</checksum>
</target>
-<!--
- Deploy these applications on Catalina
--->
- <target name="deploy.catalina" depends="compile.webapps"
- description="Deploy Struts web.apps in Catalina (Tomcat 4.0)">
-
- <mkdir dir="${catalina.home}/webapps/struts-blank"/>
- <copy todir="${catalina.home}/webapps/struts-blank">
- <fileset dir="${build.home}/blank"/>
- </copy>
-
- <mkdir dir="${catalina.home}/webapps/struts-documentation"/>
- <copy todir="${catalina.home}/webapps/struts-documentation">
- <fileset dir="${build.home}/documentation"/>
- </copy>
-
- <mkdir dir="${catalina.home}/webapps/struts-example"/>
- <copy todir="${catalina.home}/webapps/struts-example">
- <fileset dir="${build.home}/example"/>
- </copy>
-
- <mkdir dir="${catalina.home}/webapps/struts-examples"/>
- <copy todir="${catalina.home}/webapps/struts-examples">
- <fileset dir="${build.home}/examples"/>
- </copy>
-
- </target>
-
-
-<!--
- Dynamic struts-documentation management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.documentation" depends="compile.webapps"
- description="Dynamically install struts-documentation on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-documentation"
- war="file://${build.home}/documentation"/>
- </target>
-
- <target name="reload.documentation" depends="compile.webapps"
- description="Dynamically reload struts-documentation on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-documentation"/>
- </target>
-
- <target name="remove.documentation"
- description="Dynamically remove struts-documentation on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-documentation"/>
- </target>
-
-
-<!--
- Dynamic struts-example management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.example" depends="compile.webapps"
- description="Dynamically install struts-example on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-example"
- war="file://${build.home}/example"/>
- </target>
-
- <target name="list.catalina"
- description="Dynamically list installed apps on Catalina (Tomcat 4.1)">
- <taskdef name="list" classname="org.apache.catalina.ant.ListTask"/>
- <list url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}"/>
- </target>
-
- <target name="reload.example" depends="compile.webapps"
- description="Dynamically reload struts-example on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-example"/>
- </target>
-
- <target name="remove.example"
- description="Dynamically remove struts-example on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-example"/>
- </target>
-
- <!-- Backwards Compatibility -->
- <target name="install.catalina" depends="install.example"/>
- <target name="reload.catalina" depends="reload.example"/>
- <target name="remove.catalina" depends="remove.example"/>
-
-
-<!--
- Dynamic struts-exercise management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.exercise" depends="compile.webapps"
- description="Dynamically install struts-exercise on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-exercise"
- war="file://${build.home}/exercise-taglib"/>
- </target>
-
- <target name="reload.exercise" depends="compile.webapps"
- description="Dynamically reload struts-exercise on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-exercise"/>
- </target>
-
- <target name="remove.exercise"
- description="Dynamically remove struts-exercise on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-exercise"/>
- </target>
-
-
-<!--
- Dynamic struts-tiles management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.tiles" depends="compile.webapps"
- description="Dynamically install struts-tiles on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-tiles"
- war="file://${build.home}/tiles-documentation"/>
- </target>
-
- <target name="reload.tiles" depends="compile.webapps"
- description="Dynamically reload struts-tiles on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-tiles"/>
- </target>
-
- <target name="remove.tiles"
- description="Dynamically remove struts-tiles on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-tiles"/>
- </target>
-
-
-<!--
- Dynamic struts-upload management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.upload" depends="compile.webapps"
- description="Dynamically install struts-upload on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-upload"
- war="file://${build.home}/upload"/>
- </target>
-
- <target name="reload.upload" depends="compile.webapps"
- description="Dynamically reload struts-upload on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-upload"/>
- </target>
-
- <target name="remove.upload"
- description="Dynamically remove struts-upload on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-upload"/>
- </target>
-
-
-<!--
- Dynamic struts-tiles management on Catalina (Tomcat 4.1.x required)
--->
-
- <target name="install.validator" depends="compile.webapps"
- description="Dynamically install struts-validator on Catalina (Tomcat 4.1)">
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <install url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-validator"
- war="file://${build.home}/validator"/>
- </target>
-
- <target name="reload.validator" depends="compile.webapps"
- description="Dynamically reload struts-validator on Catalina (Tomcat 4.1)">
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <reload url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-validator"/>
- </target>
-
- <target name="remove.validator"
- description="Dynamically remove struts-validator on Catalina (Tomcat 4.1)">
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <remove url="${catalina.url}" username="${catalina.username}"
- password="${catalina.password}" path="/struts-validator"/>
- </target>
-
-
-<!--
- Deploy these applications on Tomcat
--->
- <target name="deploy.tomcat" depends="compile.webapps"
- description="Deploy Struts web.apps in Tomcat 3.x">
-
- <mkdir dir="${tomcat.home}/webapps/struts-blank"/>
- <copy todir="${tomcat.home}/webapps/struts-blank">
- <fileset dir="${build.home}/blank"/>
- </copy>
-
- <mkdir dir="${tomcat.home}/webapps/struts-documentation"/>
- <copy todir="${tomcat.home}/webapps/struts-documentation">
- <fileset dir="${build.home}/documentation"/>
- </copy>
-
- <mkdir dir="${tomcat.home}/webapps/struts-example"/>
- <copy todir="${tomcat.home}/webapps/struts-example">
- <fileset dir="${build.home}/example"/>
- </copy>
-
- <mkdir dir="${tomcat.home}/webapps/struts-exercise-taglib"/>
- <copy todir="${tomcat.home}/webapps/struts-exercise-taglib">
- <fileset dir="${build.home}/exercise-taglib"/>
- </copy>
-
- <mkdir dir="${tomcat.home}/webapps/struts-upload"/>
- <copy todir="${tomcat.home}/webapps/struts-upload">
- <fileset dir="${build.home}/upload"/>
- </copy>
-
- </target>
-
-<!--
- Clean contrib distribution
--->
- <target name="clean.contrib" >
- <ant dir="${struts.el.home}"
- target="clean" inheritAll="false"/>
- </target>
<!--
Clean up build and distribution directories
@@ -777,8 +508,8 @@
<!--
All-in-one build target
-->
- <target name="all" depends="clean,compile.library,compile.webapps"
- description="Clean and build library and web applications"/>
+ <target name="all" depends="clean,compile.library"
+ description="Clean and build core library"/>
<!--
@@ -826,81 +557,6 @@
<sourcePath path="${src.share.dir}"/>
</findbugs>
</target>
-
-
-<!--
- Compile Website documenation
--->
-
-<target name="clean.website" depends="clean,compile.website"/>
-<target name="compile.website"
- description="Compile main website">
- <ant antfile="build-webapps.xml" target="compile.docs"/>
- <ant antfile="build-webapps.xml" target="validate.docs"/>
-</target>
-
-
-<!--
- Run tests on all servers not commented out in the build.properties file.
--->
-
- <!-- =================== Cactus-Based Tests on Tomcat ================= -->
-
-
- <target name="test.tomcat.all"
- depends="compile.library,
- skip.tomcat.41,test.tomcat.41,
- skip.tomcat.50,test.tomcat.50,
- skip.tomcat.55,test.tomcat.55"
- description="Run Cactus-based unit tests on all servlet engines">
- </target>
-
- <target name="skip.tomcat.41" unless="tomcat.home.41">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.41' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.41" if="tomcat.home.41"
- depends="skip.tomcat.41,compile.library"
- description="Run unit tests on Tomcat 4.1">
- <echo message="tomcat.home.41 = ${tomcat.home.41}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.41"/>
- </target>
-
-
- <target name="skip.tomcat.50" unless="tomcat.home.50">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.50' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.50" if="tomcat.home.50"
- depends="skip.tomcat.50,compile.library"
- description="Run unit tests on Tomcat 5.0">
- <echo message="tomcat.home.50 = ${tomcat.home.50}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.50"/>
- </target>
-
-
- <target name="skip.tomcat.55" unless="tomcat.home.55">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.55' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.55" if="tomcat.home.55"
- depends="skip.tomcat.55,compile.library"
- description="Run unit tests on Tomcat 5.5">
- <echo message="tomcat.home.55 = ${tomcat.home.55}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.55"/>
- </target>
<!-- ========== Non-Cactus Unit Tests ================================= -->
Modified: struts/core/trunk/project.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/project.xml?view=diff&rev=125699&p1=struts/core/trunk/project.xml&r1=125698&p2=struts/core/trunk/project.xml&r2=125699
==============================================================================
--- struts/core/trunk/project.xml (original)
+++ struts/core/trunk/project.xml Wed Jan 19 19:10:46 2005
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<project>
<pomVersion>3</pomVersion>
- <id>struts-core</id>
+ <id>struts</id>
+
<name>Struts Core</name>
<groupId>struts</groupId>
<currentVersion>1.3.0-dev</currentVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org