You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/11/18 23:56:51 UTC
svn commit: r1846875 - in /db/derby/code/trunk: bin/ bin/templates/
java/org.apache.derby.tools/
Author: rhillegas
Date: Sun Nov 18 23:56:51 2018
New Revision: 1846875
URL: http://svn.apache.org/viewvc?rev=1846875&view=rev
Log:
DERBY-7016: Add derbyshared.jar to the CLASSPATH set by the Derby *CP scripts and set the MODULEPATH variable correspondingly; commit derby-7016-01-ab-addSharedModule-setModulepath.diff.
Modified:
db/derby/code/trunk/bin/derby_common.bat
db/derby/code/trunk/bin/setEmbeddedCP
db/derby/code/trunk/bin/setEmbeddedCP.bat
db/derby/code/trunk/bin/setNetworkClientCP
db/derby/code/trunk/bin/setNetworkClientCP.bat
db/derby/code/trunk/bin/setNetworkServerCP
db/derby/code/trunk/bin/setNetworkServerCP.bat
db/derby/code/trunk/bin/templates/derby_common.sh
db/derby/code/trunk/java/org.apache.derby.tools/module-info.java
Modified: db/derby/code/trunk/bin/derby_common.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/derby_common.bat?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/derby_common.bat (original)
+++ db/derby/code/trunk/bin/derby_common.bat Sun Nov 18 23:56:51 2018
@@ -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;%DERBY_HOME%/lib/derbyoptionaltools.jar
+set LOCALCLASSPATH=%DERBY_HOME%/lib/derbyshared.jar;%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/trunk/bin/setEmbeddedCP
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setEmbeddedCP?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setEmbeddedCP (original)
+++ db/derby/code/trunk/bin/setEmbeddedCP Sun Nov 18 23:56:51 2018
@@ -23,4 +23,6 @@ if [ -z "$DERBY_HOME" ] ; then
return 1
fi
-export CLASSPATH="${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"
+
+export MODULEPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar"
Modified: db/derby/code/trunk/bin/setEmbeddedCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setEmbeddedCP.bat?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setEmbeddedCP.bat (original)
+++ db/derby/code/trunk/bin/setEmbeddedCP.bat Sun Nov 18 23:56:51 2018
@@ -22,7 +22,10 @@
@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
+
+set MODULEPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar
+
@goto end
:noderbyhome
Modified: db/derby/code/trunk/bin/setNetworkClientCP
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setNetworkClientCP?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setNetworkClientCP (original)
+++ db/derby/code/trunk/bin/setNetworkClientCP Sun Nov 18 23:56:51 2018
@@ -23,4 +23,6 @@ if [ -z "$DERBY_HOME" ] ; then
return 1
fi
-export CLASSPATH="${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar"
+
+export MODULEPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar"
Modified: db/derby/code/trunk/bin/setNetworkClientCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setNetworkClientCP.bat?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setNetworkClientCP.bat (original)
+++ db/derby/code/trunk/bin/setNetworkClientCP.bat Sun Nov 18 23:56:51 2018
@@ -22,7 +22,10 @@
@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
-set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar
+
+set MODULEPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar
+
@goto end
:noderbyhome
Modified: db/derby/code/trunk/bin/setNetworkServerCP
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setNetworkServerCP?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setNetworkServerCP (original)
+++ db/derby/code/trunk/bin/setNetworkServerCP Sun Nov 18 23:56:51 2018
@@ -23,4 +23,6 @@ if [ -z "$DERBY_HOME" ]; then
return 1
fi
-export CLASSPATH="${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"
+export CLASSPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar:${CLASSPATH}"
+
+export MODULEPATH="${DERBY_HOME}/lib/derbyshared.jar:${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${DERBY_HOME}/lib/derbyoptionaltools.jar"
Modified: db/derby/code/trunk/bin/setNetworkServerCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/setNetworkServerCP.bat?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/setNetworkServerCP.bat (original)
+++ db/derby/code/trunk/bin/setNetworkServerCP.bat Sun Nov 18 23:56:51 2018
@@ -22,7 +22,10 @@
@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_INSTALL=%%~sX
-set CLASSPATH=%DERBY_HOME%\lib\derbynet.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
+set CLASSPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derbynet.jar;%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar;%CLASSPATH%
+
+set MODULEPATH=%DERBY_HOME%\lib\derbyshared.jar;%DERBY_HOME%\lib\derbynet.jar;%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%/lib/derbyoptionaltools.jar
+
@goto end
:noderbyhome
Modified: db/derby/code/trunk/bin/templates/derby_common.sh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/templates/derby_common.sh?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/bin/templates/derby_common.sh (original)
+++ db/derby/code/trunk/bin/templates/derby_common.sh Sun Nov 18 23:56:51 2018
@@ -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/derbyoptionaltools.jar:$DERBY_LIB/derbyclient.jar
+LOCALCLASSPATH=$DERBY_LIB/derbyshared.jar:$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
Modified: db/derby/code/trunk/java/org.apache.derby.tools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/module-info.java?rev=1846875&r1=1846874&r2=1846875&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/module-info.java Sun Nov 18 23:56:51 2018
@@ -63,8 +63,6 @@ module org.apache.derby.tools
requires java.sql;
requires java.xml;
- requires org.apache.derby.engine;
- requires org.apache.derby.client;
requires org.apache.derby.commons;
//
@@ -73,6 +71,8 @@ module org.apache.derby.tools
// REQUIRED AT COMPILE-TIME.
// OPTIONAL AT RUN-TIME.
//
+ requires static org.apache.derby.engine;
+ requires static org.apache.derby.client;
requires static java.naming;
//