Scott, It might be worth adding a comment to the related issue http://nagoya.apache.org/jira/browse/DERBY-55 John scott hutinger 02/12/2004 02:17 AM Please respond to "Derby Development" To Derby Development 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 @@ -About IBM Cloudscape's Frameworks +<title>About Derby's Frameworks -

About IBM Cloudscape's Frameworks

-

A framework is the environment in which Cloudscape runs. The framework in which you run Cloudscape affects how you run applications against Cloudscape.

+

About Derby's Frameworks

+

A framework is the environment in which Derby runs. The framework in which you run Derby affects how you run applications against Derby.

The frameworks directory contains subdirectories for each framework with supporting files. Depending on the framework, the subdirectory includes:

  • bin Subdirectory
    - All subdirectories in this directory contain a bin 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 bin 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.
    To use the scripts for a particular framework, modify the scripts as necessary and put that framework's bin subdirectory first in your path.

For an easy-to-follow example of how to run an application in the two frameworks, see the simple example.

-

For more information about frameworks, see Getting Started with IBM Cloudscape.

+

For more information about frameworks, see Getting Started with Derby.

Embedded Framework

-

An embedded framework 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. -

The bin subdirectory in frameworks/embedded contains scripts for running some of the Cloudscape tools in an embedded environment. For working in an embedded environment, put the frameworks/embedded/bin subdirectory first in your path.

+

An embedded framework 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. +

The bin subdirectory in frameworks/embedded contains scripts for running some of the Derby tools in an embedded environment. For working in an embedded environment, put the frameworks/embedded/bin subdirectory first in your path.

Server Framework

-

A server framework is a continuously running Java application that allows multiple, remote JDBC applications to connect to Cloudscape. +

A server framework is a continuously running Java application that allows multiple, remote JDBC applications to connect to Derby.

-

IBM Cloudscape Network Server

-

The Cloudscape Network Server is a server framework 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. +

Derby Network Server

+

The Derby Network Server is a server framework 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.

    -
  • 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.
  • +
  • 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.
Index: frameworks/NetworkServer/readme.html =================================================================== --- frameworks/NetworkServer/readme.html (revision 109346) +++ frameworks/NetworkServer/readme.html (working copy) @@ -10,11 +10,11 @@ -IBM Cloudscape's Network Server framework +<title>Derby's Network Server framework -

IBM Cloudscape's Network Server framework

+

Derby's Network Server framework

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 @@ -IBM Cloudscape's Embedded Framework +<title>Derby's Embedded Framework -

IBM Cloudscape's embedded framework

+

Derby's embedded framework

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 } # ---------------------------------------------------------