# HG changeset patch
# User lana
# Date 1277875900 25200
# Node ID 6bca2bbbf1f3fd327dc0205b2298372894257d51
# Parent 096afcd830fb1cc34f1b319fc23dd328227fb283# Parent ac65a33c5c85feb8797240c2a33a1e758a92ca1a
Merge
diff -r 096afcd830fb -r 6bca2bbbf1f3 jaxws/build-defs.xml
--- a/jaxws/build-defs.xml Thu Jun 24 20:03:05 2010 -0700
+++ b/jaxws/build-defs.xml Tue Jun 29 22:31:40 2010 -0700
@@ -55,9 +55,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ depends="init, -use-drop,-src-help">
diff -r 096afcd830fb -r 6bca2bbbf1f3 jaxws/build-drop-template.xml
--- a/jaxws/build-drop-template.xml Thu Jun 24 20:03:05 2010 -0700
+++ b/jaxws/build-drop-template.xml Tue Jun 29 22:31:40 2010 -0700
@@ -75,6 +75,7 @@
+
diff -r 096afcd830fb -r 6bca2bbbf1f3 jaxws/build.properties
--- a/jaxws/build.properties Thu Jun 24 20:03:05 2010 -0700
+++ b/jaxws/build.properties Tue Jun 29 22:31:40 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 096afcd830fb -r 6bca2bbbf1f3 jaxws/build.xml
--- a/jaxws/build.xml Thu Jun 24 20:03:05 2010 -0700
+++ b/jaxws/build.xml Tue Jun 29 22:31:40 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">
+
+
+