See attached files....
Wasn't having much luck obtaining htmlunit via
the Maven 2.0 Antlib, so rolled our own simple
dependency management.
SECTION: Modified Files
----------------------------
M build.properties.glassfish
M build.properties.template
- add http.proxy.{port,host} properties
- remove references to dependencies
we only care about the dependency.base.dir
property
M common/ant/common.xml
- import dependencies.xml
M jsf-api/build.xml
M jsf-demo/build.xml
M jsf-ri/build.xml
- call the update target before anything else.
A common/ant/dependencies.xml
- if a required dependency doesn't exist,
download and install it.
SECTION: Diffs
----------------------------
Index: build.properties.glassfish
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.properties.glassfish,v
retrieving revision 1.8
diff -u -r1.8 build.properties.glassfish
--- build.properties.glassfish 7 Mar 2006 19:09:17 -0000 1.8
+++ build.properties.glassfish 7 Mar 2006 21:22:32 -0000
@@ -43,6 +43,16 @@
jsf.build.home=<SET CURRENT DIRECTORY>
# --------------------------------------------------
+# Set the values for http.proxy.host and
+# http.proxy.port if the build environment is
+# behind a firewall. This is necessary in order
+# for the build system to download the required
+# dependencies.
+# --------------------------------------------------
+http.proxy.host=
+http.proxy.port=
+
+# --------------------------------------------------
# Container Name - a simple identifier which maps
# to the container.xml file in
# ${jsf.build.home}/common/ant/${container.name}
@@ -95,22 +105,11 @@
# --------------------------------------------------
# Base library path
-# - Base location where the following build
-# - dependencies can be found
-# JUnit 3.8.1 (
http://www.junit.org)
-# HtmlUnit 1.8 (
http://htmlunit.sourceforge.net)
-# Cactus 13-1.7.1 (
http://jakarta.apache.org/cactus/)#
-# Taglibrarydoc 1.3 (
https://taglibrarydoc.dev.java.net)
-#
-# Install all of these dependencies into the directory
-# referenced by dependency.base.dir and the build will
-# pick up the libraries automatically.
+# - Base location where build dependencies will be
+# downloaded and installed
# --------------------------------------------------
dependency.base.dir=<SET TO BASE DIRECTORY>
-junit.home=${dependency.base.dir}/junit3.8.1
-htmlunit.home=${dependency.base.dir}/htmlunit-1.8
-cactus.home=${dependency.base.dir}/jakarta-cactus-13-1.7.1
-taglibdoc.home=${dependency.base.dir}/taglibrarydoc-1_3
+
# --------------------------------------------------
# Web application packaging
Index: build.properties.template
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.properties.template,v
retrieving revision 1.3
diff -u -r1.3 build.properties.template
--- build.properties.template 7 Mar 2006 19:08:25 -0000 1.3
+++ build.properties.template 7 Mar 2006 21:22:32 -0000
@@ -44,6 +44,16 @@
jsf.build.home=<SET CURRENT DIRECTORY>
# --------------------------------------------------
+# Set the values for http.proxy.host and
+# http.proxy.port if the build environment is
+# behind a firewall. This is necessary in order
+# for the build system to download the required
+# dependencies.
+# --------------------------------------------------
+http.proxy.host=
+http.proxy.port=
+
+# --------------------------------------------------
# Container Name - a simple identifier which maps
# to a set of ant files in
# ${jsf.build.home}/common/ant/${container.name}
@@ -73,22 +83,10 @@
# --------------------------------------------------
# Base library path
-# - Base location where the following build
-# - dependencies can be found
-# JUnit 3.8.1 (
http://www.junit.org)
-# HtmlUnit 1.8 (
http://htmlunit.sourceforge.net)
-# Cactus 13-1.7.1 (
http://jakarta.apache.org/cactus/)#
-# Taglibrarydoc 1.3 (
https://taglibrarydoc.dev.java.net)
-#
-# Install all of these dependencies into the directory
-# referenced by dependency.base.dir and the build will
-# pick up the libraries automatically.
-# --------------------------------------------------
-dependency.base.dir=
-junit.home=${dependency.base.dir}/junit3.8.1
-htmlunit.home=${dependency.base.dir}/htmlunit-1.8
-cactus.home=${dependency.base.dir}/jakarta-cactus-13-1.4.1
-taglibdoc.home=${dependency.base.dir}/taglibrarydoc-1_3
+# - Base location where build dependencies will be
+# downloaded and installed
+# --------------------------------------------------
+dependency.base.dir=<SET TO BASE DIRECTORY>
# --------------------------------------------------
# Web application packaging
Index: common/ant/common.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/common/ant/common.xml,v
retrieving revision 1.14
diff -u -r1.14 common.xml
--- common/ant/common.xml 7 Mar 2006 18:28:09 -0000 1.14
+++ common/ant/common.xml 7 Mar 2006 21:22:32 -0000
@@ -29,6 +29,7 @@
<import
file="${jsf.build.home}/common/ant/${container.name}/container.xml"/>
+ <import file="${jsf.build.home}/common/ant/dependencies.xml"/>
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement
Index: jsf-api/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-api/build.xml,v
retrieving revision 1.167
diff -u -r1.167 build.xml
--- jsf-api/build.xml 7 Mar 2006 18:28:09 -0000 1.167
+++ jsf-api/build.xml 7 Mar 2006 21:22:32 -0000
@@ -620,7 +620,7 @@
Main target
===================================================================
-->
- <target name="main" depends="jars"
+ <target name="main" depends="update,jars"
description="Compile API classes and build JAR file"/>
<!--
Index: jsf-demo/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-demo/build.xml,v
retrieving revision 1.97
diff -u -r1.97 build.xml
--- jsf-demo/build.xml 7 Mar 2006 17:21:00 -0000 1.97
+++ jsf-demo/build.xml 7 Mar 2006 21:22:32 -0000
@@ -246,7 +246,7 @@
</target>
- <target name="main" depends="prepare.build">
+ <target name="main" depends="update,prepare.build">
<ant dir="${basedir}/components" inheritAll="false">
</ant>
Index: jsf-ri/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.206
diff -u -r1.206 build.xml
--- jsf-ri/build.xml 6 Mar 2006 16:40:25 -0000 1.206
+++ jsf-ri/build.xml 7 Mar 2006 21:22:32 -0000
@@ -410,7 +410,7 @@
<delete dir="${build.classes.dir}/com/sun/org"/>
</target>
- <target name="main" depends="jars"/>
+ <target name="main" depends="update,jars"/>
<target name="create.runtime.config">
<xslt in="${build.dir}/classes/com/sun/faces/standard-html-renderkit.xml"
SECTION: New Files
----------------------------
SEE ATTACHMENTS