Attached are the changes for Derby-248.
I validated that ij, dblook and the NetworkServer start happily and i could create a database and dump its contents.
-- Lance Andersen email: [EMAIL PROTECTED] Sun Microsystems Inc. phone: (781) 442-2037 1 Network Drive, UBUR02-301 fax : (781) 442-1610 Burlington, MA 01803
Index: ij.ksh
===================================================================
--- ij.ksh (revision 168122)
+++ ij.ksh (working copy)
@@ -25,7 +25,7 @@
# ---------------------------------------------------------
# -- 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
+java -Dij.driver=org.apache.derby.jdbc.ClientDriver
-Dij.protocol=jdbc:derby://$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
Index: setNetworkClientCP.bat
===================================================================
--- setNetworkClientCP.bat (revision 168122)
+++ setNetworkClientCP.bat (working copy)
@@ -14,4 +14,4 @@
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%
+set
CLASSPATH=%DERBY_INSTALL%\lib\derby.jar;%DERBY_INSTALL%\lib\derbytools.jar;%DERBY_INSTALL%\lib\derbyclient.jar;%CLASSPATH%
Index: ij.bat
===================================================================
--- ij.bat (revision 168122)
+++ ij.bat (working copy)
@@ -28,7 +28,7 @@
@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
+java -Dij.driver=org.apache.derby.jdbc.ClientDriver
-Dij.protocol=jdbc:derby://%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
Index: setNetworkClientCP.ksh
===================================================================
--- setNetworkClientCP.ksh (revision 168122)
+++ setNetworkClientCP.ksh (working copy)
@@ -11,4 +11,4 @@
# ---------------------------------------------------------
# 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}"
+export
CLASSPATH="${DERBY_INSTALL}/lib/derby.jar:${DERBY_INSTALL}/lib/derbytools.jar:${DERBY_INSTALL}/lib/derbyclient.jar:${CLASSPATH}"
