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 fu...@apache.org on 2006/08/23 02:46:50 UTC

svn commit: r433817 - in /db/derby/code/branches/10.2: index.html tools/release/build.xml

Author: fuzzylogic
Date: Tue Aug 22 17:46:50 2006
New Revision: 433817

URL: http://svn.apache.org/viewvc?rev=433817&view=rev
Log:
Merge revision 433816 to 10.2 branch. Contains fixed for DERBY-1330, DERBY-1405,
and DERBY-935.

Modified:
    db/derby/code/branches/10.2/index.html
    db/derby/code/branches/10.2/tools/release/build.xml

Modified: db/derby/code/branches/10.2/index.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/index.html?rev=433817&r1=433816&r2=433817&view=diff
==============================================================================
--- db/derby/code/branches/10.2/index.html (original)
+++ db/derby/code/branches/10.2/index.html Tue Aug 22 17:46:50 2006
@@ -15,22 +15,56 @@
   limitations under the License.
 -->
 <html>
-<title>Derby Public API</title>
+<title>Welcome to Apache Derby</title>
 <body>
-<h1>Derby Public API</h1>
-
+<center><a href="http://db.apache.org/derby/">
+        <img src="docs/html/images/logowithtext.jpg" border="0"/></a><br/>
+<h2>Contents</h2>
+<a href="#new">New to Derby?</a><br/>
+<a href="#using">Using Derby</a><br/>
+<a href="#resources">More Resources</a><br/>
+</center>
+<br/>
+<a name="new"/><h3>New to Derby?</h3>
+<p>If this is your first time using Derby, please look at the <a href="docs/html/getstart/index.html">Getting Started Guide</a> <a href="docs/html/getstart/getstart-single.html">[HTML Book]</a> <a href="docs/pdf/getstart/getstart.pdf">[PDF]</a> and <a href="docs/html/workingwithderby/index.html">Working With Derby</a> <a href="docs/html/workingwithderby/workingwithderby-single.html">[HTML Book]</a> <a href="docs/pdf/workingwithderby/workingwithderby.pdf">[PDF]</a> for assistance configuring your environment, creating a new database, and executing SQL statements.</p>
+<p>Interested in seeing some code that makes use of Derby? There are also some <a href="demo/programs/readme.html">simple demo applications</a> included to help you understand how to start using Derby in your application.</p>
+<p>Derby includes some tools to help you get started working with Derby databases. Additional information about these tools can be found in the <a href="docs/html/tools/index.html">Derby Tools and Utilities Guide</a> <a href="docs/html/tools/tools-single.html">[HTML Book]</a> <a href="docs/pdf/tools/derbytools.pdf">[PDF]</a>.</p>
+<p>If you need more help getting started, the Apache Derby website has a <a href="http://db.apache.org/derby/quick_start.html">Quick Start page</a> with links to tutorials, more demo applications, and instructions on how to use Derby with a variety of different IDEs, tools, and web application servers.</p>
+<p>If you need additional help, the Apache Derby Users mailing list can be helpful if you have specific questions regarding setting up and using Derby. For information on how to subscribe and post to the Apache Derby Users mailing list, please read the <a href="http://db.apache.org/derby/derby_mail.html">mailing lists page</a> on the Apache Derby website.</p>
+<br/>
+<a name="using"/><h3>Using Derby</h3>
 <p>
-Derby's public API consists of two sets of javadoc:
+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/html/devguide/devguide-single.html">[HTML Book]</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/html/ref/ref-single.html">[HTML Book]</a> <a href="docs/pdf/ref/refderby.pdf">[PDF]</a>.<br/>
+</p>
+<p>
+Derby's JDBC API is documented in two sets of javadoc:
 </p>
-
 <ul>
-<li><a href="jdbc3/index.html">JDBC2/JDBC3 Public API</a> - Consult
+<li><a href="javadoc/jdbc3/index.html">JDBC 2.1 / JDBC 3.0 Public API</a> - 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).</li>
-<li><a href="jdbc4/index.html">JDBC4 Public API</a> - Consult this
+application runs with the CDC/Foundation Profile (JSR-169).</li>
+<li><a href="javadoc/jdbc4/index.html">JDBC 4.0 Public API</a> - Consult this
 javadoc if your application runs on Java SE 6.</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/html/adminguide/adminguide-single.html">[HTML Book]</a> <a href="docs/pdf/adminguide/adminguide.pdf">[PDF]</a>.
+</p>
+<p>
+Information on how to tune Derby for your specific needs can be found in <a href="docs/html/tuning/index.html">Tuning Derby</a> <a href="docs/html/tuning/tuning-single.html">[HTML Book]</a> <a href="docs/pdf/tuning/tuningderby.pdf">[PDF]</a>. This guide includes a reference to the properties which influence Derby's behavior as well as providing performance tips for certain situations.
+</p>
+<br/>
+<a name="resources"/><h3>More Resources</h3>
+<p>
+If you are looking for more resources on how to use Derby in your application or integrate Derby into a specific environment, please see:
+</p>
+<ul>
+  <li><a href="http://db.apache.org/derby/">The Apache Derby website</a></li>
+  <li><a href="http://wiki.apache.org/db-derby/">The Apache Derby wiki</a></li>
+  <li><a href="http://db.apache.org/derby/integrate/index.html">The Apache Derby resources page</a></li>
+</ul>
+<p>
+Thank you for your interest in Derby!
+</p>
 </body>
 </html>

Modified: db/derby/code/branches/10.2/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/tools/release/build.xml?rev=433817&r1=433816&r2=433817&view=diff
==============================================================================
--- db/derby/code/branches/10.2/tools/release/build.xml (original)
+++ db/derby/code/branches/10.2/tools/release/build.xml Tue Aug 22 17:46:50 2006
@@ -74,6 +74,7 @@
       <!-- top-level -->
       <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
                   prefix="${derby.bin}/"/>
+      <zipfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
       <zipfileset dir="${basedir}/bin" prefix="${derby.bin}/bin" includes="*"/>
       <!-- demo -->
@@ -95,7 +96,7 @@
                   prefix="${derby.bin}/demo/programs/workingwithderby"/>
 
       <!-- docs -->
-      <zipfileset dir="${docs.out}" includes="**/*.html"
+      <zipfileset dir="${docs.out}" includes="**/*.html,**/*.jpg,**/*.gif"
                   prefix="${derby.bin}/docs/html"/>
       <zipfileset dir="${docs.out}" includes="**/*.pdf"
                   prefix="${derby.bin}/docs/pdf"/>
@@ -122,6 +123,7 @@
       <!-- top-level -->
       <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
                   prefix="${derby.bin}/"/>
+      <tarfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
       <tarfileset dir="${basedir}/bin" prefix="${derby.bin}/bin" includes="*"/>
       <!-- demo -->
@@ -142,9 +144,9 @@
       <tarfileset dir="${basedir}/classes" includes="Wwd*.class"
                   prefix="${derby.bin}/demo/programs/workingwithderby"/>
       <!-- docs -->
-      <tarfileset dir="${docs.out}" includes="**/*.html"
+      <tarfileset dir="${docs.out}" includes="**/*.html,**/*.jpg,**/*.gif"
 		          prefix="${derby.bin}/docs/html"/>
-	  <tarfileset dir="${docs.out}" includes="**/*.pdf"
+      <tarfileset dir="${docs.out}" includes="**/*.pdf"
 	              prefix="${derby.bin}/docs/pdf"/>
       <!-- frameworks -->
       <tarfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks" includes="**/*.html"/>