svn commit: r162093 - in /incubator/derby/code/branches/10.0: frameworks/ frameworks/NetworkServer/bin/ frameworks/embedded/ frameworks/embedded/bin/ java/demo/nserverdemo/

[fu...@apache.org]

Author: fuzzylogic
Date: Wed Apr 20 16:51:52 2005
New Revision: 162093

URL: http://svn.apache.org/viewcvs?rev=162093&view=rev
Log:
Merge revisions 161070 and 126495 to 10.0 branch

Modified:
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/embedded/readme.html   (contents, props changed)
    incubator/derby/code/branches/10.0/frameworks/readme.html   (contents, props changed)
    incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java
    incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java
    incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat Wed Apr 20 16:51:52 2005
@@ -1,29 +1,29 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to run commands 
-@REM -- in the Network Server framework
-@REM --
-@REM -- REQUIREMENTS: 
-@REM --	 You must have the derby jar files as well as the 
-@REM --   derby network server class files in your classpath.
-@REM --
-@REM --  Check the setNetworkServerCP.bat file for an example of
-@REM --   what to set.
-@REM -- 
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@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
-@REM ---------------------------------------------------------
-java org.apache.derby.drda.NetworkServerControl %*
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to run commands 
+@REM -- in the Network Server framework
+@REM --
+@REM -- REQUIREMENTS: 
+@REM --	 You must have the derby jar files as well as the 
+@REM --   derby network server class files in your classpath.
+@REM --
+@REM --  Check the setNetworkServerCP.bat file for an example of
+@REM --   what to set.
+@REM -- 
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@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
+@REM ---------------------------------------------------------
+java org.apache.derby.drda.NetworkServerControl %*
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh Wed Apr 20 16:51:52 2005
@@ -1,31 +1,31 @@
-## ---------------------------------------------------------
-# -- This simple script is an example of how to run commands
-# -- for the Network Server framework
-# --
-# -- REQUIREMENTS: 
-# --	  You must have the derby and Network Server jar files in your CLASSPATH
-# --
-# --  Check the setNetworkServerCP.ksh file for an example of
-# --   what to set.
-# -- 
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
-# ---------------------------------------------------------
-# -- start Derby Network Server
-# ---------------------------------------------------------
-
-java org.apache.derby.drda.NetworkServerControl $*
-
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
+## ---------------------------------------------------------
+# -- This simple script is an example of how to run commands
+# -- for the Network Server framework
+# --
+# -- REQUIREMENTS: 
+# --	  You must have the derby and Network Server jar files in your CLASSPATH
+# --
+# --  Check the setNetworkServerCP.ksh file for an example of
+# --   what to set.
+# -- 
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+}
+
+# ---------------------------------------------------------
+# -- start Derby Network Server
+# ---------------------------------------------------------
+
+java org.apache.derby.drda.NetworkServerControl $*
+
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/NetworkServerControl.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat Wed Apr 20 16:51:52 2005
@@ -1,28 +1,28 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to start dblook in 
-@REM -- an NetworkServer environment.
-@REM --
-@REM -- REQUIREMENTS: 
-@REM -- You must have the Derby libraries in your classpath
-@REM -- 
-@REM -- See the setNetworkClientCP.bat for an example of
-@REM -- how to do this.
-@REM --
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-
-@REM ---------------------------------------------------------
-@REM -- start dblook
-@REM ---------------------------------------------------------
-java org.apache.derby.tools.dblook %*
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to start dblook in 
+@REM -- an NetworkServer environment.
+@REM --
+@REM -- REQUIREMENTS: 
+@REM -- You must have the Derby libraries in your classpath
+@REM -- 
+@REM -- See the setNetworkClientCP.bat for an example of
+@REM -- how to do this.
+@REM --
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
+
+@REM ---------------------------------------------------------
+@REM -- start dblook
+@REM ---------------------------------------------------------
+java org.apache.derby.tools.dblook %*
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh Wed Apr 20 16:51:52 2005
@@ -1,29 +1,29 @@
-# ---------------------------------------------------------
-# -- This simple script is an example of how to start dblook in 
-# -- a NetworkServer environment.
-# --
-#-- REQUIREMENTS: 
-# -- You must have the Derby libraries in your classpath
-# -- 
-# -- See the setEmbeddedCP.ksh for an example of
-# -- how to do this.
-# --
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
-}
-
-# ---------------------------------------------------------
-# -- start dblook
-# ---------------------------------------------------------
-java org.apache.derby.tools.dblook $@
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
+# ---------------------------------------------------------
+# -- This simple script is an example of how to start dblook in 
+# -- a NetworkServer environment.
+# --
+#-- REQUIREMENTS: 
+# -- You must have the Derby libraries in your classpath
+# -- 
+# -- See the setEmbeddedCP.ksh for an example of
+# -- how to do this.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
+}
+
+# ---------------------------------------------------------
+# -- start dblook
+# ---------------------------------------------------------
+java org.apache.derby.tools.dblook $@
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/dblook.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat Wed Apr 20 16:51:52 2005
@@ -1,37 +1,37 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to start ij in 
-@REM -- an NetworkServer environment.
-@REM --
-@REM -- REQUIREMENTS: 
-@REM -- You must have the Derby and DB2 JCC libraries in your classpath
-@REM -- 
-@REM -- See the setNetworkClientCP.bat for an example of
-@REM -- how to do this.
-@REM --
-@REM -- You may need to modify the values below for a different
-@REM -- host, port, user, or password
-@REM --
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@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
-set IJ_USER=APP
-set IJ_PASSWORD=APP
-
-@REM ---------------------------------------------------------
-@REM -- start ij
-@REM -- host, port, user and password may need to be changed
-@REM ---------------------------------------------------------
-java -Dij.driver=com.ibm.db2.jcc.DB2Driver -Dij.protocol=jdbc:derby:net://%IJ_HOST%:%IJ_PORT%/ -Dij.user=%IJ_USER% -Dij.password=%IJ_PASSWORD%  org.apache.derby.tools.ij
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to start ij in 
+@REM -- an NetworkServer environment.
+@REM --
+@REM -- REQUIREMENTS: 
+@REM -- You must have the Derby and DB2 JCC libraries in your classpath
+@REM -- 
+@REM -- See the setNetworkClientCP.bat for an example of
+@REM -- how to do this.
+@REM --
+@REM -- You may need to modify the values below for a different
+@REM -- host, port, user, or password
+@REM --
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@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
+set IJ_USER=APP
+set IJ_PASSWORD=APP
+
+@REM ---------------------------------------------------------
+@REM -- start ij
+@REM -- host, port, user and password may need to be changed
+@REM ---------------------------------------------------------
+java -Dij.driver=com.ibm.db2.jcc.DB2Driver -Dij.protocol=jdbc:derby:net://%IJ_HOST%:%IJ_PORT%/ -Dij.user=%IJ_USER% -Dij.password=%IJ_PASSWORD%  org.apache.derby.tools.ij
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh Wed Apr 20 16:51:52 2005
@@ -1,33 +1,33 @@
-# ---------------------------------------------------------
-# -- This simple script is an example of how to start ij in 
-# -- the Derby Network Server environment.
-# --
-#-- REQUIREMENTS: 
-# -- You must have the Derby and DB2 JCC libraries in your classpath
-# -- 
-# -- See the setNetworkClientCP.ksh for an example of
-# -- how to do this.
-# --
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
-}
- 
-export IJ_HOST=localhost
-export IJ_PORT=1527
-export IJ_USER=APP
-export IJ_PASSWORD=APP
-
-# ---------------------------------------------------------
-# -- start ij
-# ---------------------------------------------------------
-java -Dij.driver=com.ibm.db2.jcc.DB2Driver -Dij.protocol=jdbc:derby:net://$IJ_HOST:$IJ_PORT/ -Dij.user=$IJ_USER -Dij.password=$IJ_PASSWORD  org.apache.derby.tools.ij
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
+# ---------------------------------------------------------
+# -- This simple script is an example of how to start ij in 
+# -- the Derby Network Server environment.
+# --
+#-- REQUIREMENTS: 
+# -- You must have the Derby and DB2 JCC libraries in your classpath
+# -- 
+# -- See the setNetworkClientCP.ksh for an example of
+# -- how to do this.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
+}
+ 
+export IJ_HOST=localhost
+export IJ_PORT=1527
+export IJ_USER=APP
+export IJ_PASSWORD=APP
+
+# ---------------------------------------------------------
+# -- start ij
+# ---------------------------------------------------------
+java -Dij.driver=com.ibm.db2.jcc.DB2Driver -Dij.protocol=jdbc:derby:net://$IJ_HOST:$IJ_PORT/ -Dij.user=$IJ_USER -Dij.password=$IJ_PASSWORD  org.apache.derby.tools.ij
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/ij.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat Wed Apr 20 16:51:52 2005
@@ -1,17 +1,17 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file sets the CLASSPATH environment variable
-@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 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 DERBY_INSTALL=
-
-FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
-
-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%
+@REM ---------------------------------------------------------
+@REM -- This batch file sets the CLASSPATH environment variable
+@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 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 DERBY_INSTALL=
+
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
+
+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%

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh Wed Apr 20 16:51:52 2005
@@ -1,14 +1,14 @@
-# ---------------------------------------------------------
-# -- This script file sets the CLASSPATH environment variable
-# -- for use with Derby products in Network Server mode
-# --
-# -- To use this script from other locations, change the 
-# -- 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
-# -- 
-# ---------------------------------------------------------
-# DERBY_INSTALL=
-
-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}"
+# ---------------------------------------------------------
+# -- This script file sets the CLASSPATH environment variable
+# -- for use with Derby products in Network Server mode
+# --
+# -- To use this script from other locations, change the 
+# -- 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
+# -- 
+# ---------------------------------------------------------
+# DERBY_INSTALL=
+
+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}"

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat Wed Apr 20 16:51:52 2005
@@ -1,17 +1,17 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file sets the CLASSPATH environment variable
-@REM -- for use with Derby products in NetworkServer mode
-@REM --
-@REM -- To use this script from other locations, change the 
-@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 DERBY_INSTALL=
-
-FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
-
-set CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%DERBY_INSTALL%\lib\derbynet.jar;%CLASSPATH%
+@REM ---------------------------------------------------------
+@REM -- This batch file sets the CLASSPATH environment variable
+@REM -- for use with Derby products in NetworkServer mode
+@REM --
+@REM -- To use this script from other locations, change the 
+@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 DERBY_INSTALL=
+
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
+
+set CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%DERBY_INSTALL%\lib\derbynet.jar;%CLASSPATH%

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh Wed Apr 20 16:51:52 2005
@@ -1,14 +1,14 @@
-# ---------------------------------------------------------
-# -- This script file sets the CLASSPATH environment variable
-# -- for use with Derby products in NetworkServer mode
-# --
-# -- To use this script from other locations, change the 
-# -- 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
-# -- 
-# ---------------------------------------------------------
-# DERBY_INSTALL=
-
-export CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${DERBY_INSTALL}/lib/derbynet.jar:${CLASSPATH}"
+# ---------------------------------------------------------
+# -- This script file sets the CLASSPATH environment variable
+# -- for use with Derby products in NetworkServer mode
+# --
+# -- To use this script from other locations, change the 
+# -- 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
+# -- 
+# ---------------------------------------------------------
+# DERBY_INSTALL=
+
+export CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${DERBY_INSTALL}/lib/derbynet.jar:${CLASSPATH}"

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat Wed Apr 20 16:51:52 2005
@@ -1,29 +1,61 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to start the
-@REM -- Derby server in the Network Server framework
-@REM --
-@REM -- REQUIREMENTS: 
-@REM --	 You must have the derby jar files as well as the 
-@REM --   derby network server class files in your classpath.
-@REM --
-@REM --  Check the setNetworkServerCP.bat file for an example of
-@REM --   what to set.
-@REM -- 
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@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
-@REM ---------------------------------------------------------
-java org.apache.derby.drda.NetworkServerControl start
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+@echo off
+@rem set DERBY_INSTALL=
+
+
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+
+if   "%JAVA_HOME%" == "" goto setjavaMsg
+
+:set_host
+
+if "%1" == "" goto setServerHost
+set derbyHost=%1
+goto set_port
+
+:setServerHost
+if not "%DERBY_SERVER_HOST%" == "" goto setServerHost2
+set derbyHost=localhost
+goto set_port
+
+:setServerHost2
+set derbyHost=%DERBY_SERVER_HOST%
+
+
+:set_port
+shift
+if "%1" == "" goto setServerPort
+set derbyPort=%1
+goto start_server
+
+
+:setServerPort
+if not "%DERBY_SERVER_PORT%" == ""  goto setServerPort2
+set derbyPort=1527
+goto start_server
+
+:setServerPort2
+set derbyPort=%DERBY_SERVER_PORT%
+
+:start_server
+
+@REM ---------------------------------------------------------
+@REM -- start Derby as a Network server
+@REM ---------------------------------------------------------
+%JAVA_HOME%\bin\java org.apache.derby.drda.NetworkServerControl start -h %derbyHost% -p %derbyPort%
+
+goto end
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+
+:setJavaMsg
+echo Please set JAVA_HOME in order to start the Network Server
+
+:end
+set derbyPort=
+set derbyHost=

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh Wed Apr 20 16:51:52 2005
@@ -1,28 +1,61 @@
-## ---------------------------------------------------------
-# -- This simple script is an example of how to start Derby 
-# -- as a server inside the Network Server framework
-# --
-# -- REQUIREMENTS: 
-# --	  You must have the derby and Network Server jar files in your CLASSPATH
-# --
-# --  Check the setNetworkServerCP.ksh file for an example of
-# --   what to set.
-# -- 
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-# ---------------------------------------------------------
-# -- start Derby Network Server
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
-java org.apache.derby.drda.NetworkServerControl start
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
+## ---------------------------------------------------------
+# -- This simple script is an example of how to start Derby
+# -- as a server inside the Network Server framework
+# --
+# -- REQUIREMENTS:
+# --     You must have the derby and Network Server jar files in your CLASSPATH
+# --
+# --  Check the setNetworkServerCP.ksh file for an example of
+# --   what to set.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+# ---------------------------------------------------------
+# -- start Derby Network Server
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+}
+
+if [ -z "$JAVA_HOME" ]
+then
+   JAVA_HOME=/usr/java
+fi
+
+# ---------------------------------------------------------
+# -- Determine the host and port to use by:
+# --  1. Check to see if the host and port are set on the command line
+# --  2. Check to see if DERBY_SERVER_HOST and DERBY_SERVER_PORT
+# --  3. Default to localhost/1527
+# ---------------------------------------------------------
+
+if [  "$1" ]
+then
+   DERBY_SERVER_HOST=$1
+fi
+
+if [ -z "$DERBY_SERVER_HOST" ]
+then
+   DERBY_SERVER_HOST=localhost
+fi
+
+if [  "$2" ]
+then
+   DERBY_SERVER_PORT=$2
+fi
+
+if [ -z "$DERBY_SERVER_PORT" ]
+then
+   DERBY_SERVER_PORT=1527
+fi
+
+$JAVA_HOME/bin/java org.apache.derby.drda.NetworkServerControl start -h $DERBY_SERVER_HOST -p $DERBY_SERVER_PORT
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/startNetworkServer.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat Wed Apr 20 16:51:52 2005
@@ -1,26 +1,68 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to shutdown the
-@REM -- Derby server in the Network Server framework
-@REM --
-@REM -- REQUIREMENTS: 
-@REM --	 You must have the derby jar files as well as the 
-@REM --   Network Server class files in your classpath.
-@REM --
-@REM --  Check the setNetworkServerCP.bat file for an example of
-@REM --   what to set.
-@REM -- 
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@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
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM --
+@REM -- REQUIREMENTS:
+@REM --         You must have the derby jar files as well as the
+@REM --   derby network server class files in your classpath.
+@REM --
+@REM --  Check the setNetworkServerCP.bat file for an example of
+@REM --   what to set.
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+@echo off
+@rem set DERBY_INSTALL=
+
+
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+
+if   "%JAVA_HOME%" == "" goto setjavaMsg
+
+:set_host
+
+if "%1" == "" goto setServerHost
+set derbyHost=%1
+goto set_port
+
+:setServerHost
+if not "%DERBY_SERVER_HOST%" == "" goto setServerHost2
+set derbyHost=localhost
+goto set_port
+
+:setServerHost2
+set derbyHost=%DERBY_SERVER_HOST%
+
+
+:set_port
+shift
+if "%1" == "" goto setServerPort
+set derbyPort=%1
+goto stop_server
+
+
+:setServerPort
+if not "%DERBY_SERVER_PORT%" == ""  goto setServerPort2
+set derbyPort=1527
+goto stop_server
+
+:setServerPort2
+set derbyPort=%DERBY_SERVER_PORT%
+
+:stop_server
+
+@REM ---------------------------------------------------------
+@REM -- shutdown Derby as a Network server
+@REM ---------------------------------------------------------
+%JAVA_HOME%\bin\java org.apache.derby.drda.NetworkServerControl shutdown -h %derbyHost% -p %derbyPort%
+
+goto end
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+
+:setJavaMsg
+echo Please set JAVA_HOME in order to start the Network Server
+
+:end
+set derbyPort=
+set derbyHost=

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh Wed Apr 20 16:51:52 2005
@@ -1,25 +1,61 @@
-# ---------------------------------------------------------
-# -- This simple script is an example of how to shutdown Derby 
-# -- running as a server inside the Network Server framework
-# --
-# -- REQUIREMENTS: 
-# --	 You must have the derby jar files as well as the 
-# --   derby network server class files in your classpath.
-# --
-# --  Check the setNetworkServerCP.ksh file for an example of
-# --   what to set.
-# -- 
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
-java org.apache.derby.drda.NetworkServerControl shutdown
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
+## ---------------------------------------------------------
+# -- This simple script is an example of how to shutdown Derby
+# -- running as a server inside the Network Server framework
+# --
+# -- REQUIREMENTS:
+# --     You must have the derby and Network Server jar files in your CLASSPATH
+# --
+# --  Check the setNetworkServerCP.ksh file for an example of
+# --   what to set.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+# ---------------------------------------------------------
+# -- shutdown Derby Network Server
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+}
+
+if [ -z "$JAVA_HOME" ]
+then
+   JAVA_HOME=/usr/java
+fi
+
+# ---------------------------------------------------------
+# -- Determine the host and port to use by:
+# --  1. Check to see if the host and port are set on the command line
+# --  2. Check to see if DERBY_SERVER_HOST and DERBY_SERVER_PORT
+# --  3. Default to localhost/1527
+# ---------------------------------------------------------
+
+if [  "$1" ]
+then
+   DERBY_SERVER_HOST=$1
+fi
+
+if [ -z "$DERBY_SERVER_HOST" ]
+then
+   DERBY_SERVER_HOST=localhost
+fi
+
+if [  "$2" ]
+then
+   DERBY_SERVER_PORT=$2
+fi
+
+if [ -z "$DERBY_SERVER_PORT" ]
+then
+   DERBY_SERVER_PORT=1527
+fi
+
+$JAVA_HOME/bin/java org.apache.derby.drda.NetworkServerControl shutdown -h $DERBY_SERVER_HOST -p $DERBY_SERVER_PORT
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/stopNetworkServer.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat Wed Apr 20 16:51:52 2005
@@ -1,32 +1,32 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to use sysinfo to get
-@REM -- important system information
-@REM --
-@REM -- REQUIREMENTS:
-@REM --
-@REM --  This utility will report important system info about 
-@REM --  jar files which are in your classpath. Jar files which are not
-@REM --  if your classpath will not be reported. 
-@REM --
-@REM -- Check the setNetworkServerCP.bat to see an example of adding the
-@REM -- the Derby jars to your classpath.
-@REM -- 
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-
-@REM ---------------------------------------------------------
-@REM -- start sysinfo
-@REM ---------------------------------------------------------
-java org.apache.derby.drda.NetworkServerControl sysinfo %*
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to use sysinfo to get
+@REM -- important system information
+@REM --
+@REM -- REQUIREMENTS:
+@REM --
+@REM --  This utility will report important system info about 
+@REM --  jar files which are in your classpath. Jar files which are not
+@REM --  if your classpath will not be reported. 
+@REM --
+@REM -- Check the setNetworkServerCP.bat to see an example of adding the
+@REM -- the Derby jars to your classpath.
+@REM -- 
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
+
+@REM ---------------------------------------------------------
+@REM -- start sysinfo
+@REM ---------------------------------------------------------
+java org.apache.derby.drda.NetworkServerControl sysinfo %*
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+
+

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh Wed Apr 20 16:51:52 2005
@@ -1,33 +1,33 @@
-# ---------------------------------------------------------
-# -- This script file is an example of how to use sysinfo to get
-# -- important system information
-# --
-# -- REQUIREMENTS:
-# --
-# --  This utility will report important system info about 
-# --  jar files which are in your classpath and the current setting of
-# --  Derby Network Server parameters. Jar files which are not
-# --  if your classpath will not be reported. 
-# --  The Derby Network Server must be running for this utility to work.
-# --
-# -- Check the setNetworkServerCP.ksh to see an example of adding the
-# -- the Derby jars to your classpath.
-# -- 
-# --
-# -- This file for use on Unix korn shell systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
-# ---------------------------------------------------------
-# -- start sysinfo
-# ---------------------------------------------------------
-java org.apache.derby.drda.NetworkServerControl sysinfo $*
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
+# ---------------------------------------------------------
+# -- This script file is an example of how to use sysinfo to get
+# -- important system information
+# --
+# -- REQUIREMENTS:
+# --
+# --  This utility will report important system info about 
+# --  jar files which are in your classpath and the current setting of
+# --  Derby Network Server parameters. Jar files which are not
+# --  if your classpath will not be reported. 
+# --  The Derby Network Server must be running for this utility to work.
+# --
+# -- Check the setNetworkServerCP.ksh to see an example of adding the
+# -- the Derby jars to your classpath.
+# -- 
+# --
+# -- This file for use on Unix korn shell systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
+}
+
+# ---------------------------------------------------------
+# -- start sysinfo
+# ---------------------------------------------------------
+java org.apache.derby.drda.NetworkServerControl sysinfo $*
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------

Propchange: incubator/derby/code/branches/10.0/frameworks/NetworkServer/bin/sysinfo.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat Wed Apr 20 16:51:52 2005
@@ -1,28 +1,28 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to start dblook in 
-@REM -- an embedded environment.
-@REM --
-@REM -- REQUIREMENTS: 
-@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.
-@REM --
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-
-@REM ---------------------------------------------------------
-@REM -- start dblook
-@REM ---------------------------------------------------------
-java org.apache.derby.tools.dblook %*
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to start dblook in 
+@REM -- an embedded environment.
+@REM --
+@REM -- REQUIREMENTS: 
+@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.
+@REM --
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+
+@REM ---------------------------------------------------------
+@REM -- start dblook
+@REM ---------------------------------------------------------
+java org.apache.derby.tools.dblook %*
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh Wed Apr 20 16:51:52 2005
@@ -1,29 +1,29 @@
-# ---------------------------------------------------------
-# -- This simple script is an example of how to start dblook in 
-# -- an embedded environment.
-# --
-#-- REQUIREMENTS: 
-# -- You must have the Derby libraries in your classpath
-# -- 
-# -- See the setEmbeddedCP.ksh for an example of
-# -- how to do this.
-# --
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
-# ---------------------------------------------------------
-# -- start dblook
-# ---------------------------------------------------------
-java org.apache.derby.tools.dblook $@
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
+# ---------------------------------------------------------
+# -- This simple script is an example of how to start dblook in 
+# -- an embedded environment.
+# --
+#-- REQUIREMENTS: 
+# -- You must have the Derby libraries in your classpath
+# -- 
+# -- See the setEmbeddedCP.ksh for an example of
+# -- how to do this.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+}
+ 
+# ---------------------------------------------------------
+# -- start dblook
+# ---------------------------------------------------------
+java org.apache.derby.tools.dblook $@
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/dblook.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat Wed Apr 20 16:51:52 2005
@@ -1,29 +1,29 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to start ij in 
-@REM -- an embedded environment.
-@REM --
-@REM -- REQUIREMENTS: 
-@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.
-@REM --
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-
-@REM ---------------------------------------------------------
-@REM -- start ij
-@REM ---------------------------------------------------------
-java -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
-
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to start ij in 
+@REM -- an embedded environment.
+@REM --
+@REM -- REQUIREMENTS: 
+@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.
+@REM --
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+
+@REM ---------------------------------------------------------
+@REM -- start ij
+@REM ---------------------------------------------------------
+java -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
+
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh Wed Apr 20 16:51:52 2005
@@ -1,29 +1,29 @@
-# ---------------------------------------------------------
-# -- This simple script is an example of how to start ij in 
-# -- and embedded environment.
-# --
-#-- REQUIREMENTS: 
-# -- You must have the Derby libraries in your classpath
-# -- 
-# -- See the setEmbeddedCP.ksh for an example of
-# -- how to do this.
-# --
-# -- This file for use on Unix ksh systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
-# ---------------------------------------------------------
-# -- start ij
-# ---------------------------------------------------------
-java -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
+# ---------------------------------------------------------
+# -- This simple script is an example of how to start ij in 
+# -- and embedded environment.
+# --
+#-- REQUIREMENTS: 
+# -- You must have the Derby libraries in your classpath
+# -- 
+# -- See the setEmbeddedCP.ksh for an example of
+# -- how to do this.
+# --
+# -- This file for use on Unix ksh systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+}
+ 
+# ---------------------------------------------------------
+# -- start ij
+# ---------------------------------------------------------
+java -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/ij.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat Wed Apr 20 16:51:52 2005
@@ -1,17 +1,17 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file sets the CLASSPATH environment variable
-@REM -- for use with Derby products in embedded mode
-@REM --
-@REM -- To use this script from other locations, change the 
-@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 DERBY_INSTALL=
-
-FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
-
-set CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%CLASSPATH%
+@REM ---------------------------------------------------------
+@REM -- This batch file sets the CLASSPATH environment variable
+@REM -- for use with Derby products in embedded mode
+@REM --
+@REM -- To use this script from other locations, change the 
+@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 DERBY_INSTALL=
+
+FOR %%X in ("%DERBY_INSTALL%") DO SET DERBY_INSTALL=%%~sX
+
+set CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%CLASSPATH%

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh Wed Apr 20 16:51:52 2005
@@ -1,15 +1,15 @@
-# ---------------------------------------------------------
-# -- This script file sets the CLASSPATH environment variable
-# -- for use with Derby products in embedded mode
-# --
-# -- To use this script from other locations, change the 
-# -- 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
-# -- 
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-export CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${CLASSPATH}"
+# ---------------------------------------------------------
+# -- This script file sets the CLASSPATH environment variable
+# -- for use with Derby products in embedded mode
+# --
+# -- To use this script from other locations, change the 
+# -- 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
+# -- 
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+export CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${CLASSPATH}"

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/setEmbeddedCP.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat Wed Apr 20 16:51:52 2005
@@ -1,37 +1,37 @@
-@REM ---------------------------------------------------------
-@REM -- This batch file is an example of how to use sysinfo to get
-@REM -- important system information
-@REM --
-@REM -- REQUIREMENTS:
-@REM --
-@REM --  This utility will report important system info about 
-@REM --  jar files which are in your classpath. Jar files which are not
-@REM --  if your classpath will not be reported. 
-@REM --
-@REM -- Check the setCP.bat to see an example of adding the
-@REM -- the Derby jars to your classpath.
-@REM -- 
-@REM -- This file for use on Windows systems
-@REM ---------------------------------------------------------
-
-rem set DERBY_INSTALL=
- 
-@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
-
-@REM ---------------------------------------------------------
-@REM -- start sysinfo
-@REM ---------------------------------------------------------
-java org.apache.derby.tools.sysinfo
-
-@REM ---------------------------------------------------------
-@REM -- To use Microsoft's JView JVM, use the following command
-@REM ---------------------------------------------------------
-@REM -- jview org.apache.derby.tools.sysinfo
-
-@REM ---------------------------------------------------------
-@REM -- To use a different JVM with a different syntax, simply edit
-@REM -- this file
-@REM ---------------------------------------------------------
-
-
+@REM ---------------------------------------------------------
+@REM -- This batch file is an example of how to use sysinfo to get
+@REM -- important system information
+@REM --
+@REM -- REQUIREMENTS:
+@REM --
+@REM --  This utility will report important system info about 
+@REM --  jar files which are in your classpath. Jar files which are not
+@REM --  if your classpath will not be reported. 
+@REM --
+@REM -- Check the setCP.bat to see an example of adding the
+@REM -- the Derby jars to your classpath.
+@REM -- 
+@REM -- This file for use on Windows systems
+@REM ---------------------------------------------------------
+
+rem set DERBY_INSTALL=
+ 
+@if !"%CLASSPATH%"==! call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+@if "%CLASSPATH%" == "" call "%DERBY_INSTALL%"/frameworks/embedded/bin/setEmbeddedCP.bat
+
+@REM ---------------------------------------------------------
+@REM -- start sysinfo
+@REM ---------------------------------------------------------
+java org.apache.derby.tools.sysinfo
+
+@REM ---------------------------------------------------------
+@REM -- To use Microsoft's JView JVM, use the following command
+@REM ---------------------------------------------------------
+@REM -- jview org.apache.derby.tools.sysinfo
+
+@REM ---------------------------------------------------------
+@REM -- To use a different JVM with a different syntax, simply edit
+@REM -- this file
+@REM ---------------------------------------------------------
+
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh Wed Apr 20 16:51:52 2005
@@ -1,34 +1,34 @@
-# ---------------------------------------------------------
-# -- This script file is an example of how to use sysinfo to get
-# -- important system information
-# --
-# -- REQUIREMENTS:
-# --
-# --  This utility will report important system info about 
-# --  jar files which are in your classpath. Jar files which are not
-# --  if your classpath will not be reported. 
-# --
-# -- Check the setCP.ksh to see an example of adding the
-# -- the Derby jars to your classpath.
-# -- 
-# --
-# -- This file for use on Unix korn shell systems
-# ---------------------------------------------------------
-
-# DERBY_INSTALL=
-
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
-# ---------------------------------------------------------
-# -- start sysinfo
-# ---------------------------------------------------------
-java org.apache.derby.tools.sysinfo
-
-# ---------------------------------------------------------
-# -- To use a different JVM with a different syntax, simply edit
-# -- this file
-# ---------------------------------------------------------
-
-
+# ---------------------------------------------------------
+# -- This script file is an example of how to use sysinfo to get
+# -- important system information
+# --
+# -- REQUIREMENTS:
+# --
+# --  This utility will report important system info about 
+# --  jar files which are in your classpath. Jar files which are not
+# --  if your classpath will not be reported. 
+# --
+# -- Check the setCP.ksh to see an example of adding the
+# -- the Derby jars to your classpath.
+# -- 
+# --
+# -- This file for use on Unix korn shell systems
+# ---------------------------------------------------------
+
+# DERBY_INSTALL=
+
+[ -z "$CLASSPATH" ] && {
+  . "$DERBY_INSTALL"/frameworks/embedded/bin/setEmbeddedCP.ksh
+}
+ 
+# ---------------------------------------------------------
+# -- start sysinfo
+# ---------------------------------------------------------
+java org.apache.derby.tools.sysinfo
+
+# ---------------------------------------------------------
+# -- To use a different JVM with a different syntax, simply edit
+# -- this file
+# ---------------------------------------------------------
+
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/bin/sysinfo.ksh
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/embedded/readme.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/embedded/readme.html?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/embedded/readme.html (original)
+++ incubator/derby/code/branches/10.0/frameworks/embedded/readme.html Wed Apr 20 16:51:52 2005
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT language="JavaScript">
-<!--
-function loadOuterPage(){
-        location.href = "../readme.html#embed";
-		}
-//-->
-
-</SCRIPT>
-
-<title>Derby's Embedded Framework
-</title>
-</head>
-<body onload="loadOuterPage()">
-<p><a href="../readme.html#embed">Derby's embedded framework</a></p>
-</body>
-</html>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<SCRIPT language="JavaScript">
+<!--
+function loadOuterPage(){
+        location.href = "../readme.html#embed";
+		}
+//-->
+
+</SCRIPT>
+
+<title>Derby's Embedded Framework
+</title>
+</head>
+<body onload="loadOuterPage()">
+<p><a href="../readme.html#embed">Derby's embedded framework</a></p>
+</body>
+</html>
+

Propchange: incubator/derby/code/branches/10.0/frameworks/embedded/readme.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/frameworks/readme.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/frameworks/readme.html?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/frameworks/readme.html (original)
+++ incubator/derby/code/branches/10.0/frameworks/readme.html Wed Apr 20 16:51:52 2005
@@ -1,34 +1,34 @@
-<!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 Derby's Frameworks
-</title>
-<link rel="StyleSheet" href="../demo/csfull.css" type="text/css" media="screen">
-</head>
-<body class="SmallFile">
-<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 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 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. 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 Derby.
-<ul>
-<li><a href="#network">The Derby Network Server framework</a>
-</ul>
-<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 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>
-</html>
+<!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 Derby's Frameworks
+</title>
+<link rel="StyleSheet" href="../demo/csfull.css" type="text/css" media="screen">
+</head>
+<body class="SmallFile">
+<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 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 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. 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 Derby.
+<ul>
+<li><a href="#network">The Derby Network Server framework</a>
+</ul>
+<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 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>
+</html>

Propchange: incubator/derby/code/branches/10.0/frameworks/readme.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java (original)
+++ incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java Wed Apr 20 16:51:52 2005
@@ -12,6 +12,7 @@
 import java.sql.SQLException;
 import java.sql.DriverManager;
 import java.io.IOException;
+import java.sql.Connection;
 import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -70,7 +71,7 @@
 	// To connect to Derby Network Server
 	// This URL describes the target database for type 4 connectivity
 	// Notice that the properties may be established via the URL syntax
-	private static final String CS_NS_DBURL= "jdbc:derby:net://localhost:"+NETWORKSERVER_PORT+"/NSSampledb;create=true:retrieveMessagesFromServerOnGetMessage=true;deferPrepares=true;";
+	private static final String CS_NS_DBURL= "jdbc:derby:net://localhost:"+NETWORKSERVER_PORT+"/NSSampledb;create=true;retrieveMessagesFromServerOnGetMessage=true;deferPrepares=true;";
 
 	public static void main(String[] args) throws Exception {
 
@@ -78,7 +79,7 @@
 
 	  // DB2Connection provides additional functionality than java.sql.Connection
 	  // One can use either depending on the requirements
-	  com.ibm.db2.jcc.DB2Connection conn = null;
+	  Connection conn = null;
 
 	  PrintWriter pw = null;
 
@@ -149,7 +150,8 @@
 
 		// Get database connection using the JCC client via DriverManager api
 		try	{
-			conn =  (com.ibm.db2.jcc.DB2Connection) DriverManager.getConnection(CS_NS_DBURL, properties);
+			
+			conn =  (Connection) DriverManager.getConnection(CS_NS_DBURL, properties);
 		} catch(Exception e) {
 			pw.println("[NsSample] Connection request unsuccessful, exception thrown was: ");
 			pw.println("[NsSample] Please check if all the jar files are in the classpath and the dbUrl is set correctly.");

Modified: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java (original)
+++ incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java Wed Apr 20 16:51:52 2005
@@ -319,7 +319,7 @@
 	 /**
 	  * Create necessary schema if schema not already created
 	  */
-	 public static void checkAndCreateSchema(com.ibm.db2.jcc.DB2Connection conn,PrintWriter pw) {
+	 public static void checkAndCreateSchema(Connection conn,PrintWriter pw) {
 		Statement stmt = null;
 		ResultSet rs = null;
 
@@ -378,7 +378,7 @@
 	 /**
 	  * Loads schema , inserts 'rowsToInsert' number of rows into the table
 	  */
-	 public static void loadSchema(com.ibm.db2.jcc.DB2Connection conn,int rowsToInsert,PrintWriter pw)	 {
+	 public static void loadSchema(Connection conn,int rowsToInsert,PrintWriter pw)	 {
 		 int insertsRemaining = rowsToInsert;
 		 PreparedStatement ps=null;
 

Modified: incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java?rev=162093&r1=162092&r2=162093&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java (original)
+++ incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java Wed Apr 20 16:51:52 2005
@@ -7,6 +7,7 @@
  */
 
 import java.sql.*;
+import java.lang.reflect.*;
 import javax.sql.DataSource;
 import java.util.Properties;
 import java.io.BufferedReader;
@@ -49,9 +50,10 @@
 	private static int NETWORKSERVER_PORT=1527;
 
 	/**
-	 * DB2 JDBC UNIVERSAL DRIVER class name
+	 * DB2 JDBC UNIVERSAL DRIVER class names
 	 */
 	private static final String DB2_JDBC_UNIVERSAL_DRIVER = "com.ibm.db2.jcc.DB2Driver";
+	private static final String DB2_JCC_DS = "com.ibm.db2.jcc.DB2SimpleDataSource";
 
 	/**
 	 * This URL is used to connect to Derby Network Server using the DriverManager.
@@ -138,27 +140,42 @@
 	 * @throws Exception if there is any error
 	 */
 	public static javax.sql.DataSource getClientDataSource(String database, String user, String
-									  password) throws SQLException
+									  password) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException
 	{
-
-		com.ibm.db2.jcc.DB2SimpleDataSource ds = new com.ibm.db2.jcc.DB2SimpleDataSource();
+		Class nsDataSource = Class.forName(DB2_JCC_DS);
+		DataSource ds = (DataSource) nsDataSource.newInstance();
 
 		// can also include Derby URL attributes along with the database name
-		ds.setDatabaseName(database);
-
-		if (user != null)
-			ds.setUser(user);
-		if (password != null)
-			ds.setPassword(password);
-
+		Class[] methodParams = new Class[] {String.class};
+		Method dbname = nsDataSource.getMethod("setDatabaseName", methodParams);
+		Object[] args = new Object[] {database};
+		dbname.invoke(ds, args);
+
+		if (user != null) {
+			Method setuser = nsDataSource.getMethod("setUser", methodParams);
+			args = new Object[] {user};
+			setuser.invoke(ds, args);
+		}
+		if (password != null) {
+			Method setpw = nsDataSource.getMethod("setPassword", methodParams);
+			args = new Object[] {password};
+			setpw.invoke(ds, args);
+		}
 		// host on which network server is running
-		ds.setServerName("localhost");
+		Method servername = nsDataSource.getMethod("setServerName", methodParams);
+		args = new Object[] {"localhost"};
+		servername.invoke(ds, args);
 
 		// port on which Network Server is listening
-		ds.setPortNumber(1527);
+		methodParams = new Class[] {int.class};
+		Method portnumber = nsDataSource.getMethod("setPortNumber", methodParams);
+		args = new Object[] {new Integer(1527)};
+		portnumber.invoke(ds, args);
 
 		// driver type must be 4 to access Derby Network Server
-		ds.setDriverType(4);
+		Method drivertype = nsDataSource.getMethod("setDriverType", methodParams);
+		args = new Object[] {new Integer(4)};
+		drivertype.invoke(ds, args);
 
 		return ds;
 
@@ -193,7 +210,7 @@
 		properties.setProperty("password","scape");
 
 		// Get database connection using the JCC client via DriverManager api
-		Connection conn =  (com.ibm.db2.jcc.DB2Connection) DriverManager.getConnection(CS_NS_DBURL, properties);
+		Connection conn = DriverManager.getConnection(CS_NS_DBURL,properties); 
 
 		return conn;
 	}