You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/06/06 12:24:38 UTC
cvs commit: jakarta-cactus/sample-servlet/conf/sample/build/share build-share.xml
vmassol 2002/06/06 03:24:37
Modified: . build.properties.sample
framework build.properties.sample
sample-servlet build.properties.sample
sample-servlet/conf/sample/build/j2ee12
build.properties.sample
sample-servlet/conf/sample/build/j2ee13
build.properties.sample
sample-servlet/conf/sample/build/share build-share.xml
Log:
renamed all jars with version numbers as prefix
Revision Changes Path
1.12 +16 -9 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties.sample 21 Apr 2002 22:00:48 -0000 1.11
+++ build.properties.sample 6 Jun 2002 10:24:37 -0000 1.12
@@ -6,7 +6,7 @@
# and rename this file to "build.properties" in the same directory that
# contains the "build.xml" file.
#
-# $Id: build.properties.sample,v 1.11 2002/04/21 22:00:48 vmassol Exp $
+# $Id: build.properties.sample,v 1.12 2002/06/06 10:24:37 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -16,28 +16,35 @@
# Mandatory properties
# -----------------------------------------------------------------------------
+# Location of all jars. Note: This is not a mandatory property. It is only
+# used in so that it can be reused when defining the location of all the jars
+# below. You do not have to put all the external jars in a single location.
+lib.repo = c:/apps/repo
+
# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
# it, the corresponding Cactus Framework will be built. For example if you use
# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
# only available for Servlet 2.3 (part of J2EE 1.3).
+j2ee.jar = ${lib.repo}/servletapi-2.3.jar
-j2ee.jar = ../jakarta-servletapi-4/dist/lib/servlet.jar
-#j2ee.jar = ../jakarta-servletapi/dist/lib/servlet.jar
+# This servlet.jar property is only used to copy the Servlet API jar in the
+# Cactus distribution (but is not used for anything else).
+servlet.jar = ${lib.repo}/servletapi-2.3.jar
# The location of the log4j jar
-log4j.jar = ../jakarta-log4j/dist/lib/log4j-1.2rc1.jar
+log4j.jar = ${lib.repo}/log4j-1.2.3.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ../jakarta-commons/httpclient/dist/commons-httpclient-20020421.jar
+commons.httpclient.jar = ${lib.repo}/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Httpunit jar
-httpunit.jar = ../httpunit/lib/httpunit.jar
+httpunit.jar = ${lib.repo}/httpunit-1.4.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ../aspectj/lib/aspectjrt.jar
+aspectjrt.jar = ${lib.repo}/aspectjrt-1.0.4.jar
# The location of the Junit jar
-junit.jar = ../junit/junit3.7/junit.jar
+junit.jar = ${lib.repo}/junit-3.7.jar
# CVS executable to use for documentation generation (used to automatically
# generate web site changelog).
@@ -62,7 +69,7 @@
#weblogic.home.51 = xxx
#orion.home.15 = c:/Apps/orion-1.5.4
#resin.home.20 = c:/Apps/resin-2.1.0
-#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
+#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.1.3
#resin.home.13 = xxx
#tomcat.home.33 = c:/Apps/jakarta-tomcat-3.3.1
1.6 +10 -7 jakarta-cactus/framework/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 21 Apr 2002 17:58:00 -0000 1.5
+++ build.properties.sample 6 Jun 2002 10:24:37 -0000 1.6
@@ -6,7 +6,7 @@
# rename this file to "build.properties" in the same directory that contains the
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.5 2002/04/21 17:58:00 vmassol Exp $
+# $Id: build.properties.sample,v 1.6 2002/06/06 10:24:37 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -16,19 +16,22 @@
# Mandatory properties
# -----------------------------------------------------------------------------
+# Location of all jars. Note: This is not a mandatory property. It is only
+# used in so that it can be reused when defining the location of all the jars
+# below. You do not have to put all the external jars in a single location.
+lib.repo = c:/apps/repo
+
# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
# it, the corresponding Cactus Framework will be built. For example if you use
# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
# only available for Servlet 2.3 (part of J2EE 1.3).
-
-j2ee.jar = ../jakarta-servletapi-4/dist/lib/servlet.jar
-#j2ee.jar = ../jakarta-servletapi/dist/lib/servlet.jar
+j2ee.jar = ${lib.repo}/servletapi-2.3.jar
# The location of the log4j jar
-log4j.jar = ../jakarta-log4j/dist/lib/log4j-1.2rc1.jar
+log4j.jar = ${lib.repo}/log4j-1.2.3.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ../jakarta-commons/httpclient/dist/commons-httpclient-20020421.jar
+commons.httpclient.jar = ${lib.repo}/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Httpunit jar
-httpunit.jar = ../httpunit/lib/httpunit.jar
\ No newline at end of file
+httpunit.jar = ${lib.repo}/httpunit-1.4.jar
1.10 +12 -9 jakarta-cactus/sample-servlet/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.properties.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties.sample 21 Apr 2002 17:58:00 -0000 1.9
+++ build.properties.sample 6 Jun 2002 10:24:37 -0000 1.10
@@ -6,7 +6,7 @@
# and rename this file to "build.properties" in the same directory that
# contains the "build.xml" file.
#
-# $Id: build.properties.sample,v 1.9 2002/04/21 17:58:00 vmassol Exp $
+# $Id: build.properties.sample,v 1.10 2002/06/06 10:24:37 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -26,28 +26,31 @@
# JSP Redirector)
cactus.framework.web = framework/dist/web
+# Location of all jars. Note: This is not a mandatory property. It is only
+# used in so that it can be reused when defining the location of all the jars
+# below. You do not have to put all the external jars in a single location.
+lib.repo = c:/apps/repo
+
# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
# it, the corresponding Cactus Framework will be built. For example if you use
# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
# only available for Servlet 2.3 (part of J2EE 1.3).
-
-j2ee.jar = ../jakarta-servletapi-4/dist/lib/servlet.jar
-#j2ee.jar = ../jakarta-servletapi/dist/lib/servlet.jar
+j2ee.jar = ${lib.repo}/servletapi-2.3.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ../aspectj/lib/aspectjrt.jar
+aspectjrt.jar = ${lib.repo}/aspectjrt-1.0.4.jar
# The location of the log4j jar
-log4j.jar = ../jakarta-log4j/dist/lib/log4j-1.2rc1.jar
+log4j.jar = ${lib.repo}/log4j-1.2.3.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ../jakarta-commons/httpclient/dist/commons-httpclient-20020421.jar
+commons.httpclient.jar = ${lib.repo}/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Junit jar
-junit.jar = ../junit/junit3.7/junit.jar
+junit.jar = ${lib.repo}/junit-3.7.jar
# The location of the Httpunit jar
-httpunit.jar = ../httpunit/lib/httpunit.jar
+httpunit.jar = ${lib.repo}/httpunit-1.4.jar
# -----------------------------------------------------------------------------
# Optional properties
1.8 +8 -9 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties.sample 21 Apr 2002 20:20:02 -0000 1.7
+++ build.properties.sample 6 Jun 2002 10:24:37 -0000 1.8
@@ -6,7 +6,7 @@
# and rename this file to "build.properties" in the same directory that
# contains the "build.xml" file.
#
-# $Id: build.properties.sample,v 1.7 2002/04/21 20:20:02 vmassol Exp $
+# $Id: build.properties.sample,v 1.8 2002/06/06 10:24:37 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -22,25 +22,24 @@
# The location of the Cactus custom Ant tasks jar
cactus.ant.jar = ../lib/cactus-ant.jar
-# The location of the Servlet API 2.2 jar. Note: This file is not provided
-# with the Cactus distribution (you'll have to get it).
-servlet.jar = ../lib/servlet.jar
+# The location of the Servlet API 2.2 jar
+servlet.jar = ../lib/servletapi-2.2.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ../lib/aspectjrt.jar
+aspectjrt.jar = ../lib/aspectjrt-1.0.4.jar
# The location of the log4j jar (optional). Only needed if you want Cactus to
# generate logs
-log4j.jar = ../lib/log4j-1.2rc1.jar
+log4j.jar = ../lib/log4j-1.2.3.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ../lib/commons-httpclient-20020421.jar
+commons.httpclient.jar = ../lib/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Junit jar
-junit.jar = ../lib/junit.jar
+junit.jar = ../lib/junit-3.7.jar
# The location of the Httpunit jar
-httpunit.jar = ../lib/httpunit.jar
+httpunit.jar = ../lib/httpunit-1.4.jar
# -----------------------------------------------------------------------------
# Optional properties
1.6 +8 -9 jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 21 Apr 2002 20:20:02 -0000 1.5
+++ build.properties.sample 6 Jun 2002 10:24:37 -0000 1.6
@@ -6,7 +6,7 @@
# and rename this file to "build.properties" in the same directory that
# contains the "build.xml" file.
#
-# $Id: build.properties.sample,v 1.5 2002/04/21 20:20:02 vmassol Exp $
+# $Id: build.properties.sample,v 1.6 2002/06/06 10:24:37 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -22,25 +22,24 @@
# The location of the Cactus custom Ant tasks jar
cactus.ant.jar = ../lib/cactus-ant.jar
-# The location of the Servlet API 2.2 jar. Note: This file is not provided
-# with the Cactus distribution (you'll have to get it).
-servlet.jar = ../lib/servlet.jar
+# The location of the Servlet API 2.3 jar
+servlet.jar = ../lib/servletapi-2.3.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ../lib/aspectjrt.jar
+aspectjrt.jar = ../lib/aspectjrt-1.0.4.jar
# The location of the log4j jar (optional). Only needed if you want Cactus to
# generate logs
-log4j.jar = ../lib/log4j-1.2rc1.jar
+log4j.jar = ../lib/log4j-1.2.3.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ../lib/commons-httpclient-20020421.jar
+commons.httpclient.jar = ../lib/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Junit jar
-junit.jar = ../lib/junit.jar
+junit.jar = ../lib/junit-3.7.jar
# The location of the Httpunit jar
-httpunit.jar = ../lib/httpunit.jar
+httpunit.jar = ../lib/httpunit-1.4.jar
# -----------------------------------------------------------------------------
# Optional properties
1.3 +9 -4 jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-share.xml 14 Apr 2002 15:56:28 -0000 1.2
+++ build-share.xml 6 Jun 2002 10:24:37 -0000 1.3
@@ -135,7 +135,10 @@
Verify that all mandatory properties have been set
========================================================================
-->
- <target name="check.properties" depends="display.properties">
+ <target name="check.properties"
+ depends="display.properties,check.properties.test,check.properties.warn"/>
+
+ <target name="check.properties.test">
<condition property="properties.ok">
<and>
@@ -149,11 +152,13 @@
</and>
</condition>
- <fail message="Missing property or property pointing to an invalid file (check your build.properties file)"
- unless="properties.ok"/>
-
</target>
+ <target name="check.properties.warn" unless="properties.ok">
+
+ <fail message="Missing property or property pointing to an invalid file (check your build.properties file)"/>
+
+ </target>
<!--
========================================================================
Initialize the build. Must be called by all targets
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>