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 kr...@apache.org on 2010/02/24 11:11:33 UTC
svn commit: r915736 - in /db/derby/code/branches/10.4: ./
bin/startNetworkServer.bat bin/stopNetworkServer.bat
Author: kristwaa
Date: Wed Feb 24 10:11:33 2010
New Revision: 915736
URL: http://svn.apache.org/viewvc?rev=915736&view=rev
Log:
DERBY-3507: startNetworkServer and stopNetworkServer don't pass arguments
Merged fix from trunk (r915733).
Modified:
db/derby/code/branches/10.4/ (props changed)
db/derby/code/branches/10.4/bin/startNetworkServer.bat
db/derby/code/branches/10.4/bin/stopNetworkServer.bat
Propchange: db/derby/code/branches/10.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 10:11:33 2010
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.5:814216
-/db/derby/code/trunk:788436,793588,794303,796316,796372,797147,798347,798742,800523,803548,805696,809643,812669,816536,835286,882732
+/db/derby/code/trunk:788436,793588,794303,796316,796372,797147,798347,798742,800523,803548,805696,809643,812669,816536,835286,882732,915733
Modified: db/derby/code/branches/10.4/bin/startNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/bin/startNetworkServer.bat?rev=915736&r1=915735&r2=915736&view=diff
==============================================================================
--- db/derby/code/branches/10.4/bin/startNetworkServer.bat (original)
+++ db/derby/code/branches/10.4/bin/startNetworkServer.bat Wed Feb 24 10:11:33 2010
@@ -25,7 +25,7 @@
if not "%CLASSPATH%"=="" goto runWithClasspath
:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start %DERBY_CMD_LINE_ARGS%
goto end
:runWithClasspath
Modified: db/derby/code/branches/10.4/bin/stopNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/bin/stopNetworkServer.bat?rev=915736&r1=915735&r2=915736&view=diff
==============================================================================
--- db/derby/code/branches/10.4/bin/stopNetworkServer.bat (original)
+++ db/derby/code/branches/10.4/bin/stopNetworkServer.bat Wed Feb 24 10:11:33 2010
@@ -25,7 +25,7 @@
if not "%CLASSPATH%"=="" goto runWithClasspath
:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown %DERBY_CMD_LINE_ARGS%
goto end
:runWithClasspath