You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2013/05/07 14:29:43 UTC
svn commit: r1479881 - in /db/derby/code/trunk: build.xml index.html
tools/javadoc/publishedapi_jdbc.ant tools/javadoc/publishedapi_jdbc3.ant
tools/javadoc/publishedapi_jdbc4.ant
Author: rhillegas
Date: Tue May 7 12:29:43 2013
New Revision: 1479881
URL: http://svn.apache.org/r1479881
Log:
DERBY-6213: Remove jdbc4 variant of the public api javadoc.
Added:
db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant (with props)
Removed:
db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant
db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/index.html
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1479881&r1=1479880&r2=1479881&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue May 7 12:29:43 2013
@@ -1104,60 +1104,18 @@
<delete dir="${public.api.dir}"/>
<mkdir dir="${public.api.dir}"/>
-
- <antcall target="public-jdbc3-api"/>
- <antcall target="public-jdbc4-api"/>
-
-
- </target>
-
- <!--
- Build the jdbc3 public api. Called by publishedapi target.
- -->
- <target name="public-jdbc3-api">
<antcall target="publishedapi-workhorse">
- <param name="bootClasspath" value="${java15compile.classpath}"/>
- <param name="extraApi" value="publishedapi_jdbc3.ant"/>
- </antcall>
-
- </target>
-
- <!--
- Build the jdbc4 public api. Called by publishedapi target.
- -->
- <target name="public-jdbc4-api">
-
- <move todir="${out.javadoc.dir}/jdbc3">
- <fileset dir="${public.api.dir}"/>
- </move>
-
- <mkdir dir="${public.api.dir}"/>
-
- <antcall target="publishedapi-workhorse">
- <param name="bootClasspath" value="${java16compile.classpath}"/>
- <param name="extraApi" value="publishedapi_jdbc4.ant"/>
+ <param name="bootClasspath" value="${java16compile.classpath}"/>
+ <param name="extraApi" value="publishedapi_jdbc.ant"/>
</antcall>
- <move todir="${out.javadoc.dir}/jdbc4">
- <fileset dir="${public.api.dir}"/>
- </move>
-
- <mkdir dir="${public.api.dir}"/>
-
- <move todir="${public.api.dir}/jdbc3">
- <fileset dir="${out.javadoc.dir}/jdbc3"/>
- </move>
-
- <move todir="${public.api.dir}/jdbc4">
- <fileset dir="${out.javadoc.dir}/jdbc4"/>
- </move>
-
</target>
<!--
- This target is called twice, once to build the JDBC3 public api
- and then a second time to build the JDBC4 api.
+ This target used to be called twice, once to build the JDBC3 public api
+ and then a second time to build the JDBC4 api. Now it is only called once,
+ for the single JDBC4+ api.
bootClasspath Sensitive to JDBC level.
extraApi Extra files to include in the public api.
Modified: db/derby/code/trunk/index.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/index.html?rev=1479881&r1=1479880&r2=1479881&view=diff
==============================================================================
--- db/derby/code/trunk/index.html (original)
+++ db/derby/code/trunk/index.html Tue May 7 12:29:43 2013
@@ -38,16 +38,8 @@
For information on developing and deploying an application with Derby, see the <a href="docs/html/devguide/index.html"/>Derby Developer's Guide</a> <a href="docs/pdf/devguide/derbydev.pdf"/>[PDF]</a>. A complete reference to Derby's use of JDBC and SQL can be found in the <a href="docs/html/ref/index.html">Derby Reference Manual</a> <a href="docs/pdf/ref/refderby.pdf">[PDF]</a>.<br/>
</p>
<p>
-Derby's JDBC API is documented in two sets of javadoc:
+Derby's JDBC API can be found <a href="javadoc/index.html">here</a>.
</p>
-<ul>
-<li><a href="javadoc/jdbc3/index.html">JDBC 3.0 Public API</a> - Consult
-this javadoc if your application runs on
-J2SE 5.0. Also consult this javadoc if your
-application runs with the Java ME CDC/Foundation 1.1 Profile (JSR-169).</li>
-<li><a href="javadoc/jdbc4/index.html">JDBC 4.1 Public API</a> - Consult this
-javadoc if your application runs on Java SE 6 or higher.</li>
-</ul>
<p>
For information on setting up and using the Derby Network Server, which provides a client/server access model for Derby databases on machines connected over a network, please read the <a href="docs/html/adminguide/index.html">Derby Server and Administration Guide</a> <a href="docs/pdf/adminguide/derbyadmin.pdf">[PDF]</a>.
</p>
Added: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant?rev=1479881&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant (added)
+++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant Tue May 7 12:29:43 2013
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# 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/ClientDriver.java
+org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
+org/apache/derby/jdbc/ClientDataSource.java
+org/apache/derby/jdbc/ClientXADataSource.java
+
+org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
+org/apache/derby/jdbc/BasicClientDataSource40.java
+org/apache/derby/jdbc/BasicClientXADataSource40.java
+
+org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
+org/apache/derby/jdbc/EmbeddedDataSource.java
+org/apache/derby/jdbc/EmbeddedXADataSource.java
+
+org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
+org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
+org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
Propchange: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc.ant
------------------------------------------------------------------------------
svn:eol-style = native