M build.properties.sample
categorize the properties to indicate what properties are
required to build binaries, run tests etc.
M build.xml
added a target to build API and RI.
added a target to run API, RI and demo unit tests.
M jsf-demo/default.properties
remove unused properties.
M jsf-ri/build.xml
Fix problem reported by Pierre related to resolving the basedir.
M jsf-tools/build.xml
Fix problem reported by Pierre.ant jars are already in the
system path, so it is redundant to add it to the classpath.
Remove unused dom.jar and sax.jar properties.
Index: build.properties.sample
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.properties.sample,v
retrieving revision 1.1
diff -u -r1.1 build.properties.sample
--- build.properties.sample 8 Sep 2004 17:55:54 -0000 1.1
+++ build.properties.sample 10 Sep 2004 20:44:58 -0000
@@ -8,6 +8,9 @@
# $Id: build.properties.sample,v 1.1 2004/09/08 17:55:54 rlubke Exp $
# -----------------------------------------------------------------------------
+# --------------------------------------------------
+# BUILD REQUIRES ANT 1.6 OR ABOVE
+# --------------------------------------------------
# ----- Compile Control Flags -----
@@ -15,13 +18,37 @@
compile.optimized = true
compile.debug = false
+# --------------------------------------------------
+# Path to TOMCAT/JWSDP installation
+# --------------------------------------------------
+tomcat.home=
+
+# --------------------------------------------------
+# Required libraries to build API and RI
+# --------------------------------------------------
+
+# ----- Commons Library JARs
+commons-logging.jar=${tomcat.home}/jwsdp-shared/lib/commons-logging.jar
+commons-digester.jar=${tomcat.home}/jwsdp-shared/lib/commons-digester.jar
+commons-beanutils.jar=${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar
+commons-collections.jar=${tomcat.home}/jwsdp-shared/lib/commons-collections.jar
+
+# ----- JSTL 1.0 or 1.1 Library JARs
+jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
+standard.jar=${tomcat.home}/jstl/lib/standard.jar
+
+# ----- JAXP implementation JAR
+xerces.jar=${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar
# ----- Build Control Flags -----
-# determines whether dependent library JARs
-# are included with the generated WAR
+# determines whether dependent library JARs are included with the generated WAR.
+# By default all depedent jars are bundled with the application. If you don't
+# want to do so, comment the following property and uncomment build.wspack
+# property.
build.standalone = true
+#build.wspack = true
# ----- Run Control Flags -----
@@ -45,6 +72,7 @@
# MIF Doclet (
http://developer.java.sun.com/developer/earlyAccess/mifdoclet)
# Portlet API 1.0
# Jakarta Cactus version 13-1.4.1 or later.
+# These libraries are required only if you would like to run tests suites.
# ------------------------------------------------------------------------------
base.library.path=/home/user
@@ -56,9 +84,6 @@
htmlunit.home=${base.library.path}/htmlunit-1.2.3
-portlet-api.home=${base.library.path}/portlet1_0
-portlet-api.jar=${portlet-api.home}/lib/portlet.jar
-
cactus.home=${base.library.path}/jakarta-cactus-13-1.4.1
cactus.lib=${cactus.home}/lib
cactus.jar=${cactus.lib}/cactus-1.4.1.jar
@@ -66,32 +91,13 @@
httpclient.jar=${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar
aspectjrt.jar=${cactus.lib}/aspectjrt-1.0.5.jar
-
-# --------------------------------------------------
-# PATH TO TOMCAT/JWSDP INSTALLATION
-# --------------------------------------------------
-tomcat.home=
-
-
# --------------------------------------------------
-# PATH TO PLUTO INSTALLATION
+# PATH TO PORTLET API and PLUTO INSTALLATION
# (OPTIONAL unless working with portlets)
# --------------------------------------------------
-pluto.home=
-
-# --------------------------------------------------
-# REQUIRED LIBRARIES
-# --------------------------------------------------
+portlet-api.home=${base.library.path}/portlet1_0
+portlet-api.jar=${portlet-api.home}/lib/portlet.jar
-# ----- Commons Library JARs
-commons-logging.jar=${tomcat.home}/jwsdp-shared/lib/commons-logging.jar
-commons-digester.jar=${tomcat.home}/jwsdp-shared/lib/commons-digester.jar
-commons-beanutils.jar=${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar
-commons-collections.jar=${tomcat.home}/common/lib/commons-collections.jar
+pluto.home=
-# ----- JSTL 1.0 or 1.1 Library JARs
-jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
-standard.jar=${tomcat.home}/jstl/lib/standard.jar
-# ----- JAXP implementation JAR
-xerces.jar=${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- build.xml 2 Sep 2004 19:31:11 -0000 1.6
+++ build.xml 10 Sep 2004 20:44:58 -0000
@@ -8,7 +8,7 @@
<!-- ************ JSF build file ************************************** -->
-<project name="publish.java.net" default="publish.java.net" basedir=".">
+<project name="javaserverfaces" default="main" basedir=".">
<!-- ************ Per user local properties ******************************* -->
@@ -58,6 +58,9 @@
<delete file="${basedir}/javaserverfaces_source.class" />
<delete file="jsf-portlet.zip" />
<delete dir="{jsf-portlet.home}/dist" />
+ <ant dir="${jsf-api.home}" target="clean" inheritAll="false" />
+ <ant dir="${jsf-ri.home}" target="clean" inheritAll="false" />
+ <ant dir="${jsf-demo.home}" target="clean" inheritAll="false" />
</target>
<!-- Create the source distribution -->
@@ -182,5 +185,17 @@
<javaNetUpload projectName="javaserverfaces"
toFile="/weekly/javaserverfaces_source.class" fromFile="${basedir}/javaserverfaces_source.class"
fileDescription="Weekly source snapshot." overwrite="yes" />
+ </target>
+
+ <target name="main" description="Build API and RI" >
+ <ant dir="${jsf-api.home}" target="main" inheritAll="false" />
+ <ant dir="${jsf-ri.home}" target="main" inheritAll="false" />
+ <ant dir="${jsf-demo.home}" target="main" inheritAll="false" />
+ </target>
+
+ <target name="test" description="Run API, RI, Demo automated tests" >
+ <ant dir="${jsf-api.home}" target="test" inheritAll="false" />
+ <ant dir="${jsf-ri.home}" target="test" inheritAll="false" />
+ <ant dir="${jsf-demo.home}" target="test" inheritAll="false" />
</target>
</project>
Index: jsf-demo/default.properties
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-demo/default.properties,v
retrieving revision 1.12
diff -u -r1.12 default.properties
--- jsf-demo/default.properties 26 Aug 2004 22:52:27 -0000 1.12
+++ jsf-demo/default.properties 10 Sep 2004 20:44:59 -0000
@@ -52,13 +52,6 @@
commons-digester.jar=${tomcat.home}/jwsdp-shared/lib/commons-digester.jar
commons-beanutils.jar=${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar
commons-collections.jar=${tomcat.home}/jwsdp-shared/lib/commons-collections.jar
-commons-el.jar=${tomcat.home}/common/lib/commons-el.jar
-naming-resources.jar=${tomcat.home}/common/lib/naming-resources.jar
-naming-common.jar=${tomcat.home}/common/lib/naming-common.jar
-jasper-compiler.jar=${tomcat.home}/common/lib/jasper-compiler.jar
-jasper-runtime.jar=${tomcat.home}/common/lib/jasper-runtime.jar
-commons-modeler.jar=${tomcat.home}/server/lib/commons-modeler.jar
-jmx.jar=${tomcat.home}/common/lib/jmx.jar
jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
standard.jar=${tomcat.home}/jstl/lib/standard.jar
servlet.jar=${tomcat.home}/common/lib/servlet-api.jar
Index: jsf-ri/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.166
diff -u -r1.166 build.xml
--- jsf-ri/build.xml 8 Sep 2004 17:56:00 -0000 1.166
+++ jsf-ri/build.xml 10 Sep 2004 20:44:59 -0000
@@ -42,7 +42,7 @@
<!-- The base directory for the JSF APIs -->
<property name="jsf-api.home" value ="../jsf-api"/>
- <property name="jsf-tools.dir" value="${basedir}/../jsf-tools"/>
+ <property name="jsf-tools.dir" value="../jsf-tools"/>
<!-- The base directory for distribution targets -->
<property name="dist.home" value="${basedir}/dist"/>
Index: jsf-tools/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- jsf-tools/build.xml 8 Sep 2004 17:56:01 -0000 1.34
+++ jsf-tools/build.xml 10 Sep 2004 20:44:59 -0000
@@ -36,8 +36,6 @@
<!-- The locations of necessary jar files -->
<property name="junit.jar"
value="${tomcat.home}/../junit3.8.1/junit.jar"/>
- <property name="ant.jar"
- value="${myenv.ANT_HOME}/lib/ant.jar" />
<property name="servlet.jar" value="${tomcat.home}/common/lib/servlet-api.jar"/>
<property name="jsp.jar" value="${tomcat.home}/common/lib/jsp-api.jar"/>
<property name="commons-logging.jar"
@@ -49,8 +47,6 @@
<property name="commons-beanutils.jar"
value="${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar"/>
<property name="xerces.jar" value="${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar"/>
- <property name="dom.jar" value="${tomcat.home}/jaxp/lib/endorsed/dom.jar"/>
- <property name="sax.jar" value="${tomcat.home}/jaxp/lib/endorsed/sax.jar"/>
<property name="jaxp-api.jar" value="${tomcat.home}/jaxp/lib/jaxp-api.jar"/>
<property name="jcov.jar"
value="${tomcat.home}/../jcov/lib/jcov.jar"/>
@@ -84,7 +80,6 @@
<pathelement location="${build.classes}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${jsp.jar}"/>
- <pathelement location="${ant.jar}"/>
</path>
<path id="run.classpath">
@@ -98,7 +93,6 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${xerces.jar}"/>
- <pathelement location="${sax.jar}"/>
<pathelement location="${jaxp-api.jar}"/>
</path>
@@ -173,11 +167,9 @@
<echo message="commons-collections.jar = ${commons-collections.jar}"/>
<echo message="commons-digester.jar = ${commons-digester.jar}"/>
<echo message="commons-logging.jar = ${commons-logging.jar}"/>
- <echo message="dom.jar = ${dom.jar}"/>
<echo message="jaxp-api.jar = ${jaxp-api.jar}"/>
<echo message="jsp.jar = ${jsp.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
- <echo message="sax.jar = ${sax.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message="xerces.jar = ${xerces.jar}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net