You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-dev@db.apache.org by scott hutinger <s-...@wiu.edu> on 2004/12/01 16:17:35 UTC

[PATCH]frameworks CLOUDSCAPE to DERBY

I didn't add a jira issue, and think CLOUDSCAPE should be changed to 
DERBY, which is in the diff file attached.  Also a couple IBM's 
Cloudscape changed to Derby's.  Probably verify the html files are 
correct in not adding Apache Derby's, but just Derby's.

scott

Re: svn native eol

Posted by Daniel John Debrunner <dj...@debrunners.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

scott hutinger wrote:
> I changed all of the framework files to native eol, and it generates a
> LARGER patch file (diff) of course; removing ^M at the end, which means
> the entire file is patched.
>
> -rw-rw-r--  1 srh  srh    70121 Dec  1 12:35 /home/srh/derby1.patch
> -- with native
> -rw-rw-r--  1 srh  srh    30131 Dec  1 09:00 /home/srh/derby.diff
>     -- without native
>
> I don't think we want patch files that modify an entire file, as it
> really makes changes hard to find.

I think the correct approach is to set the property on the same type of
system as the files were originally added into svn from. In this case
only the propery is changed, the contents of the file remains unchanged
as it already has the correct endings. This is what I did for the .java
files after the original contribution.

I also made sure that setting the property was the only change, not to
mix it with other unrelated diffs.

Dan.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFBrj5WIv0S4qsbfuQRAsk1AKDVYmr700KV1gOTl0aDkXPv2QxU4QCfagdF
sFVx6iKYw8SfuELcJnsJEh4=
=G0gy
-----END PGP SIGNATURE-----


svn native eol

Posted by scott hutinger <s-...@wiu.edu>.
I changed all of the framework files to native eol, and it generates a 
LARGER patch file (diff) of course; removing ^M at the end, which means 
the entire file is patched.

-rw-rw-r--  1 srh  srh    70121 Dec  1 12:35 /home/srh/derby1.patch      
-- with native
-rw-rw-r--  1 srh  srh    30131 Dec  1 09:00 /home/srh/derby.diff      
     -- without native

I don't think we want patch files that modify an entire file, as it 
really makes changes hard to find.  An alternate might be to add 
patches, then update the entire svn site to native, and log that change 
as native eol or something?  Or can the site be changed to native, and a 
current diff be re-diffed with native being used?  One would guess that 
possibly the current patches might need to dos2unix the current files 
that are yet to be patched (on a unix/linux machine).

The question is, once the svn site goes full native, then the files 
checked in already are native, or are they still as they were checked 
in?  I know...read the docs...
But, the point is, the diff with eol native will cause total file(s) 
replacement currently.

thanks,
scott



Re: [PATCH]frameworks CLOUDSCAPE to DERBY

Posted by scott hutinger <s-...@wiu.edu>.
Samuel Andrew McIntyre wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
>
> On Dec 1, 2004, at 2:39 PM, sissonj@insession.com wrote:
>
>> It might be worth adding a comment to the related issue
>> http://nagoya.apache.org/jira/browse/DERBY-55
>
>
> Agreed. Scott could you please attach your patch to DERBY-55? I will 
> be glad to submit it, but I can't get the patch to apply to either of 
> my working copies, one on Windows, one on Mac OS X.
>
> It is interesting to note, though, that the files have the correct 
> line endings on both machines, without svn:eol-style native being set.
>
> andrew
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.4 (Darwin)
>
> iD8DBQFBrkq7DfB0XauCH7wRAta8AJ9lUX/OSiDVtvSGWEr4jTDmZhygqQCfcZaV
> pRXIOvMwhcb2PF5iLFU1cyo=
> =kytn
> -----END PGP SIGNATURE-----
>
It looks like sending the patch via an attachment stripped the trailing 
^M's from the patch file.  I did a diff of the original and the diff 
from the e-mail.  I read somewhere on the website about enigmail, but 
didn't see anything about ^M's being stripped.  I normally don't send ^M 
patches :-)  I'll try to give them better names in the future.

I attached the file to DERBY-55 as a .gz compressed file so nothing 
would strip the ^M's.

thanks,
scott

Re: [PATCH]frameworks CLOUDSCAPE to DERBY

Posted by Samuel Andrew McIntyre <fu...@nonintuitive.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


On Dec 1, 2004, at 2:39 PM, sissonj@insession.com wrote:

> It might be worth adding a comment to the related issue
> http://nagoya.apache.org/jira/browse/DERBY-55

Agreed. Scott could you please attach your patch to DERBY-55? I will be 
glad to submit it, but I can't get the patch to apply to either of my 
working copies, one on Windows, one on Mac OS X.

It is interesting to note, though, that the files have the correct line 
endings on both machines, without svn:eol-style native being set.

andrew
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFBrkq7DfB0XauCH7wRAta8AJ9lUX/OSiDVtvSGWEr4jTDmZhygqQCfcZaV
pRXIOvMwhcb2PF5iLFU1cyo=
=kytn
-----END PGP SIGNATURE-----


Re: [PATCH]frameworks CLOUDSCAPE to DERBY

Posted by si...@insession.com.
Scott,

It might be worth adding a comment to the related issue 
http://nagoya.apache.org/jira/browse/DERBY-55

John



scott hutinger <s-...@wiu.edu> 
02/12/2004 02:17 AM
Please respond to
"Derby Development" <de...@db.apache.org>


To
Derby Development <de...@db.apache.org>
cc

Subject
[PATCH]frameworks CLOUDSCAPE to DERBY






I didn't add a jira issue, and think CLOUDSCAPE should be changed to 
DERBY, which is in the diff file attached.  Also a couple IBM's 
Cloudscape changed to Derby's.  Probably verify the html files are 
correct in not adding Apache Derby's, but just Derby's.

scott
Index: frameworks/readme.html
===================================================================
--- frameworks/readme.html               (revision 109346)
+++ frameworks/readme.html               (working copy)
@@ -1,33 +1,33 @@
 <!doctype html public "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head><META http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1">
-<title>About IBM Cloudscape's Frameworks
+<title>About Derby's Frameworks
 </title>
 <link rel="StyleSheet" href="../demo/csfull.css" type="text/css" 
media="screen">
 </head>
 <body class="SmallFile">
-<h1>About IBM Cloudscape's Frameworks</h1>
-<p><a name="framework"></a>A <em> framework</em> is the environment in 
which Cloudscape runs. The framework in which you run Cloudscape affects 
how you run applications against Cloudscape.</p>
+<h1>About Derby's Frameworks</h1>
+<p><a name="framework"></a>A <em> framework</em> is the environment in 
which Derby runs. The framework in which you run Derby affects how you run 
applications against Derby.</p>
 <p>The <em>frameworks</em> directory contains subdirectories for each 
framework with supporting files. Depending on the framework, the 
subdirectory includes:
 <ul>
                 <li><p><em>bin</em> Subdirectory<br>
-                All subdirectories in this directory contain a 
<em>bin</em> subdirectory that has scripts that serve as examples of how 
to run some of the basic Cloudscape tools and utilities tailored for the 
particular framework. For server frameworks, start and stop scripts are 
also provided.
+                All subdirectories in this directory contain a 
<em>bin</em> subdirectory that has scripts that serve as examples of how 
to run some of the basic Derby tools and utilities tailored for the 
particular framework. For server frameworks, start and stop scripts are 
also provided.
 <br>To use the scripts for a particular framework, modify the scripts as 
necessary and put that framework's <em>bin</em> subdirectory first in your 
path.</p></li>
 </ul>
 <p>For an easy-to-follow example of how to run an application in the two 
frameworks, see the <a href="../demo/programs/simple/example.html">simple 
example</a>.</p>
-<p>For more information about frameworks, see <a 
href="../doc/pdf/getstart.pdf"><em>Getting Started with IBM 
Cloudscape</em></a>.</p>
+<p>For more information about frameworks, see <a 
href="../doc/pdf/getstart.pdf"><em>Getting Started with 
Derby</em></a>.</p>
 <h2><a name="embed">Embedded Framework</a></h2>
-<p>An <em>embedded</em> <a href="#framework">framework</a> is the most 
basic framework. Cloudscape runs embedded in a Java application. When the 
application loads the local JDBC driver, it starts up the Cloudscape 
engine. When the application shuts down, it shuts down the Cloudscape 
engine. Only a single application can access a database at one time.
-<p>The <em>bin</em> subdirectory in <em>frameworks/embedded</em> contains 
scripts for running some of the Cloudscape tools in an embedded 
environment. For working in an embedded environment, put the 
<em>frameworks/embedded/bin</em> subdirectory first in your path.</p>
+<p>An <em>embedded</em> <a href="#framework">framework</a> is the most 
basic framework. Derby runs embedded in a Java application. When the 
application loads the local JDBC driver, it starts up the Derby engine. 
When the application shuts down, it shuts down the Derby engine. Only a 
single application can access a database at one time.
+<p>The <em>bin</em> subdirectory in <em>frameworks/embedded</em> contains 
scripts for running some of the Derby tools in an embedded environment. 
For working in an embedded environment, put the 
<em>frameworks/embedded/bin</em> subdirectory first in your path.</p>
 <h2><a name="server">Server Framework</a></h2>
-<p>A server <a href="#framework">framework</a> is a continuously running 
Java application that allows multiple, remote JDBC applications to connect 
to Cloudscape.
+<p>A server <a href="#framework">framework</a> is a continuously running 
Java application that allows multiple, remote JDBC applications to connect 
to Derby.
 <ul>
-<li><a href="#network">The IBM Cloudscape Network Server framework</a>
+<li><a href="#network">The Derby Network Server framework</a>
 </ul>
-<h3><a name="network">IBM Cloudscape Network Server</a></h3>
-<p>The Cloudscape Network Server is a <a href="#server">server 
framework</a> that comes with Cloudscape. The Cloudscape Network Server 
works with the DB2 JCC JDBC driver; please read the Cloudscape 
documentation on the differences between this driver and the embedded 
driver.
+<h3><a name="network">Derby Network Server</a></h3>
+<p>The Derby Network Server is a <a href="#server">server framework</a> 
that comes with Derby. The Derby Network Server works with the DB2 JCC 
JDBC driver; please read the Derby documentation on the differences 
between this driver and the embedded driver.
 <ul>
-                <li>The subdirectories in this directory contain scripts 
that serve as examples for how to run Cloudscape tools and utilities as 
client applications to Cloudscape running inside the Cloudscape Network 
Server framework. It also contains scripts for starting up the 
framework.</li>
+                <li>The subdirectories in this directory contain scripts 
that serve as examples for how to run Derby tools and utilities as client 
applications to Derby running inside the Derby Network Server framework. 
It also contains scripts for starting up the framework.</li>
 </ul>
 
 </body>
Index: frameworks/NetworkServer/readme.html
===================================================================
--- frameworks/NetworkServer/readme.html                 (revision 109346)
+++ frameworks/NetworkServer/readme.html                 (working copy)
@@ -10,11 +10,11 @@
 
 </SCRIPT>
 
-<title>IBM Cloudscape's Network Server framework
+<title>Derby's Network Server framework
 </title>
 </head>
 <body onload="loadOuterPage()">
-<p><a href="../readme.html#network">IBM Cloudscape's Network Server 
framework</a></p>
+<p><a href="../readme.html#network">Derby's Network Server 
framework</a></p>
 </body>
 </html>
 
Index: frameworks/NetworkServer/bin/dblook.bat
===================================================================
--- frameworks/NetworkServer/bin/dblook.bat              (revision 109346)
+++ frameworks/NetworkServer/bin/dblook.bat              (working copy)
@@ -11,10 +11,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start dblook
Index: frameworks/NetworkServer/bin/startNetworkServer.ksh
===================================================================
--- frameworks/NetworkServer/bin/startNetworkServer.ksh          (revision 
109346)
+++ frameworks/NetworkServer/bin/startNetworkServer.ksh          (working 
copy)
@@ -14,10 +14,10 @@
 # -- start Derby Network Server
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
 }
 
 java org.apache.derby.drda.NetworkServerControl start
Index: frameworks/NetworkServer/bin/setNetworkServerCP.bat
===================================================================
--- frameworks/NetworkServer/bin/setNetworkServerCP.bat          (revision 
109346)
+++ frameworks/NetworkServer/bin/setNetworkServerCP.bat          (working 
copy)
@@ -3,15 +3,15 @@
 @REM -- for use with Derby products in NetworkServer mode
 @REM --
 @REM -- To use this script from other locations, change the 
-@REM -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-@REM -- (set CLOUDSCAPE_INSTALL=C:\derby) instead of the current relative 
path
+@REM -- value assigned to DERBY_INSTALL to be an absolute path 
+@REM -- (set DERBY_INSTALL=C:\derby) instead of the current relative path
 @REM --
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-FOR %%X in ("%CLOUDSCAPE_INSTALL%") DO SET CLOUDSCAPE_INSTALL=%%~sX
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
 
-set 
CLASSPATH=%CLOUDSCAPE_INSTALL%\lib\derby.jar;%CLOUDSCAPE_INSTALL%\lib\derbytools.jar;%CLOUDSCAPE_INSTALL%\lib\derbynet.jar;%CLASSPATH%
+set 
CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%DERBY_INSTALL%\lib\derbynet.jar;%CLASSPATH%
Index: frameworks/NetworkServer/bin/ij.ksh
===================================================================
--- frameworks/NetworkServer/bin/ij.ksh          (revision 109346)
+++ frameworks/NetworkServer/bin/ij.ksh          (working copy)
@@ -11,10 +11,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
 }
 
 export IJ_HOST=localhost
Index: frameworks/NetworkServer/bin/NetworkServerControl.bat
===================================================================
--- frameworks/NetworkServer/bin/NetworkServerControl.bat (revision 
109346)
+++ frameworks/NetworkServer/bin/NetworkServerControl.bat (working copy)
@@ -12,10 +12,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start Derby as a Network server
Index: frameworks/NetworkServer/bin/stopNetworkServer.bat
===================================================================
--- frameworks/NetworkServer/bin/stopNetworkServer.bat           (revision 
109346)
+++ frameworks/NetworkServer/bin/stopNetworkServer.bat           (working 
copy)
@@ -12,10 +12,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
 
 java org.apache.derby.drda.NetworkServerControl shutdown
 
Index: frameworks/NetworkServer/bin/setNetworkClientCP.bat
===================================================================
--- frameworks/NetworkServer/bin/setNetworkClientCP.bat          (revision 
109346)
+++ frameworks/NetworkServer/bin/setNetworkClientCP.bat          (working 
copy)
@@ -3,15 +3,15 @@
 @REM -- for use with Derby products in Network Server mode
 @REM --
 @REM -- To use this script from other locations, change the 
-@REM -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-@REM -- (set CLOUDSCAPE_INSTALL=C:\derby) instead of the current relative 
path
+@REM -- value assigned to DERBY_INSTALL to be an absolute path 
+@REM -- (set DERBY_INSTALL=C:\derby) instead of the current relative path
 @REM --
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-FOR %%X in ("%CLOUDSCAPE_INSTALL%") DO SET CLOUDSCAPE_INSTALL=%%~sX
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
 
-set 
CLASSPATH=%CLOUDSCAPE_INSTALL%\lib\derby.jar;%CLOUDSCAPE_INSTALL%\lib\derbytools.jar;%CLOUDSCAPE_INSTALL%\lib\db2jcc.jar;%CLOUDSCAPE_INSTALL%\lib\db2jcc_license_c.jar;%CLASSPATH%
+set 
CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%DERBY_INSTALL%\lib\db2jcc.jar;%DERBY_INSTALL%\lib\db2jcc_license_c.jar;%CLASSPATH%
Index: frameworks/NetworkServer/bin/dblook.ksh
===================================================================
--- frameworks/NetworkServer/bin/dblook.ksh              (revision 109346)
+++ frameworks/NetworkServer/bin/dblook.ksh              (working copy)
@@ -11,10 +11,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
 }
 
 # ---------------------------------------------------------
Index: frameworks/NetworkServer/bin/sysinfo.bat
===================================================================
--- frameworks/NetworkServer/bin/sysinfo.bat             (revision 109346)
+++ frameworks/NetworkServer/bin/sysinfo.bat             (working copy)
@@ -14,10 +14,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start sysinfo
Index: frameworks/NetworkServer/bin/startNetworkServer.bat
===================================================================
--- frameworks/NetworkServer/bin/startNetworkServer.bat          (revision 
109346)
+++ frameworks/NetworkServer/bin/startNetworkServer.bat          (working 
copy)
@@ -12,10 +12,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start Derby as a Network server
Index: frameworks/NetworkServer/bin/setNetworkServerCP.ksh
===================================================================
--- frameworks/NetworkServer/bin/setNetworkServerCP.ksh          (revision 
109346)
+++ frameworks/NetworkServer/bin/setNetworkServerCP.ksh          (working 
copy)
@@ -3,12 +3,12 @@
 # -- for use with Derby products in NetworkServer mode
 # --
 # -- To use this script from other locations, change the 
-# -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-# -- (export CLOUDSCAPE_INSTALL=/opt/derby) instead of the current 
relative path
+# -- value assigned to DERBY_INSTALL to be an absolute path 
+# -- (export DERBY_INSTALL=/opt/derby) instead of the current relative 
path
 # --
 # -- This file for use on Unix ksh systems
 # -- 
 # ---------------------------------------------------------
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
-export 
CLASSPATH="${CLOUDSCAPE_INSTALL}/lib/derby.jar:${CLOUDSCAPE_INSTALL}/lib/derbytools.jar:${CLOUDSCAPE_INSTALL}/lib/derbynet.jar:${CLASSPATH}"
+export 
CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${DERBY_INSTALL}/lib/derbynet.jar:${CLASSPATH}"
Index: frameworks/NetworkServer/bin/NetworkServerControl.ksh
===================================================================
--- frameworks/NetworkServer/bin/NetworkServerControl.ksh (revision 
109346)
+++ frameworks/NetworkServer/bin/NetworkServerControl.ksh (working copy)
@@ -11,10 +11,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
 }
 
 # ---------------------------------------------------------
Index: frameworks/NetworkServer/bin/ij.bat
===================================================================
--- frameworks/NetworkServer/bin/ij.bat          (revision 109346)
+++ frameworks/NetworkServer/bin/ij.bat          (working copy)
@@ -14,10 +14,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
 
 set IJ_HOST=localhost
 set IJ_PORT=1527
Index: frameworks/NetworkServer/bin/stopNetworkServer.ksh
===================================================================
--- frameworks/NetworkServer/bin/stopNetworkServer.ksh           (revision 
109346)
+++ frameworks/NetworkServer/bin/stopNetworkServer.ksh           (working 
copy)
@@ -12,10 +12,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
 }
 
 java org.apache.derby.drda.NetworkServerControl shutdown
Index: frameworks/NetworkServer/bin/setNetworkClientCP.ksh
===================================================================
--- frameworks/NetworkServer/bin/setNetworkClientCP.ksh          (revision 
109346)
+++ frameworks/NetworkServer/bin/setNetworkClientCP.ksh          (working 
copy)
@@ -3,12 +3,12 @@
 # -- for use with Derby products in Network Server mode
 # --
 # -- To use this script from other locations, change the 
-# -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-# -- (export CLOUDSCAPE_INSTALL=/opt/derby) instead of the current 
relative path
+# -- value assigned to DERBY_INSTALL to be an absolute path 
+# -- (export DERBY_INSTALL=/opt/derby) instead of the current relative 
path
 # --
 # -- This file for use on Unix ksh systems
 # -- 
 # ---------------------------------------------------------
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
-export 
CLASSPATH="${CLOUDSCAPE_INSTALL}/lib/derby.jar:${CLOUDSCAPE_INSTALL}/lib/derbytools.jar:${CLOUDSCAPE_INSTALL}/lib/db2jcc.jar:${CLOUDSCAPE_INSTALL}/lib/db2jcc_license_c.jar:${CLASSPATH}"
+export 
CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${DERBY_INSTALL}/lib/db2jcc.jar:${DERBY_INSTALL}/lib/db2jcc_license_c.jar:${CLASSPATH}"
Index: frameworks/NetworkServer/bin/sysinfo.ksh
===================================================================
--- frameworks/NetworkServer/bin/sysinfo.ksh             (revision 109346)
+++ frameworks/NetworkServer/bin/sysinfo.ksh             (working copy)
@@ -17,10 +17,10 @@
 # -- This file for use on Unix korn shell systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . 
"$CLOUDSCAPE_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
 }
 
 # ---------------------------------------------------------
Index: frameworks/embedded/readme.html
===================================================================
--- frameworks/embedded/readme.html              (revision 109346)
+++ frameworks/embedded/readme.html              (working copy)
@@ -10,11 +10,11 @@
 
 </SCRIPT>
 
-<title>IBM Cloudscape's Embedded Framework
+<title>Derby's Embedded Framework
 </title>
 </head>
 <body onload="loadOuterPage()">
-<p><a href="../readme.html#embed">IBM Cloudscape's embedded 
framework</a></p>
+<p><a href="../readme.html#embed">Derby's embedded framework</a></p>
 </body>
 </html>
 
Index: frameworks/embedded/bin/dblook.bat
===================================================================
--- frameworks/embedded/bin/dblook.bat           (revision 109346)
+++ frameworks/embedded/bin/dblook.bat           (working copy)
@@ -3,7 +3,7 @@
 @REM -- an embedded environment.
 @REM --
 @REM -- REQUIREMENTS: 
-@REM -- You must have the Cloudscape libraries in your classpath
+@REM -- You must have the Derby libraries in your classpath
 @REM -- 
 @REM -- See the setEmbeddedCP.bat for an example of
 @REM -- how to do this.
@@ -11,10 +11,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start dblook
Index: frameworks/embedded/bin/sysinfo.bat
===================================================================
--- frameworks/embedded/bin/sysinfo.bat          (revision 109346)
+++ frameworks/embedded/bin/sysinfo.bat          (working copy)
@@ -9,15 +9,15 @@
 @REM --  if your classpath will not be reported. 
 @REM --
 @REM -- Check the setCP.bat to see an example of adding the
-@REM -- the Cloudscape jars to your classpath.
+@REM -- the Derby jars to your classpath.
 @REM -- 
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start sysinfo
Index: frameworks/embedded/bin/ij.ksh
===================================================================
--- frameworks/embedded/bin/ij.ksh               (revision 109346)
+++ frameworks/embedded/bin/ij.ksh               (working copy)
@@ -3,7 +3,7 @@
 # -- and embedded environment.
 # --
 #-- REQUIREMENTS: 
-# -- You must have the Cloudscape libraries in your classpath
+# -- You must have the Derby libraries in your classpath
 # -- 
 # -- See the setEmbeddedCP.ksh for an example of
 # -- how to do this.
@@ -11,10 +11,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . "$CLOUDSCAPE_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
 }
 
 # ---------------------------------------------------------
Index: frameworks/embedded/bin/ij.bat
===================================================================
--- frameworks/embedded/bin/ij.bat               (revision 109346)
+++ frameworks/embedded/bin/ij.bat               (working copy)
@@ -3,7 +3,7 @@
 @REM -- an embedded environment.
 @REM --
 @REM -- REQUIREMENTS: 
-@REM -- You must have the Cloudscape libraries in your classpath
+@REM -- You must have the Derby libraries in your classpath
 @REM -- 
 @REM -- See the setEmbeddedCP.bat for an example of
 @REM -- how to do this.
@@ -11,10 +11,10 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-@if !"%CLASSPATH%"==! call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call 
"%CLOUDSCAPE_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if !"%CLASSPATH%"==! call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call 
"%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start ij
Index: frameworks/embedded/bin/setEmbeddedCP.ksh
===================================================================
--- frameworks/embedded/bin/setEmbeddedCP.ksh            (revision 109346)
+++ frameworks/embedded/bin/setEmbeddedCP.ksh            (working copy)
@@ -1,15 +1,15 @@
 # ---------------------------------------------------------
 # -- This script file sets the CLASSPATH environment variable
-# -- for use with Cloudscape products in embedded mode
+# -- for use with Derby products in embedded mode
 # --
 # -- To use this script from other locations, change the 
-# -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-# -- (export CLOUDSCAPE_INSTALL=/opt/derby) instead of the current 
relative path
+# -- value assigned to DERBY_INSTALL to be an absolute path 
+# -- (export DERBY_INSTALL=/opt/derby) instead of the current relative 
path
 # --
 # -- This file for use on Unix ksh systems
 # -- 
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
-export 
CLASSPATH="${CLOUDSCAPE_INSTALL}/lib/derby.jar:${CLOUDSCAPE_INSTALL}/lib/derbytools.jar:${CLASSPATH}"
+export 
CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${CLASSPATH}"
Index: frameworks/embedded/bin/setEmbeddedCP.bat
===================================================================
--- frameworks/embedded/bin/setEmbeddedCP.bat            (revision 109346)
+++ frameworks/embedded/bin/setEmbeddedCP.bat            (working copy)
@@ -1,17 +1,17 @@
 @REM ---------------------------------------------------------
 @REM -- This batch file sets the CLASSPATH environment variable
-@REM -- for use with Cloudscape products in embedded mode
+@REM -- for use with Derby products in embedded mode
 @REM --
 @REM -- To use this script from other locations, change the 
-@REM -- value assigned to CLOUDSCAPE_INSTALL to be an absolute path 
-@REM -- (set CLOUDSCAPE_INSTALL=C:\derby) instead of the current relative 
path
+@REM -- value assigned to DERBY_INSTALL to be an absolute path 
+@REM -- (set DERBY_INSTALL=C:\derby) instead of the current relative path
 @REM --
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
 
-rem set CLOUDSCAPE_INSTALL=
+rem set DERBY_INSTALL=
 
-FOR %%X in ("%CLOUDSCAPE_INSTALL%") DO SET CLOUDSCAPE_INSTALL=%%~sX
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
 
-set 
CLASSPATH=%CLOUDSCAPE_INSTALL%\lib\derby.jar;%CLOUDSCAPE_INSTALL%\lib\derbytools.jar;%CLASSPATH%
+set 
CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%CLASSPATH%
Index: frameworks/embedded/bin/dblook.ksh
===================================================================
--- frameworks/embedded/bin/dblook.ksh           (revision 109346)
+++ frameworks/embedded/bin/dblook.ksh           (working copy)
@@ -3,7 +3,7 @@
 # -- an embedded environment.
 # --
 #-- REQUIREMENTS: 
-# -- You must have the Cloudscape libraries in your classpath
+# -- You must have the Derby libraries in your classpath
 # -- 
 # -- See the setEmbeddedCP.ksh for an example of
 # -- how to do this.
@@ -11,10 +11,10 @@
 # -- This file for use on Unix ksh systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . "$CLOUDSCAPE_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
 }
 
 # ---------------------------------------------------------
Index: frameworks/embedded/bin/sysinfo.ksh
===================================================================
--- frameworks/embedded/bin/sysinfo.ksh          (revision 109346)
+++ frameworks/embedded/bin/sysinfo.ksh          (working copy)
@@ -9,16 +9,16 @@
 # --  if your classpath will not be reported. 
 # --
 # -- Check the setCP.ksh to see an example of adding the
-# -- the Cloudscape jars to your classpath.
+# -- the Derby jars to your classpath.
 # -- 
 # --
 # -- This file for use on Unix korn shell systems
 # ---------------------------------------------------------
 
-# CLOUDSCAPE_INSTALL=
+# DERBY_INSTALL=
 
 [ -z "$CLASSPATH" ] && {
-  . "$CLOUDSCAPE_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
 }
 
 # ---------------------------------------------------------