dwinterfeldt 02/01/14 19:54:45
Modified: contrib/validator build.properties.sample build.xml
Log:
Modified build to depend on Commons Validator and work with new package names. Unit
tests will possibly be added back in later, but the Commons Valiadtor has unit tests.
Revision Changes Path
1.2 +10 -27 jakarta-struts/contrib/validator/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/validator/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 17 Aug 2001 16:50:32 -0000 1.1
+++ build.properties.sample 15 Jan 2002 03:54:45 -0000 1.2
@@ -2,30 +2,13 @@
# for building the Cactus Sample or the properties need to be specified on
# the command line when starting Ant with the -D switch
-java.home=d:/jdk1.3
-struts.jar=../../target/library/struts.jar
-struts.tlds=../../target/library
-commons-beanutils.jar=c:/projects/jakarta-struts/target/library/commons-beanutils.jar
-commons-collections.jar=c:/projects/jakarta-struts/target/library/commons-collections.jar
-commons-digester.jar=c:/projects/jakarta-struts/target/library/commons-digester.jar
-servlet.jar=c:/tomcat3/lib/servlet.jar
-jdbc20ext.jar=c:/tomcat4/lib/jdbc2_0-stdext.jar
-regexp.jar=c:/software/jakarta-regexp/jakarta-regexp-1.2.jar
-xerces.jar=c:/software/xerces/xerces.jar
-cactus.jar=c:/software/cactus/lib/commons-cactus.jar
-cactus.ant.jar=c:/software/cactus/lib/commons-cactus-ant.jar
-junit.jar=c:/software/junit3.5/junit.jar
-
-# Shouldn't be necessary, there is a problem with my ant setup
-ant.jar=c:/software/ant/lib/ant.jar
-ant.optional.jar=c:/software/ant/lib/optional.jar
-
-# Servlet engine locations for the tests
-
-# Note: If you don't want to run the test on a given servlet engine, just
-# comment it's home property. For example, if you don't want to run the
-# tests on the Resin 1.3, comment the "resin.home.13" property.
-#resin.home.13 = f:/applis/resin-1.3.s010125
-tomcat.home.32 = c:/tomcat3
-tomcat.home.40 = c:/tomcat4
-
+commons-validator.jar=d:/office/jakarta-commons/validator/dist/commons-validator.jar
+commons-beanutils.jar=d:/java/lib/commons-beanutils.jar
+commons-collections.jar=d:/java/lib/commons-collections.jar
+commons-digester.jar=d:/java/lib/commons-digester.jar
+struts.jar=d:/office/struts/jakarta-struts/target/library/struts.jar
+struts.tlds=d:/office/struts/jakarta-struts/target/library
+servlet.jar=e:/tomcat3/lib/servlet.jar
+jdbc20ext.jar=d:/java/lib/jdbc2_0-stdext.jar
+regexp.jar=e:/software/regexp/jakarta-regexp-1.2.jar
+xerces.jar=e:/software/xerces/xerces.jar
1.4 +12 -126 jakarta-struts/contrib/validator/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/validator/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 19 Oct 2001 04:51:09 -0000 1.3
+++ build.xml 15 Jan 2002 03:54:45 -0000 1.4
@@ -13,21 +13,17 @@
<property name="src" value="src" />
<property name="share" value="share" />
<property name="example" value="example" />
- <property name="jdbc.example" value="jdbc-example" />
<property name="web" value="web" />
<property name="dist" value="dist" />
- <property name="webapps" value="${dist}/webapps" />
+ <property name="webapps" value="webapps" />
<property name="build" value="build" />
<property name="target" value="target" />
<property name="web.classes" value="WEB-INF/classes" />
<property name="tlds" value="WEB-INF/tlds" />
<property name="docs" value="docs" />
<property name="build.javadocs" value="${dist}/${docs}/api" />
- <property name="package.root" value="com/wintecinc/struts"/>
- <property name="package" value="com/wintecinc/struts/action"/>
- <property name="package.example" value="com/wintecinc/struts/example/validator"/>
- <property name="package.jdbc.example"
value="com/wintecinc/struts/example/validator/jdbc"/>
- <property name="package.test" value="com/wintecinc/test"/>
+ <property name="package.root" value="org/apache/struts/validator"/>
+ <property name="package.example" value="${package.root}/example"/>
<target name="prepare">
<!-- Create the time stamp -->
@@ -36,18 +32,17 @@
<mkdir dir="${build}"/>
<mkdir dir="${target}"/>
<mkdir dir="${target}/${example}/${web.classes}"/>
- <mkdir dir="${target}/${jdbc.example}/${web.classes}"/>
</target>
<!-- Setting Classpath -->
<path id="base.classpath">
<pathelement path="${servlet.jar}"/>
<pathelement path="${struts.jar}"/>
+ <pathelement path="${commons-validator.jar}"/>
<pathelement path="${commons-beanutils.jar}"/>
<pathelement path="${commons-collections.jar}"/>
<pathelement path="${commons-digester.jar}"/>
<pathelement path="${regexp.jar}"/>
- <pathelement path="${jdbc20ext.jar}"/>
</path>
<path id="main.classpath">
@@ -84,13 +79,6 @@
destdir="${target}/${example}/${web.classes}">
<classpath refid="main.classpath" />
</javac>
-
- <!-- Compile the java code from ${src}/${jdbc.example} into ${build} -->
- <javac srcdir="${src}/${jdbc.example}"
- destdir="${target}/${jdbc.example}/${web.classes}">
- <classpath refid="main.classpath" />
- </javac>
-
</target>
<target name="copy_example" depends="compile_example">
@@ -100,23 +88,9 @@
/>
</copy>
- <copy todir="${target}/${jdbc.example}/${web.classes}" >
- <fileset dir="${src}/${jdbc.example}"
- excludes="**/*.java"
- />
- </copy>
-
<copy todir="${target}/${example}/${tlds}" >
<fileset dir="${dist}"
- includes="struts-validator.tld"/>
- <fileset dir="${struts.tlds}">
- <include name="*.tld" />
- </fileset>
- </copy>
-
- <copy todir="${target}/${jdbc.example}/${tlds}" >
- <fileset dir="${dist}"
- includes="struts-validator.tld"/>
+ includes="struts-validator.tld" />
<fileset dir="${struts.tlds}">
<include name="*.tld" />
</fileset>
@@ -129,6 +103,7 @@
<mkdir dir="lib" />
<copy file="${struts.jar}" todir="lib"/>
+ <copy file="${commons-validator.jar}" todir="lib"/>
<copy file="${commons-beanutils.jar}" todir="lib"/>
<copy file="${commons-collections.jar}" todir="lib"/>
<copy file="${commons-digester.jar}" todir="lib"/>
@@ -151,30 +126,13 @@
<lib dir="lib" />
</war>
- <copy todir="${target}/${jdbc.example}" >
- <fileset dir="${web}/${jdbc.example}">
- <include name="**/**" />
- </fileset>
- </copy>
-
- <war warfile="${webapps}/jdbc-validator.war"
webxml="${target}/${jdbc.example}/WEB-INF/web.xml">
- <fileset dir="${target}/${jdbc.example}">
- <include name="**/**" />
- <exclude name="WEB-INF/web.xml" />
- </fileset>
- <lib dir="lib" />
- <lib dir="${dist}">
- <include name="${validator.jar}" />
- </lib>
- </war>
-
</target>
<target name="javadocs" depends="war" description="Creates the API
documentation">
<mkdir dir="${build.javadocs}"/>
- <javadoc packagenames="com.wintecinc.struts.action.*,
- com.wintecinc.struts.taglib.html.*,
- com.wintecinc.struts.validation.*"
+ <javadoc packagenames="org.apache.struts.validator.action.*,
+ org.apache.struts.validator.taglib.html.*,
+ org.apache.struts.validator.util.*"
sourcepath="${src}/${share}"
destdir="${build.javadocs}"
author="true"
@@ -189,8 +147,7 @@
<mkdir dir="${dist}/${src}"/>
<mkdir dir="${dist}/${web}"/>
- <mkdir dir="${dist}/conf"/>
- <mkdir dir="${dist}/sql"/>
+ <mkdir dir="${dist}/${webapps}"/>
<mkdir dir="${dist}/${docs}"/>
<copy todir="${dist}/${src}" >
@@ -205,89 +162,18 @@
</fileset>
</copy>
- <copy todir="${dist}/conf" >
- <fileset dir="conf">
+ <copy todir="${dist}/${webapps}" >
+ <fileset dir="${webapps}">
<include name="**/**" />
</fileset>
</copy>
- <copy todir="${dist}/sql" >
- <fileset dir="sql">
- <include name="**/**" />
- </fileset>
- </copy>
-
<copy todir="${dist}/${docs}" >
<fileset dir="${docs}">
<include name="**/**" />
</fileset>
</copy>
-
</target>
-
-<!--
- Run tests on all servers not commented out in the build.properties file.
--->
- <target name="test.all" depends="tests_tomcat_32,tests_tomcat_40">
- </target>
-
- <!--
- ========================================================================
- Display a warning message if the needed servlet engine home property
- is not set
- ========================================================================
- -->
- <target name="check_tests_tomcat_32" depends="war" unless="tomcat.home.32">
-
- <echo message=""/>
- <echo message="*********************************************************"/>
- <echo message="WARNING : The 'tomcat.home.32' property has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*********************************************************"/>
- <echo message=""/>
-
- </target>
-
- <target name="tests_tomcat_32" depends="check_tests_tomcat_32"
if="tomcat.home.32">
-
- <echo message="tomcat.home.32 = ${tomcat.home.32}"/>
-
- <ant antfile="build-test.xml" target="tests_tomcat_32"/>
-
- </target>
-
- <!--
- ========================================================================
- Display a warning message if the needed servlet engine home property
- is not set
- ========================================================================
- -->
- <target name="check_tests_tomcat_40" depends="war" unless="tomcat.home.40">
-
- <echo message=""/>
- <echo message="*********************************************************"/>
- <echo message="WARNING : The 'tomcat.home.40' property has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*********************************************************"/>
- <echo message=""/>
-
- </target>
-
- <target name="tests_tomcat_40" depends="check_tests_tomcat_40"
if="tomcat.home.40">
-
- <echo message="tomcat.home.40 = ${tomcat.home.40}"/>
-
- <ant antfile="build-test.xml" target="tests_tomcat_40"/>
-
- </target>
-
- <!-- Dist target called by struts script -->
- <target name="compile.for.struts" depends="compile"/>
-
- <target name="dist.for.struts" depends="dist">
- <copy file="${dist}/${validator.jar}" todir="${dist.home}/lib"/>
- <copy file="${dist}/struts-validator.tld" todir="${dist.home}/lib"/>
- </target>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
