db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r430681 - in /db/derby/code/trunk/frameworks: NetworkServer/bin/ embedded/bin/
Date Fri, 11 Aug 2006 05:29:53 GMT
Author: fuzzylogic
Date: Thu Aug 10 22:29:52 2006
New Revision: 430681

URL: http://svn.apache.org/viewvc?rev=430681&view=rev
Log:
DERBY-1597: set classpath in frameworks scripts from the value of DERBY_HOME instead of
sourcing the set*CP scripts. This prevents an accumulation of multiple Derby jar files in
the classpath after multiple runs of the scripts.

Committed for Ramandeep Kaur <ramandhindsa@gmail.com>

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

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.bat Thu Aug 10 22:29:52
2006
@@ -36,13 +36,10 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-
 @REM ---------------------------------------------------------
 @REM -- start Derby as a Network server
 @REM ---------------------------------------------------------
-"%JAVA_HOME%\bin\java" org.apache.derby.drda.NetworkServerControl %*
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%"
org.apache.derby.drda.NetworkServerControl %*
 @goto end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/NetworkServerControl.ksh Thu Aug 10 22:29:52
2006
@@ -48,15 +48,11 @@
   }
 } 
 
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
 # ---------------------------------------------------------
 # -- start Derby Network Server
 # ---------------------------------------------------------
 
-"$JAVA_HOME/bin/java" org.apache.derby.drda.NetworkServerControl $*
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbynet.jar:${CLASSPATH}"
org.apache.derby.drda.NetworkServerControl $*
 
 
 # ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.bat Thu Aug 10 22:29:52 2006
@@ -35,13 +35,10 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-
 @REM ---------------------------------------------------------
 @REM -- start dblook
 @REM ---------------------------------------------------------
-"%JAVA_HOME%\bin\java" org.apache.derby.tools.dblook %*
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%"
org.apache.derby.tools.dblook %*
 @GOTO end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/dblook.ksh Thu Aug 10 22:29:52 2006
@@ -48,14 +48,10 @@
   }
 } 
 
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
-}
-
 # ---------------------------------------------------------
 # -- start dblook
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/java" org.apache.derby.tools.dblook $@
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
org.apache.derby.tools.dblook $@
 
 # ---------------------------------------------------------
 # -- To use a different JVM with a different syntax, simply edit

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/ij.bat Thu Aug 10 22:29:52 2006
@@ -38,9 +38,6 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkClientCP.bat
-
 set IJ_HOST=localhost
 set IJ_PORT=1527
 set IJ_USER=APP
@@ -50,8 +47,7 @@
 @REM -- start ij
 @REM -- host, port, user and password may need to be changed
 @REM ---------------------------------------------------------
-@echo on
-"%JAVA_HOME%\bin\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
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%"
-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
 @goto end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/ij.ksh Thu Aug 10 22:29:52 2006
@@ -48,10 +48,6 @@
   }
 } 
 
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkClientCP.ksh
-}
- 
 export IJ_HOST=localhost
 export IJ_PORT=1527
 export IJ_USER=APP
@@ -60,7 +56,7 @@
 # ---------------------------------------------------------
 # -- start ij
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/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
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
-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

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkClientCP.bat Thu Aug 10 22:29:52
2006
@@ -25,8 +25,8 @@
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
-
-@rem set DERBY_INSTALL=
+@echo off
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/setNetworkServerCP.bat Thu Aug 10 22:29:52
2006
@@ -25,8 +25,8 @@
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
-
-@rem set DERBY_INSTALL=
+@echo off
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.bat Thu Aug 10 22:29:52
2006
@@ -18,7 +18,7 @@
 @REM ---------------------------------------------------------
 
 @echo off
-@rem set DERBY_INSTALL=
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome
@@ -26,9 +26,6 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-
 :set_host
 
 if "%1" == "" goto setServerHost
@@ -64,7 +61,7 @@
 @REM ---------------------------------------------------------
 @REM -- start Derby as a Network server
 @REM ---------------------------------------------------------
-"%JAVA_HOME%\bin\java" org.apache.derby.drda.NetworkServerControl start -h %derbyHost% -p
%derbyPort%
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%"
org.apache.derby.drda.NetworkServerControl start -h %derbyHost% -p %derbyPort%
 
 goto end
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/startNetworkServer.ksh Thu Aug 10 22:29:52
2006
@@ -51,11 +51,6 @@
   }
 }
 
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
-
 # ---------------------------------------------------------
 # -- Determine the host and port to use by:
 # --  1. Check to see if the host and port are set on the command line
@@ -83,7 +78,7 @@
    DERBY_SERVER_PORT=1527
 fi
 
-"$JAVA_HOME/bin/java" org.apache.derby.drda.NetworkServerControl start -h $DERBY_SERVER_HOST
-p $DERBY_SERVER_PORT
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbynet.jar:${CLASSPATH}"
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

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.bat Thu Aug 10 22:29:52
2006
@@ -25,7 +25,7 @@
 @REM ---------------------------------------------------------
 
 @echo off
-@rem set DERBY_INSTALL=
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome
@@ -33,9 +33,6 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-
 :set_host
 
 if "%1" == "" goto setServerHost
@@ -71,7 +68,7 @@
 @REM ---------------------------------------------------------
 @REM -- shutdown Derby as a Network server
 @REM ---------------------------------------------------------
-%JAVA_HOME%\bin\java org.apache.derby.drda.NetworkServerControl shutdown -h %derbyHost% -p
%derbyPort%
+%JAVA_HOME%\bin\java -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%"
org.apache.derby.drda.NetworkServerControl shutdown -h %derbyHost% -p %derbyPort%
 
 goto end
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/stopNetworkServer.ksh Thu Aug 10 22:29:52
2006
@@ -51,10 +51,6 @@
   }
 }
  
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
 # ---------------------------------------------------------
 # -- Determine the host and port to use by:
 # --  1. Check to see if the host and port are set on the command line
@@ -82,7 +78,7 @@
    DERBY_SERVER_PORT=1527
 fi
 
-"$JAVA_HOME/bin/java" org.apache.derby.drda.NetworkServerControl shutdown -h $DERBY_SERVER_HOST
-p $DERBY_SERVER_PORT
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbynet.jar:${CLASSPATH}"
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

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.bat Thu Aug 10 22:29:52 2006
@@ -38,13 +38,10 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/NetworkServer/bin/setNetworkServerCP.bat
-
 @REM ---------------------------------------------------------
 @REM -- start sysinfo
 @REM ---------------------------------------------------------
-"%JAVA_HOME%\bin\java" org.apache.derby.drda.NetworkServerControl sysinfo %*
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%"
org.apache.derby.drda.NetworkServerControl sysinfo
 @GOTO end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh (original)
+++ db/derby/code/trunk/frameworks/NetworkServer/bin/sysinfo.ksh Thu Aug 10 22:29:52 2006
@@ -54,14 +54,10 @@
   }
 }
  
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/NetworkServer/bin/setNetworkServerCP.ksh
-}
-
 # ---------------------------------------------------------
 # -- start sysinfo
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/java" org.apache.derby.drda.NetworkServerControl sysinfo $*
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbynet.jar:${CLASSPATH}"
org.apache.derby.drda.NetworkServerControl sysinfo $*
 # ---------------------------------------------------------
 # -- To use a different JVM with a different syntax, simply edit
 # -- this file

Modified: db/derby/code/trunk/frameworks/embedded/bin/dblook.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/dblook.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/dblook.bat (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/dblook.bat Thu Aug 10 22:29:52 2006
@@ -35,13 +35,11 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@if !"%CLASSPATH%"==! call "%DERBY_HOME%"/frameworks/embedded/bin/setEmbeddedCP.bat
-@if "%CLASSPATH%" == "" call "%DERBY_HOME%"/frameworks/embedded/bin/setEmbeddedCP.bat
 
 @REM ---------------------------------------------------------
 @REM -- start dblook
 @REM ---------------------------------------------------------
-"%JAVA_HOME%\bin\java" org.apache.derby.tools.dblook %*
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%"
org.apache.derby.tools.dblook %*
 @GOTO end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/embedded/bin/dblook.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/dblook.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/dblook.ksh (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/dblook.ksh Thu Aug 10 22:29:52 2006
@@ -47,15 +47,11 @@
     exit 1
   }
 }
- 
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
+
 # ---------------------------------------------------------
 # -- start dblook
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/java" org.apache.derby.tools.dblook $@
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
org.apache.derby.tools.dblook $@
 
 # ---------------------------------------------------------
 # -- To use a different JVM with a different syntax, simply edit

Modified: db/derby/code/trunk/frameworks/embedded/bin/ij.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/ij.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/ij.bat (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/ij.bat Thu Aug 10 22:29:52 2006
@@ -35,13 +35,10 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@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_HOME%\bin\java" -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%"
-Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
 @goto end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/embedded/bin/ij.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/ij.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/ij.ksh (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/ij.ksh Thu Aug 10 22:29:52 2006
@@ -48,14 +48,10 @@
   }
 }
  
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
 # ---------------------------------------------------------
 # -- start ij
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/java" -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
-Dij.protocol=jdbc:derby: org.apache.derby.tools.ij
 
 # ---------------------------------------------------------
 # -- To use a different JVM with a different syntax, simply edit

Modified: db/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/setEmbeddedCP.bat Thu Aug 10 22:29:52 2006
@@ -25,8 +25,8 @@
 @REM -- This file for use on Windows systems
 @REM -- 
 @REM ---------------------------------------------------------
-
-@rem set DERBY_INSTALL=
+@echo off
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome

Modified: db/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/sysinfo.bat Thu Aug 10 22:29:52 2006
@@ -30,7 +30,7 @@
 @REM -- This file for use on Windows systems
 @REM ---------------------------------------------------------
 @echo off
-@rem set DERBY_INSTALL=
+rem set DERBY_INSTALL=
 
 @if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
 @if "%DERBY_HOME%"=="" goto noderbyhome
@@ -38,13 +38,10 @@
 @if "%JAVA_HOME%"=="" goto nojavahome
 @if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 
-@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_HOME%\bin\java" org.apache.derby.tools.sysinfo
+"%JAVA_HOME%\bin\java" -cp "%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%"
org.apache.derby.tools.sysinfo
 @GOTO end
 
 @REM ---------------------------------------------------------

Modified: db/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh?rev=430681&r1=430680&r2=430681&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh (original)
+++ db/derby/code/trunk/frameworks/embedded/bin/sysinfo.ksh Thu Aug 10 22:29:52 2006
@@ -52,14 +52,10 @@
   }
 }
  
-[ -z "$CLASSPATH" ] && {
-  . "$DERBY_HOME"/frameworks/embedded/bin/setEmbeddedCP.ksh
-}
- 
 # ---------------------------------------------------------
 # -- start sysinfo
 # ---------------------------------------------------------
-"$JAVA_HOME/bin/java" org.apache.derby.tools.sysinfo
+"$JAVA_HOME/bin/java" -cp "${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
org.apache.derby.tools.sysinfo
 
 # ---------------------------------------------------------
 # -- To use a different JVM with a different syntax, simply edit



Mime
View raw message