Author: rhillegas Date: Tue May 9 15:41:26 2006 New Revision: 405560 URL: http://svn.apache.org/viewcvs?rev=405560&view=rev Log: DERBY-1079: Patch bug1079_split2.diff, This splits the public javadoc into a jdbc3-specific and jdbc4-specific sets when built with the jdk16 variable set. Added: db/derby/code/trunk/index.html (with props) db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant (with props) Modified: db/derby/code/trunk/build.xml db/derby/code/trunk/tools/javadoc/publishedapi.ant db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant Modified: db/derby/code/trunk/build.xml URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=405560&r1=405559&r2=405560&view=diff ============================================================================== --- db/derby/code/trunk/build.xml (original) +++ db/derby/code/trunk/build.xml Tue May 9 15:41:26 2006 @@ -543,9 +543,12 @@ + + + @@ -553,11 +556,11 @@ - + - + @@ -572,21 +575,82 @@ name="javadoc.Footer" value="Built on ${javadoc.ts}, from revision ${changenumber}"/> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + Added: db/derby/code/trunk/index.html URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/index.html?rev=405560&view=auto ============================================================================== --- db/derby/code/trunk/index.html (added) +++ db/derby/code/trunk/index.html Tue May 9 15:41:26 2006 @@ -0,0 +1,20 @@ + +Derby Public API + +

Derby Public API

+ +

+Derby's public API consists of two sets of javadoc: +

+ +
    +
  • JDBC2/JDBC3 Public API - Consult +this javadoc if your application runs on +J2SE 1.3, J2SE 1.4, or J2SE 5.0. Also consult this javadoc if your +application runs with the CDC/Foundation Profile(JSR-169).
  • +
  • JDBC4 Public API - Consult this +javadoc if your application runs on Java SE 6.
  • +
+ + + Propchange: db/derby/code/trunk/index.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/derby/code/trunk/tools/javadoc/publishedapi.ant URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/javadoc/publishedapi.ant?rev=405560&r1=405559&r2=405560&view=diff ============================================================================== --- db/derby/code/trunk/tools/javadoc/publishedapi.ant (original) +++ db/derby/code/trunk/tools/javadoc/publishedapi.ant Tue May 9 15:41:26 2006 @@ -1,6 +1,6 @@ # This file contains a list of the files that constitute the public -# API. This includes the whole public API for Derby's JDBC3 -# implementation. +# API. This includes the classes which are common to Derby's JDBC3 +# and JDBC4 versions of the public api. # # IMPORTANT: all names should be like package names, but with slashes # instead of dots. @@ -27,15 +27,8 @@ # package: org.apache.derby.jdbc org/apache/derby/jdbc/ClientBaseDataSource.java -org/apache/derby/jdbc/ClientConnectionPoolDataSource.java -org/apache/derby/jdbc/ClientDataSource.java org/apache/derby/jdbc/ClientDriver.java -org/apache/derby/jdbc/ClientXADataSource.java -org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java -org/apache/derby/jdbc/EmbeddedDataSource.java -org/apache/derby/jdbc/EmbeddedSimpleDataSource.java org/apache/derby/jdbc/EmbeddedDriver.java -org/apache/derby/jdbc/EmbeddedXADataSource.java # package: org.apache.derby.tools Added: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant?rev=405560&view=auto ============================================================================== --- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant (added) +++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant Tue May 9 15:41:26 2006 @@ -0,0 +1,27 @@ +# This file contains the extra list of the files to be included +# with Derby's public JDBC3 api but not with the public JDBC4 api. +# This list supplements the common list found in +# publishedapi.ant. +# +# IMPORTANT: all names should be like package names, but with slashes +# instead of dots. +# +# Add new files to the appropriate package section; add new sections +# for new packages. +# +# IMPORTANT: if you are adding a new package, be sure to add it to +# the list of packages in the publishedapi target in +# the toplevel build.xml file. +# +# Please do not add whitespace in front of class names. +# Blank lines and comments are allowed. + +# package: org.apache.derby.jdbc + +org/apache/derby/jdbc/ClientConnectionPoolDataSource.java +org/apache/derby/jdbc/ClientDataSource.java +org/apache/derby/jdbc/ClientXADataSource.java +org/apache/derby/jdbc/EmbeddedSimpleDataSource.java +org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java +org/apache/derby/jdbc/EmbeddedDataSource.java +org/apache/derby/jdbc/EmbeddedXADataSource.java Propchange: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant?rev=405560&r1=405559&r2=405560&view=diff ============================================================================== --- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant (original) +++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant Tue May 9 15:41:26 2006 @@ -1,5 +1,6 @@ -# This file contains the additional files that constitute the public -# JDBC4 API. This list supplements the JDBC3 list found in +# This file contains the extra list of the files to be included +# with Derby's public JDBC4 api but not with the public JDBC3 api. +# This list supplements the common list found in # publishedapi.ant. # # IMPORTANT: all names should be like package names, but with slashes