db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r109462 - in incubator/derby/code/trunk/frameworks: . NetworkServer NetworkServer/bin embedded embedded/bin
Date Thu, 02 Dec 2004 07:14:04 GMT
Author: fuzzylogic
Date: Wed Dec  1 23:14:03 2004
New Revision: 109462

URL: http://svn.apache.org/viewcvs?view=rev&rev=109462
Log:
Cleanup Cloudscape/IBM references in frameworks scripts.

Committing for Scott Hutinger <s-hutinger@wiu.edu>

Modified:
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat
   incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh
   incubator/derby/code/trunk/frameworks/NetworkServer/readme.html
   incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat
   incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh
   incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat
   incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh
   incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat
   incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh
   incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat
   incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh
   incubator/derby/code/trunk/frameworks/embedded/readme.html
   incubator/derby/code/trunk/frameworks/readme.html

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat	Wed Dec
 1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh	Wed Dec
 1 23:14:03 2004
@@ -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
 }
 
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat	Wed Dec  1 23:14:03
2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh	Wed Dec  1 23:14:03
2004
@@ -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
 }
 
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat	Wed Dec  1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh	Wed Dec  1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat	Wed Dec
 1 23:14:03 2004
@@ -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%

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.ksh	Wed Dec
 1 23:14:03 2004
@@ -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}"

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat	Wed Dec
 1 23:14:03 2004
@@ -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%

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.ksh	Wed Dec
 1 23:14:03 2004
@@ -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}"

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat	Wed Dec
 1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh	Wed Dec
 1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat	Wed Dec
 1 23:14:03 2004
@@ -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
 

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh	Wed Dec
 1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat	Wed Dec  1 23:14:03
2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh	Wed Dec  1 23:14:03
2004
@@ -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
 }
 
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/NetworkServer/readme.html
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/NetworkServer/readme.html?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/NetworkServer/readme.html&r1=109461&p2=incubator/derby/code/trunk/frameworks/NetworkServer/readme.html&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/NetworkServer/readme.html	(original)
+++ incubator/derby/code/trunk/frameworks/NetworkServer/readme.html	Wed Dec  1 23:14:03 2004
@@ -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>
 

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/dblook.bat	Wed Dec  1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/dblook.ksh	Wed Dec  1 23:14:03 2004
@@ -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
 }
  
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/ij.bat	Wed Dec  1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/ij.ksh	Wed Dec  1 23:14:03 2004
@@ -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
 }
  
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat	Wed Dec  1 23:14:03
2004
@@ -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%

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.ksh	Wed Dec  1 23:14:03
2004
@@ -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}"

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat	Wed Dec  1 23:14:03 2004
@@ -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

Modified: incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh	Wed Dec  1 23:14:03 2004
@@ -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
 }
  
 # ---------------------------------------------------------

Modified: incubator/derby/code/trunk/frameworks/embedded/readme.html
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/embedded/readme.html?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/embedded/readme.html&r1=109461&p2=incubator/derby/code/trunk/frameworks/embedded/readme.html&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/embedded/readme.html	(original)
+++ incubator/derby/code/trunk/frameworks/embedded/readme.html	Wed Dec  1 23:14:03 2004
@@ -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>
 

Modified: incubator/derby/code/trunk/frameworks/readme.html
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/frameworks/readme.html?view=diff&rev=109462&p1=incubator/derby/code/trunk/frameworks/readme.html&r1=109461&p2=incubator/derby/code/trunk/frameworks/readme.html&r2=109462
==============================================================================
--- incubator/derby/code/trunk/frameworks/readme.html	(original)
+++ incubator/derby/code/trunk/frameworks/readme.html	Wed Dec  1 23:14:03 2004
@@ -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>

Mime
View raw message