refactored build system
git-svn-id: https://svn.apache.org/repos/asf/incubator/click/trunk@714574 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/click/README.txt b/click/README.txt
index 9b1e46e..65882ae 100644
--- a/click/README.txt
+++ b/click/README.txt
@@ -38,6 +38,7 @@
build-webapps build web application WAR files
deploy-webapps copy WAR files to application server
get-deps download JAR dependencies
+ get-deps-proxy download JAR dependencies via proxy
help display the Help message
javadoc create Javadoc HTML files
diff --git a/click/TODO.txt b/click/TODO.txt
index ab65696..ba1d93a 100644
--- a/click/TODO.txt
+++ b/click/TODO.txt
@@ -1,7 +1,5 @@
CODE
-
-* modify build ZIP
-* upload build jar
+* upload maven module
* review table.css
* Select can have multiple values and this need to be resolved with multpart request
diff --git a/click/build.properties b/click/build.properties
index cc8bb2d..a06a02f 100644
--- a/click/build.properties
+++ b/click/build.properties
@@ -1,14 +1,14 @@
# Build version
version=0.14
-# App Server deployment directory
+# App Server deployment directory by Ant target 'deploy-webapps'
dir.appserver=C:/java/apache-tomcat-5.5.12/webapps
-# Cayenne framework JAR used for building Click Extras
+# Cayenne framework JAR used by Ant target 'click-extras'
jar.cayenne=C:/java/cayenne-1.2M6/lib/cayenne.jar
-# Proxy hostname for downloading JAR files
-proxy.host=192.168.0.3
+# Proxy hostname used by Ant target 'get-deps-proxy'
+proxy.host=
-# Proxy port for downloading JAR files
-proxy.port=3128
+# Proxy port for by Ant target 'get-deps-proxy'
+proxy.port=
diff --git a/click/build.xml b/click/build.xml
index f144c9e..4b65184 100644
--- a/click/build.xml
+++ b/click/build.xml
@@ -254,7 +254,6 @@
</target>
<target name="get-deps" description="download JAR dependencies">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
<property name="repository" value="http://www.ibiblio.org/maven"/>
<get src="${repository}/commons-codec/jars/${jar.codec}"
dest="lib/${jar.codec}"
@@ -278,6 +277,11 @@
dest="lib/${jar.spring}"
usetimestamp="true"/>
</target>
+
+ <target name="get-deps-proxy" description="download JAR dependencies">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ <antcall target="get-deps"/>
+ </target>
<target name="help" description="display the Help message">
<echo message="Click ${version} web application framework"/>
@@ -292,6 +296,7 @@
<echo message="build-webapps build web application WAR files"/>
<echo message="deploy-webapps copy WAR files to application server"/>
<echo message="get-deps download JAR dependencies"/>
+ <echo message="get-deps-proxy download JAR dependencies via proxy"/>
<echo message="help display the Help message"/>
<echo message="javadoc create Javadoc HTML files"/>
<echo/>
