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 2005/04/25 21:28:18 UTC
svn commit: r164629 - in /incubator/derby/code/trunk/java/demo: ./
nserverdemo/ simple/
Author: fuzzylogic
Date: Mon Apr 25 12:28:17 2005
New Revision: 164629
URL: http://svn.apache.org/viewcvs?rev=164629&view=rev
Log:
Derby-233: Fix copyright header in files in java/demo, and cleanup other
IBM/Cloudscape references.
Modified:
incubator/derby/code/trunk/java/demo/demo.html
incubator/derby/code/trunk/java/demo/navbar.html
incubator/derby/code/trunk/java/demo/nserverdemo/NetworkServerUtil.java
incubator/derby/code/trunk/java/demo/nserverdemo/NsSample.java
incubator/derby/code/trunk/java/demo/nserverdemo/NsSampleClientThread.java
incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkClientSample.java
incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkServerSample.java
incubator/derby/code/trunk/java/demo/nserverdemo/nserverdemo.html
incubator/derby/code/trunk/java/demo/nserverdemo/readme.html
incubator/derby/code/trunk/java/demo/nserverdemo/simpleserversample.html
incubator/derby/code/trunk/java/demo/simple/SimpleApp.java
incubator/derby/code/trunk/java/demo/simple/example.html
Modified: incubator/derby/code/trunk/java/demo/demo.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/demo.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/demo.html (original)
+++ incubator/derby/code/trunk/java/demo/demo.html Mon Apr 25 12:28:17 2005
@@ -6,8 +6,8 @@
</HEAD>
<BODY>
-<H1>Example IBM Cloudscape Programs</H1>
-<p>This directory contains example programs. For a complete description, see <A href="../../doc/pdf/getstart.pdf">Getting Started with IBM Cloudscape</A> and the <A href="../../doc/pdf/server.pdf">IBM Cloudscape Server and Administration Guide</A>.</p>
+<H1>Example Apache Derby Programs</H1>
+<p>This directory contains example programs. For a complete description, see <A href="http://incubator.apache.org/derby/docs/getstart/">Getting Started with Apache Derby</A> and the <A href="http://incubator.apache.org/derby/docs/adminguide/">Apache Derby Server and Administration Guide</A>.</p>
<UL>
<LI><A href="simple/example.html">Simple</A>
<p class="BodyRelative">A very simple JDBC application that boots the driver,
Modified: incubator/derby/code/trunk/java/demo/navbar.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/navbar.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/navbar.html (original)
+++ incubator/derby/code/trunk/java/demo/navbar.html Mon Apr 25 12:28:17 2005
@@ -10,8 +10,7 @@
<p class="NavBar"><a href="demo.html" target="mainPage">Demo home</a></li></p>
<p class="NavBar1"><a href="simple/example.html" target="mainPage">Simple</a></p>
<p class="NavBar1"><a href="nserverdemo/readme.html" target="mainPage">Network Server Sample Programs</a></p>
-<p class="NavBar"><a href="../../index.html" target="_top">Documentation Home</a></p>
-<p class="NavBar"><a href="../../releasenotes.html" target="_top">Release Notes</a></p>
+<p class="NavBar"><a href="http://incubator.apache.org/derby/manuals/index.html" target="_top">Documentation Home</a></p>
</BODY>
</HTML>
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/NetworkServerUtil.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/NetworkServerUtil.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/NetworkServerUtil.java (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/NetworkServerUtil.java Mon Apr 25 12:28:17 2005
@@ -1,9 +1,21 @@
/*
- * (C) Copyright IBM Corp. 2003, 2004.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+
+ Derby - Class nserverdemo.NetworkServerUtil
+
+ Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
package nserverdemo;
@@ -25,10 +37,6 @@
/**
* Class for starting the Derby NetworkServer on a separate Thread.
* This class provides methods to start, and shutdown the server
- *
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
*/
public class NetworkServerUtil {
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/NsSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/NsSample.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/NsSample.java (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/NsSample.java Mon Apr 25 12:28:17 2005
@@ -1,10 +1,23 @@
/*
- * (C) Copyright IBM Corp. 2003.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+
+ Derby - Class nserverdemo.NsSample
+
+ Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
+
package nserverdemo;
@@ -47,11 +60,6 @@
<P>
Please note, a file derby.log is created in the directory you run this program.
This file contains the logging of connections made with the derby network server
-
- <P>
- <I>IBM Corp. reserves the right to change, rename, or
- remove this interface at any time.</I>
-
*/
public class NsSample {
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/NsSampleClientThread.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/NsSampleClientThread.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/NsSampleClientThread.java (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/NsSampleClientThread.java Mon Apr 25 12:28:17 2005
@@ -1,9 +1,21 @@
/*
- * (C) Copyright IBM Corp. 2003.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+
+ Derby - Class nserverdemo.NsSampleClientThread
+
+ Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
package nserverdemo;
@@ -54,9 +66,6 @@
* It includes
* getting a connection to the database, creating and loading of schema,
* preparing and execution of SQL statements (insert, select, update, delete )
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
*/
class NsSampleWork {
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkClientSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkClientSample.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkClientSample.java (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkClientSample.java Mon Apr 25 12:28:17 2005
@@ -1,9 +1,21 @@
-/*
- * (C) Copyright IBM Corp. 2003.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+/*
+
+ Derby - Class SimpleNetworkClientSample
+
+ Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
import java.sql.*;
@@ -29,10 +41,6 @@
* and running.
* <P>
* Usage: java SimpleNetworkClientSample
- *
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
*
*/
public class SimpleNetworkClientSample
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkServerSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkServerSample.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkServerSample.java (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/SimpleNetworkServerSample.java Mon Apr 25 12:28:17 2005
@@ -1,9 +1,21 @@
-/*
- * (C) Copyright IBM Corp. 2003, 2004.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+/*
+
+ Derby - Class SimpleNetworkServerSample
+
+ Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
import java.sql.*;
@@ -41,10 +53,6 @@
*
* <P>
* Usage: java SimpleNetworkServerSample
- *
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
*
*/
public class SimpleNetworkServerSample
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/nserverdemo.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/nserverdemo.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/nserverdemo.html (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/nserverdemo.html Mon Apr 25 12:28:17 2005
@@ -1,17 +1,17 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
-<TITLE>Cloudscape Network Server sample program</TITLE>
+<TITLE>Derby Network Server sample program</TITLE>
<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
</HEAD>
<BODY>
-<H2><A name=Top_Of_Page></A><A name=nsrun></A><A name=nssample></A>Cloudscape
+<H2><A name=Top_Of_Page></A><A name=nsrun></A><A name=nssample></A>Derby
Network Server sample program</H2>
<P>The Network Server sample demo program (NsSample) is a simple JDBC application that
-interacts with the Cloudscape Network Server. The program:</P>
+interacts with the Derby Network Server. The program:</P>
<UL>
- <LI>starts the Cloudscape Network Server
- <LI>checks if the Cloudscape Network Server is running
+ <LI>starts the Derby Network Server
+ <LI>checks if the Derby Network Server is running
<LI>loads the DB2 JDBC Universal Driver
<LI>creates the database '<tt>NsSampledb</tt>' if not already created
<LI>checks to see if the schema is already created, and if not,
@@ -23,17 +23,17 @@
<LI>has each of the clients perform DML operations (select, insert, delete, update)
using JDBC calls, in particular one client opens an embedded connection to
perform database operations while the other client opens a client connection
- to the Cloudscape Network Server to perform database operations.
+ to the Derby Network Server to perform database operations.
<LI>waits for the client threads to finish the tasks
- <LI>shuts down the Cloudscape Network Server at the end of the demo </LI></UL>
+ <LI>shuts down the Derby Network Server at the end of the demo </LI></UL>
<P>The following files should be installed in the <SPAN
-class=italic>%CLOUDSCAPE_INSTALL%</SPAN><TT>\demo\programs\nserverdemo\</TT> directory in
+class=italic>%DERBY_INSTALL%</SPAN><TT>\demo\programs\nserverdemo\</TT> directory in
order to run the sample program:</P>
<UL>
<LI><TT>NsSample.java</tt><br>
This is the entry point into the demo application. The program starts up two clients. One client opens an embedded
connection to perform database operations while the other client opens a client
-connection to the Cloudscape Network Server to perform database operations. This program provides the following constants that
+connection to the Derby Network Server to perform database operations. This program provides the following constants that
can be changed to modify the sample demo:
<UL>
@@ -61,7 +61,7 @@
</UL>
</li>
<LI><tt>NetworkServerUtil.java</tt><br>
-This file contains helper methods to start the Cloudscape Network Server and to shutdown the server.
+This file contains helper methods to start the Derby Network Server and to shutdown the server.
</li>
<LI>Compiled class files:
<UL>
@@ -75,27 +75,27 @@
<H2>Running the Network Server demo program</H2>
-<P>To run the Cloudscape Network Server demonstration program:</P>
+<P>To run the Derby Network Server demonstration program:</P>
<OL>
<LI>Open a command prompt and change directories to the <SPAN
- class=italic>%CLOUDSCAPE_INSTALL%</SPAN><tt>\demo\programs\</tt> directory, where <SPAN
- class=italic>%CLOUDSCAPE_INSTALL%</SPAN> is the directory where you installed Cloudscape.
+ class=italic>%DERBY_INSTALL%</SPAN><tt>\demo\programs\</tt> directory, where <SPAN
+ class=italic>%DERBY_INSTALL%</SPAN> is the directory where you installed Derby.
<LI>Set the CLASSPATH to the current directory (".") and also include the following
- jar files in order to use the Cloudscape Network Server and the DB2 JDBC Universal Driver.
+ jar files in order to use the Derby Network Server and the DB2 JDBC Universal Driver.
<ul>
-<li><tt>derbynet.jar</tt><br>The Network Server jar file. It must be in your CLASSPATH to use any of the Cloudscape Network
+<li><tt>derbynet.jar</tt><br>The Network Server jar file. It must be in your CLASSPATH to use any of the Derby Network
Server functions.</li>
<li><tt>db2jcc.jar</tt><br>This jar file must be in your CLASSPATH to use the
DB2 JDBC Universal Driver.</li>
<li><tt>db2jcc_license_c.jar</tt><br>This jar file is the license file for the Universal
Driver.</li>
-<li><tt>derby.jar</tt><br>The Cloudscape database engine jar file.</li>
+<li><tt>derby.jar</tt><br>The Derby database engine jar file.</li>
</ul>
</LI>
-<li>Test the CLASSPATH settings by running the following java command:<pre>java org.apache.derby.tools.sysinfo</pre>This command will show the Cloudscape jar files that are in the CLASSPATH as well as
+<li>Test the CLASSPATH settings by running the following java command:<pre>java org.apache.derby.tools.sysinfo</pre>This command will show the Derby jar files that are in the CLASSPATH as well as
the DB2 JDBC Universal Driver along with their respective versions.</li>
<li>Once you have set up your environment correctly, execute the application from the <br> <SPAN
- class=italic>%CLOUDSCAPE_INSTALL%</SPAN><tt>\demo\programs\</tt> directory:<br>
+ class=italic>%DERBY_INSTALL%</SPAN><tt>\demo\programs\</tt> directory:<br>
<pre>java nserverdemo.NsSample</pre>
</li>
</OL>
@@ -149,7 +149,7 @@
<UL>
<LI><A name=Bot_Of_Page></A><tt>NSSampledb</tt><br>This directory makes up the
NSSampledb database.</li>
- <LI><tt>derby.log</tt><br>This log file contains Cloudscape progress and error messages.</li>
+ <LI><tt>derby.log</tt><br>This log file contains Derby progress and error messages.</li>
</ul>
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/readme.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/readme.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/readme.html (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/readme.html Mon Apr 25 12:28:17 2005
@@ -9,13 +9,13 @@
<H1>Overview</H1>
<p>The following example scenarios show you how to obtain an <em class="Emphasis">embedded connection</em> and <em class="Emphasis">client connections</em> using the Network Server to connect to the same database.</p>
-<p>An embedded connection is a connection to a database that is booted in the same JVM as the application. This connection can be obtained after the Cloudscape Embedded driver is booted. The URL prefix is jdbc:derby:</p>
+<p>An embedded connection is a connection to a database that is booted in the same JVM as the application. This connection can be obtained after the Derby Embedded driver is booted. The URL prefix is jdbc:derby:</p>
<p>Client applications that require a database connection across the network use the network server protocol (DRDA) to connect to the Network Server. This type of connection is referred to as a client connection. The URL prefix is jdbc:derby:net:</p>
<UL>
</LI>
<LI><p class="BodyRelative">First scenario: <A href="simpleserversample.html">Simple Network Server Sample</A></p>
- <p class="BodyRelative">This example uses two programs to illustrate how a typical client program that starts up in its own JVM can connect to the Network Server that the server program starts. The client program (SimpleNetworkClientSample) and the server program (SimpleNetworkServerSample) each run in their own (different) JVMs. The example shows the Cloudscape jar files that are needed at the client side and server side to use the Network Server. The SimpleNetworkClientSample program also shows how to use the DriverManger or a DataSource to obtain client connections.</p></LI></LI>
+ <p class="BodyRelative">This example uses two programs to illustrate how a typical client program that starts up in its own JVM can connect to the Network Server that the server program starts. The client program (SimpleNetworkClientSample) and the server program (SimpleNetworkServerSample) each run in their own (different) JVMs. The example shows the Derby jar files that are needed at the client side and server side to use the Network Server. The SimpleNetworkClientSample program also shows how to use the DriverManger or a DataSource to obtain client connections.</p></LI></LI>
</LI>
<LI><p class="BodyRelative">Second scenario: <A href="nserverdemo.html">Network Server Demo </A></p>
<p class="BodyRelative">This example program (NsSample) starts the network server and shows how to obtain client and embedded connections using the Network Server to connect to the same database, all in one JVM.</p></LI></LI>
Modified: incubator/derby/code/trunk/java/demo/nserverdemo/simpleserversample.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/nserverdemo/simpleserversample.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/nserverdemo/simpleserversample.html (original)
+++ incubator/derby/code/trunk/java/demo/nserverdemo/simpleserversample.html Mon Apr 25 12:28:17 2005
@@ -3,12 +3,12 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Cloudscape Network Server Simple sample program</title>
+<title>Derby Network Server Simple sample program</title>
</head>
<body>
-<h2>Simple Cloudscape Network Server Example</h2>
+<h2>Simple Derby Network Server Example</h2>
<h2>Overview</h2>
@@ -29,11 +29,11 @@
client programs when interacting with the Network Server.</p>
<p>SimpleNetworkServerSample.java:
-This program starts the Cloudscape Network Server as well as the embedded
+This program starts the Derby Network Server as well as the embedded
driver and waits for clients to connect.</p>
<p>SimpleNetworkClientSample.java:
-This is the client program that interacts with the Cloudscape Network Server
+This is the client program that interacts with the Derby Network Server
from another JVM.</p>
<h3>SimpleNetworkServerSample program</h3>
@@ -41,18 +41,18 @@
<p>In particular, this program:</p>
<ul>
- <li>starts the Cloudscape Network Server using a property and also loads the embedded driver</li>
- <li>checks if the Cloudscape Network Server is up and running</li>
+ <li>starts the Derby Network Server using a property and also loads the embedded driver</li>
+ <li>checks if the Derby Network Server is up and running</li>
<li>creates the database 'NSSimpleDB' if not already created </li>
<li>obtains an embedded database connection</li>
<li>tests the database connection by executing a sample query</li>
<li>allows for client connections to connect to the server until the user decides to stop the server and exit the program</li>
<li>closes the connection</li>
- <li>shuts down the Cloudscape
+ <li>shuts down the Derby
Network Server before exiting the program.</li>
</ul>
-<p>The following files should be installed in the <font style=italic>%CLOUDSCAPE_INSTALL%</font><tt><span>\demo\programs\nserverdemo\</span></tt> directory in
+<p>The following files should be installed in the <font style=italic>%DERBY_INSTALL%</font><tt><span>\demo\programs\nserverdemo\</span></tt> directory in
order to run this sample program:</p>
<ul>
@@ -68,26 +68,26 @@
<h2>How to run the SimpleNetworkServerSample program</h2>
-<p>To run this simple Cloudscape Network Server sample program:</p>
+<p>To run this simple Derby Network Server sample program:</p>
<ol>
- <li>Open a command prompt and change directories to the <span class=italic>%CLOUDSCAPE_INSTALL%</span>\demo\programs\nserverdemo
- directory, where <span class=italic>%CLOUDSCAPE_INSTALL%</span> is the directory
- where you installed Cloudscape.</li>
+ <li>Open a command prompt and change directories to the <span class=italic>%DERBY_INSTALL%</span>\demo\programs\nserverdemo
+ directory, where <span class=italic>%DERBY_INSTALL%</span> is the directory
+ where you installed Derby.</li>
<li>Set the CLASSPATH to include the following jar files in order to run this
program.</li>
<ul><li>the current directory (".")</li>
<li><tt>derbynet.jar</tt>: <BR>The Network Server jar file. It must be in your CLASSPATH since we start the Network Server in this program.</li>
-<li><tt>derby.jar</tt>: <BR>The Cloudscape database engine jar file.</li>
+<li><tt>derby.jar</tt>: <BR>The Derby database engine jar file.</li>
</ul>
<li>Test the CLASSPATH settings by running the following java command:
<pre>java org.apache.derby.tools.sysinfo</pre>
-<p>This command will show the Cloudscape jar files that are in the CLASSPATH. </p></li>
+<p>This command will show the Derby jar files that are in the CLASSPATH. </p></li>
-<li>Once you have set up your environment correctly, execute the application from the <br><span class=italic>%CLOUDSCAPE_INSTALL%</span>\demo\programs\nserverdemo directory:
+<li>Once you have set up your environment correctly, execute the application from the <br><span class=italic>%DERBY_INSTALL%</span>\demo\programs\nserverdemo directory:
<pre>java SimpleNetworkServerSample</pre>
</li></ol>
@@ -101,7 +101,7 @@
This directory makes up the <span>NSSimpleDB</span> database.
</li>
<li><tt>derby.log</tt><br>
-This log file contains Cloudscape progress and error messages.
+This log file contains Derby progress and error messages.
</li></ul>
@@ -119,7 +119,7 @@
<li>closes the connections and then exits the program.</li>
</ul>
-<p>The following files should be installed in the <span class=italic>%CLOUDSCAPE_INSTALL%</span><tt>\demo\programs\nserverdemo\</tt> directory in order to run this sample program:</p>
+<p>The following files should be installed in the <span class=italic>%DERBY_INSTALL%</span><tt>\demo\programs\nserverdemo\</tt> directory in order to run this sample program:</p>
<ul>
<li>Source file: <br><tt>SimpleNetworkClientSample.java</tt></li>
<li>Compiled class file: <br><tt>SimpleNetworkClientSample.class</tt></li>
@@ -130,15 +130,15 @@
<p>To connect to the Network Server that has been started as part of the SimpleNetworkServerSample program:</p>
<ol>
- <li>Open a command prompt and change directories to the <span class=italic>%CLOUDSCAPE_INSTALL%</span><tt>\demo\programs\nserverdemo</tt> directory, where <span class=italic>%CLOUDSCAPE_INSTALL%</span> is the directory where you installed Cloudscape.</li>
- <li>Clients of Cloudscape Network Server only need the following jar files in the CLASSPATH in order to connect to the Network Server.<span> </span>Set the CLASSPATH to include the following jar files:
+ <li>Open a command prompt and change directories to the <span class=italic>%DERBY_INSTALL%</span><tt>\demo\programs\nserverdemo</tt> directory, where <span class=italic>%DERBY_INSTALL%</span> is the directory where you installed Derby.</li>
+ <li>Clients of Derby Network Server only need the following jar files in the CLASSPATH in order to connect to the Network Server.<span> </span>Set the CLASSPATH to include the following jar files:
<ul>
<li>the current directory (".")</li>
<li><tt>db2jcc.jar</tt><br>This jar file must be in your CLASSPATH to use the DB2 JDBC Universal Driver.</li>
- <li><tt>db2jcc_license_c.jar</tt><br>This jar file is the license file for the Universal Driver for Cloudscape.</li>
+ <li><tt>db2jcc_license_c.jar</tt><br>This jar file is the license file for the Universal Driver for Derby.</li>
</ul></li>
<li>Once you have set up your environment correctly, execute the
-application from the <br><span class=italic>%CLOUDSCAPE_INSTALL%</span><tt>\demo\programs\nserverdemo\</tt> directory:
+application from the <br><span class=italic>%DERBY_INSTALL%</span><tt>\demo\programs\nserverdemo\</tt> directory:
<pre><tt>java SimpleNetworkClientSample</tt></pre>
</li>
</ol>
Modified: incubator/derby/code/trunk/java/demo/simple/SimpleApp.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/simple/SimpleApp.java?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/simple/SimpleApp.java (original)
+++ incubator/derby/code/trunk/java/demo/simple/SimpleApp.java Mon Apr 25 12:28:17 2005
@@ -1,12 +1,24 @@
-import java.sql.Connection;
-
/*
- * (C) Copyright IBM Corp. 2001, 2004.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+
+ Derby - Class SimpleApp
+
+ Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+
*/
+
+import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/derby/code/trunk/java/demo/simple/example.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/demo/simple/example.html?rev=164629&r1=164628&r2=164629&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/demo/simple/example.html (original)
+++ incubator/derby/code/trunk/java/demo/simple/example.html Mon Apr 25 12:28:17 2005
@@ -51,8 +51,8 @@
<h2 class="Heading2"><a name="820067"> </a>Overview
</h2>
<p class="Body">
- <a name="820012"> </a>This example program is a very minimal JDBC application. JDBC is the primary API for interacting with IBM Cloudscape. This program accomplishes the following tasks:
-</p><ul class="Normal"> <li class="Normal"><a name="817266"> </a>starts up the Cloudscape engine, if necessary
+ <a name="820012"> </a>This example program is a very minimal JDBC application. JDBC is the primary API for interacting with Apache Derby. This program accomplishes the following tasks:
+</p><ul class="Normal"> <li class="Normal"><a name="817266"> </a>starts up the Derby engine, if necessary
<li class="Normal"><a name="817275"> </a>creates and connects to a database
<li class="Normal"><a name="817276"> </a>creates a table
<li class="Normal"><a name="817277"> </a>inserts data
@@ -60,10 +60,10 @@
<li class="Normal"><a name="817279"> </a>selects data
<li class="Normal"><a name="817280"> </a>drops a table
<li class="Normal"><a name="817281"> </a>disconnects
- <li class="Normal"><a name="817282"> </a>shuts down Cloudscape, if necessary
+ <li class="Normal"><a name="817282"> </a>shuts down Derby, if necessary
</ul>
<p class="Body">
- <a name="817267"> </a>The application runs in an embedded environment. This is the simplest Cloudscape environment. The application starts up an instance of Cloudscape within the current JVM and shuts down the instance before it completes. No network access is involved. In an embedded environment, only one application at a time can access a database.
+ <a name="817267"> </a>The application runs in an embedded environment. This is the simplest Derby environment. The application starts up an instance of Derby within the current JVM and shuts down the instance before it completes. No network access is involved. In an embedded environment, only one application at a time can access a database.
</p><h2 class="Heading2"><a name="816689"> </a>What's Included?
</h2>
<p class="Body">
@@ -81,7 +81,7 @@
<p class="BodyRelative">
- <a name="816697"> </a>Source code for the example program that starts up Cloudscape, creates a database, does some inserts and updates, and then shuts down Cloudscape. <em class="Emphasis">Examine this file to see how the application behaves in the various environments</em>.
+ <a name="816697"> </a>Source code for the example program that starts up Derby, creates a database, does some inserts and updates, and then shuts down Derby. <em class="Emphasis">Examine this file to see how the application behaves in the various environments</em>.
</p>
<li class="Normal"><a name="816699"> </a><em class="fileName">
<a href="derby.properties" target="_top">derby.properties</a></em>
@@ -89,7 +89,7 @@
<p class="BodyRelative">
- <a name="816700"> </a>Properties file for the Cloudscape system.
+ <a name="816700"> </a>Properties file for the Derby system.
</p>
<li class="Normal"><a name="816701"> </a><em class="fileName">SimpleApp.class</em>
@@ -106,7 +106,7 @@
<p class="BodyRelative">
- <a name="816707"> </a>The directory that makes up the <em class="fileName">derbyDB</em> database. You must not modify anything in this directory, or you will corrupt the database. The directory was created when the application connected with Cloudscape, using the attribute <em class="Emphasis">create=true</em> in the database connection URL. The database name, <em class="Emphasis">derbyDB</em>, was also set in the database connection URL.
+ <a name="816707"> </a>The directory that makes up the <em class="fileName">derbyDB</em> database. You must not modify anything in this directory, or you will corrupt the database. The directory was created when the application connected with Derby, using the attribute <em class="Emphasis">create=true</em> in the database connection URL. The database name, <em class="Emphasis">derbyDB</em>, was also set in the database connection URL.
</p>
<li class="Normal"><a name="816712"> </a><em class="fileName">derbyDB\log</em> (directory)
@@ -134,13 +134,13 @@
<p class="BodyRelative">
- <a name="816720"> </a>The log file with Cloudscape progress and error messages.
+ <a name="816720"> </a>The log file with Derby progress and error messages.
</p>
</ul>
<h2 class="Heading2"><a name="816722"> </a>How to Run This Sample Application in an Embedded Environment
</h2>
<ol type="1"> <li class="Normal" value="1"><a name="816724"> </a>Open a command window and change directories to the <em class="fileName">/demo/programs/simple</em> directory.
- <li class="Normal" value="2"><a name="816726"> </a>If you haven't set it already on a system-wide basis, set the CLOUDSCAPE_INSTALL environment variable to the location of the directory where you installed the Cloudscape software in the current command window.
+ <li class="Normal" value="2"><a name="816726"> </a>If you haven't set it already on a system-wide basis, set the DERBY_INSTALL environment variable to the location of the directory where you installed the Derby software in the current command window.
<li class="Normal" value="3"><a name="819207"> </a>In the command window, set CLASSPATH as follows:<p><table border="4" cellspacing="0" cellpadding="5" bgcolor="#FAF0E6">
<caption class="TableTitle"></caption>
<tr valign="bottom">
@@ -148,10 +148,10 @@
<th><a name="819184"> </a><p class="CellHeading">Path to Library or Directory</p></th>
</tr>
<tr valign="top">
- <td class="DefaultTable"><a name="821049"> </a><p class="CellBody">main Cloudscape library for the product:</p>
+ <td class="DefaultTable"><a name="821049"> </a><p class="CellBody">main Derby library for the product:</p>
<a name="819190"> </a><p class="CellBody"><em class="fileName">derby.jar</em></p>
</td>
- <td class="DefaultTable"><a name="819195"> </a><p class="CellBody"><em class="fileName">%CLOUDSCAPE_INSTALL%/lib/derby.jar</em></p>
+ <td class="DefaultTable"><a name="819195"> </a><p class="CellBody"><em class="fileName">%DERBY_INSTALL%/lib/derby.jar</em></p>
</td>
</tr>
<tr valign="top">
@@ -174,14 +174,14 @@
<td class="BoxTable"><h3 class="BoxHead">
<a name="819210"> </a>A Note on Setting Class Path for an Embedded Environment
</h3>
-<a name="819214"> </a><p class="CellBody">Cloudscape provides a script to help you get started setting class path in <br> <em class="fileName">%CLOUDSCAPE_INSTALL%/frameworks/embedded/bin</em>. This script is called<em class="fileName"> setEmbeddedCP </em>and comes in two flavors: one for Windows environment (this file ends with <em class="fileName">.bat</em>) and one for UNIX environments (this file ends with <em class="fileName">.ksh</em>). For users working in those environments, copying the commands in this file will help you get started setting the class path. </p>
+<a name="819214"> </a><p class="CellBody">Derby provides a script to help you get started setting class path in <br> <em class="fileName">%DERBY_INSTALL%/frameworks/embedded/bin</em>. This script is called<em class="fileName"> setEmbeddedCP </em>and comes in two flavors: one for Windows environment (this file ends with <em class="fileName">.bat</em>) and one for UNIX environments (this file ends with <em class="fileName">.ksh</em>). For users working in those environments, copying the commands in this file will help you get started setting the class path. </p>
</td>
</tr>
</table>
</p>
</p>
- <li class="Normal" value="4"><a name="819222"> </a>Run Cloudscape's utility for testing the class path for an embedded environment. You will provide the arguments <em class="Emphasis">embedded</em> to indicate an embedded environment and <em class="Emphasis">SimpleApp.class</em> to test for the presence of the <em class="javaObject">SimpleApp</em> class.
+ <li class="Normal" value="4"><a name="819222"> </a>Run Derby's utility for testing the class path for an embedded environment. You will provide the arguments <em class="Emphasis">embedded</em> to indicate an embedded environment and <em class="Emphasis">SimpleApp.class</em> to test for the presence of the <em class="javaObject">SimpleApp</em> class.
@@ -201,20 +201,20 @@
<a name="820871"> </a>If your environment is set up correctly, the utility shows output indicating success. It looks like this:
</p>
<p class="OutputRelative"><a name="820884"> </a>FOUND IN CLASS PATH:</p>
-<p class="OutputRelative"><a name="820886"> </a> Cloudscape embedded engine library (derby.jar)</p>
+<p class="OutputRelative"><a name="820886"> </a> Derby embedded engine library (derby.jar)</p>
<p class="OutputRelative"><a name="820887"> </a></p>
<p class="OutputRelative"><a name="820893"> </a> user-specified class (SimpleApp)</p>
-<p class="OutputRelative"><a name="820896"> </a>SUCCESS: All Cloudscape-Related classes for embedded environment found in class path.</p>
+<p class="OutputRelative"><a name="820896"> </a>SUCCESS: All Derby-Related classes for embedded environment found in class path.</p>
<p class="BodyRelative">
<a name="820878"> </a>If something is missing from your class path environment, the utility indicates what is missing. For example, if you neglected to add the directory containing the SimpleApp class to your class path, the utility would indicate as such:
</p>
-<p class="OutputRelative"><a name="820925"> </a>Testing for presence of Cloudscape-related libraries for embedded environment.</p>
+<p class="OutputRelative"><a name="820925"> </a>Testing for presence of Derby-related libraries for embedded environment.</p>
<p class="OutputRelative"><a name="820927"> </a>FOUND IN CLASS PATH:</p>
<p class="OutputRelative"><a name="820956"> </a></p>
-<p class="OutputRelative"><a name="820929"> </a> Cloudscape embedded engine library (derby.jar)</p>
+<p class="OutputRelative"><a name="820929"> </a> Derby embedded engine library (derby.jar)</p>
<p class="OutputRelative"><a name="820934"> </a></p>
<p class="OutputRelative"><a name="820937"> </a>NOT FOUND IN CLASS PATH:</p>
<p class="OutputRelative"><a name="820958"> </a> user-specified class (SimpleApp)</p>
@@ -252,14 +252,8 @@
<a name="818289"> </a>SimpleApp finished
<br>
</p>
-<a href="http://www.ibm.com" target="_top"><img src="../../images/IBMLOGO.gif" border="0" width="180" vspace="12"></a><br>
-
-<p class="NavBarVersion">IBM Cloudscape Version 10</p>
-
-<address class="Footer"><br>
-Copyright(c) INTERNATIONAL BUSINESS MACHINES CORPORATION, 1999, 2004 ALL RIGHTS RESERVED.
-</address>
+<p class="NavBarVersion">Apache Derby Version 10</p>
</body>
</html>