# HG changeset patch
# User ohair
# Date 1276820398 25200
# Node ID 0ca88d5cdd40b9439efb7799880fa681c8bf7e92
# Parent 28d0f6968ceacd1a5c606e78d871f5e3a82a4c59
6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts
6940241: Change jaxp/jaxws so that the http downloads are not done by default
6960333: Add make level ALLOW_DOWNLOADS=true option
Reviewed-by: darcy, ramap
diff -r 28d0f6968cea -r 0ca88d5cdd40 jaxws/build-defs.xml
--- a/jaxws/build-defs.xml Thu Jun 17 17:18:55 2010 -0700
+++ b/jaxws/build-defs.xml Thu Jun 17 17:19:58 2010 -0700
@@ -55,9 +55,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ depends="init, -use-drop,-src-help">
diff -r 28d0f6968cea -r 0ca88d5cdd40 jaxws/build-drop-template.xml
--- a/jaxws/build-drop-template.xml Thu Jun 17 17:18:55 2010 -0700
+++ b/jaxws/build-drop-template.xml Thu Jun 17 17:19:58 2010 -0700
@@ -75,6 +75,7 @@
+
diff -r 28d0f6968cea -r 0ca88d5cdd40 jaxws/build.properties
--- a/jaxws/build.properties Thu Jun 17 17:18:55 2010 -0700
+++ b/jaxws/build.properties Thu Jun 17 17:19:58 2010 -0700
@@ -104,4 +104,24 @@
drops.dir=${drops.dir}${line.separator}\
${line.separator}
+# Failure messages when source cannot be found on the file system
+failed.nourl.src.message=\
+ERROR: Cannot find source for project ${ant.project.name}.\
+${line.separator}${line.separator}\
+HINT: Try setting drops.dir to indicate where the bundles can be found, \
+or try setting the ant property allow.downloads=true to download the bundle from the URL.\
+${line.separator}\
+e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
+${line.separator}
+
+# Failure message when source cannot be downloaded
+failed.url.src.message=\
+ERROR: Cannot find source for project ${ant.project.name}.\
+${line.separator}${line.separator}\
+HINT: Try setting drops.dir to indicate where the bundles can be found, \
+or try checking the URL with your browser.\
+${line.separator}\
+e.g. ant -Ddrops.dir=some_directory \
+${line.separator}
+
#------------------------------------------------------------
diff -r 28d0f6968cea -r 0ca88d5cdd40 jaxws/build.xml
--- a/jaxws/build.xml Thu Jun 17 17:18:55 2010 -0700
+++ b/jaxws/build.xml Thu Jun 17 17:19:58 2010 -0700
@@ -36,6 +36,11 @@
javac.debug - true or false for debug classfiles
javac.target - classfile version target
javac.source - source version
+ drops.dir - directory that holds source drop bundles
+ allow.download - permit downloads from public url (default is false)
+ (used if bundles not found in drops.dir)
+
+ Run 'make help' for help using the Makefile.
@@ -106,13 +111,17 @@
-
+
+ depends="compile, -build-setup">
+
+
+