db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1626846 - in /db/derby/code/branches/10.11: ./ bin/derby_common.bat bin/setEmbeddedCP bin/setEmbeddedCP.bat bin/setNetworkClientCP bin/setNetworkClientCP.bat bin/setNetworkServerCP bin/setNetworkServerCP.bat bin/templates/derby_common.sh
Date Mon, 22 Sep 2014 17:18:20 GMT
Author: myrnavl
Date: Mon Sep 22 17:18:19 2014
New Revision: 1626846

URL: http://svn.apache.org/r1626846
Log:
DERBY-6719; https://svn.apache.org/repos/asf/db/derby/code/trunk
   merge of revision 1626094; adding the derboptionaltools.jar to source bin and bin/templates
files.

Modified:
    db/derby/code/branches/10.11/   (props changed)
    db/derby/code/branches/10.11/bin/derby_common.bat
    db/derby/code/branches/10.11/bin/setEmbeddedCP
    db/derby/code/branches/10.11/bin/setEmbeddedCP.bat
    db/derby/code/branches/10.11/bin/setNetworkClientCP
    db/derby/code/branches/10.11/bin/setNetworkClientCP.bat
    db/derby/code/branches/10.11/bin/setNetworkServerCP
    db/derby/code/branches/10.11/bin/setNetworkServerCP.bat
    db/derby/code/branches/10.11/bin/templates/derby_common.sh

Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1626094,1626825

Modified: db/derby/code/branches/10.11/bin/derby_common.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/derby_common.bat?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/derby_common.bat (original)
+++ db/derby/code/branches/10.11/bin/derby_common.bat Mon Sep 22 17:18:19 2014
@@ -56,7 +56,7 @@ echo Please set the DERBY_HOME environme
 goto endcommon
 
 :setLocalClassPath
-set LOCALCLASSPATH=%DERBY_HOME%/lib/derby.jar;%DERBY_HOME%/lib/derbynet.jar;%DERBY_HOME%/lib/derbyclient.jar;%DERBY_HOME%/lib/derbytools.jar
+set LOCALCLASSPATH=%DERBY_HOME%/lib/derby.jar;%DERBY_HOME%/lib/derbynet.jar;%DERBY_HOME%/lib/derbyclient.jar;%DERBY_HOME%/lib/derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar
 
 :checkJava
 set _JAVACMD=%JAVACMD%

Modified: db/derby/code/branches/10.11/bin/setEmbeddedCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setEmbeddedCP?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setEmbeddedCP (original)
+++ db/derby/code/branches/10.11/bin/setEmbeddedCP Mon Sep 22 17:18:19 2014
@@ -23,4 +23,4 @@ if [ -z "$DERBY_HOME" ] ; then
   return 1
 fi
 
-export CLASSPATH="${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"

Modified: db/derby/code/branches/10.11/bin/setEmbeddedCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setEmbeddedCP.bat?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setEmbeddedCP.bat (original)
+++ db/derby/code/branches/10.11/bin/setEmbeddedCP.bat Mon Sep 22 17:18:19 2014
@@ -22,7 +22,7 @@
 
 @FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
 
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
 @goto end
 
 :noderbyhome

Modified: db/derby/code/branches/10.11/bin/setNetworkClientCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setNetworkClientCP?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setNetworkClientCP (original)
+++ db/derby/code/branches/10.11/bin/setNetworkClientCP Mon Sep 22 17:18:19 2014
@@ -23,4 +23,4 @@ if [ -z "$DERBY_HOME" ] ; then
   return 1
 fi
 
-export CLASSPATH="${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"

Modified: db/derby/code/branches/10.11/bin/setNetworkClientCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setNetworkClientCP.bat?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setNetworkClientCP.bat (original)
+++ db/derby/code/branches/10.11/bin/setNetworkClientCP.bat Mon Sep 22 17:18:19 2014
@@ -22,7 +22,7 @@
 
 @FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
 
-set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
 @goto end
 
 :noderbyhome

Modified: db/derby/code/branches/10.11/bin/setNetworkServerCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setNetworkServerCP?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setNetworkServerCP (original)
+++ db/derby/code/branches/10.11/bin/setNetworkServerCP Mon Sep 22 17:18:19 2014
@@ -23,4 +23,4 @@ if [ -z "$DERBY_HOME" ]; then
   return 1
 fi
 
-export CLASSPATH="${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"

Modified: db/derby/code/branches/10.11/bin/setNetworkServerCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/setNetworkServerCP.bat?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/setNetworkServerCP.bat (original)
+++ db/derby/code/branches/10.11/bin/setNetworkServerCP.bat Mon Sep 22 17:18:19 2014
@@ -22,7 +22,7 @@
 
 @FOR %%X in ("%DERBY_HOME%") DO SET DERBY_INSTALL=%%~sX
 
-set CLASSPATH=%DERBY_HOME%\lib\derbynet.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derbynet.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
 @goto end
 
 :noderbyhome

Modified: db/derby/code/branches/10.11/bin/templates/derby_common.sh
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/bin/templates/derby_common.sh?rev=1626846&r1=1626845&r2=1626846&view=diff
==============================================================================
--- db/derby/code/branches/10.11/bin/templates/derby_common.sh (original)
+++ db/derby/code/branches/10.11/bin/templates/derby_common.sh Mon Sep 22 17:18:19 2014
@@ -89,7 +89,7 @@ if [ ! -x "$JAVACMD" ] ; then
 fi
 
 # set local classpath, don't overwrite the user's
-LOCALCLASSPATH=$DERBY_LIB/derby.jar:$DERBY_LIB/derbynet.jar:$DERBY_LIB/derbytools.jar:$DERBY_LIB/derbyclient.jar
+LOCALCLASSPATH=$DERBY_LIB/derby.jar:$DERBY_LIB/derbynet.jar:$DERBY_LIB/derbytools.jar:$DERBY_LIB/derbyoptionaltools.jar:$DERBY_LIB/derbyclient.jar
 
 
 # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be



Mime
View raw message