Author: kristwaa
Date: Thu May 26 08:53:49 2011
New Revision: 1127830
URL: http://svn.apache.org/viewvc?rev=1127830&view=rev
Log:
DERBY-5247: Warnings regarding XPath displayed when generating JavaDoc
Merged fix from trunk (r1127825).
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/build.xml
db/derby/code/branches/10.8/java/demo/build.xml
db/derby/code/branches/10.8/tools/ant/properties/extrapath.properties
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 08:53:49 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1102826
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1102826,1127825
Modified: db/derby/code/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/build.xml?rev=1127830&r1=1127829&r2=1127830&view=diff
==============================================================================
--- db/derby/code/branches/10.8/build.xml (original)
+++ db/derby/code/branches/10.8/build.xml Thu May 26 08:53:49 2011
@@ -1124,7 +1124,7 @@
access="private"
breakiterator="yes"
useexternalfile="yes"
- classpath="${out.dir};${java16compile.classpath};${jars.extras};${osgi}"
+ classpath="${out.dir};${java16compile.classpath};${jars.javadoc}"
destdir="${out.javadoc.dir}/engine"
windowtitle="Apache Derby V${major}.${minor} Internals"
doctitle="Apache Derby V${major}.${minor} Internals"
@@ -1255,7 +1255,7 @@
access="private"
breakiterator="yes"
bootclasspath="${java16compile.classpath}"
- classpath="${out.dir};${java16compile.classpath};${jars.extras};${osgi};${junit}"
+ classpath="${out.dir};${java16compile.classpath};${jars.javadoc};${junit}"
destdir="${out.javadoc.dir}/testing"
windowtitle="Apache Derby V${major}.${minor} Test Javadoc"
doctitle="Apache Derby V${major}.${minor} Test Javadoc"
Modified: db/derby/code/branches/10.8/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/demo/build.xml?rev=1127830&r1=1127829&r2=1127830&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/demo/build.xml (original)
+++ db/derby/code/branches/10.8/java/demo/build.xml Thu May 26 08:53:49 2011
@@ -51,7 +51,6 @@
includes="Simple*">
<classpath>
<pathelement path="${java14compile.classpath}"/>
- <pathelement location="${jcc}"/>
</classpath>
</javac>
<javac
@@ -71,7 +70,6 @@
excludes="nserverdemo/Simple*">
<classpath>
<pathelement path="${java14compile.classpath}"/>
- <pathelement location="${jcc}"/>
</classpath>
</javac>
<!-- "simple" demos under java/demo/ (SimpleApp, SimpleMobileApp) -->
@@ -89,8 +87,8 @@
srcdir="${derby.demo.src.dir}/simple:${derby.demo.src.dir}/simplemobile"
destdir="${out.dir}">
<classpath>
- <pathelement location="${javasrc.dir};${jcc}"/>
- <pathelement path="${java14compile.classpath};${jcc}"/>
+ <pathelement location="${javasrc.dir}"/>
+ <pathelement path="${java14compile.classpath}"/>
</classpath>
</javac>
<javac
@@ -107,8 +105,8 @@
srcdir="${derby.demo.src.dir}/workingwithderby"
destdir="${out.dir}">
<classpath>
- <pathelement location="${javasrc.dir};${jcc};"/>
- <pathelement path="${java14compile.classpath};${jcc};"/>
+ <pathelement location="${javasrc.dir}"/>
+ <pathelement path="${java14compile.classpath}"/>
</classpath>
</javac>
<ant target="compile" dir="toursdb"/>
Modified: db/derby/code/branches/10.8/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/tools/ant/properties/extrapath.properties?rev=1127830&r1=1127829&r2=1127830&view=diff
==============================================================================
--- db/derby/code/branches/10.8/tools/ant/properties/extrapath.properties (original)
+++ db/derby/code/branches/10.8/tools/ant/properties/extrapath.properties Thu May 26 08:53:49
2011
@@ -14,12 +14,16 @@
# limitations under the License.
#
+# The extras defined here are primarily used in build.xml files to pull
+# in additional pieces of software, or APIs, required for building code
+# or for performing various tasks.
+#
+
+#
# Extra jars/zips/classes
#
oro=${javatools.dir}/jakarta-oro-2.0.8.jar
servlet24=${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar
-jcc=${javatools.dir}/db2jcc.jar
-jcc_l=${javatools.dir}/db2jcc_license_c.jar
osgi=${out.felix.dir}
xmlApis=${javatools.dir}/xml-apis.jar
javacc=${javatools.dir}/javacc.jar
@@ -28,10 +32,6 @@ emma=${javatools.dir}/emma.jar
emma_ant=${javatools.dir}/emma_ant.jar
#
-# Compile-time extras
-# Compile time extras must be added for the specific target that requires them in its build.xml
file
-
-#
-# Run-time extras
+# Base JavaDoc collection, used for both product and test JavaDocs.
#
-jars.extras=${oro};${servlet24};${jcc};${jcc_l}
+jars.javadoc=${xmlApis};${osgi};${oro};${servlet24}
|