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 2006/09/15 21:42:36 UTC
svn commit: r446703 - /db/derby/code/branches/10.2/bin/
Author: rhillegas
Date: Fri Sep 15 12:42:35 2006
New Revision: 446703
URL: http://svn.apache.org/viewvc?view=rev&rev=446703
Log:
DERBY-1725: Merge the following patches from the trunk to the 10.2 branch: No JIRA (442737, 442677), DERBY-1032 (442674).
Modified:
db/derby/code/branches/10.2/bin/NetworkServerControl (props changed)
db/derby/code/branches/10.2/bin/NetworkServerControl.bat (contents, props changed)
db/derby/code/branches/10.2/bin/dblook (props changed)
db/derby/code/branches/10.2/bin/dblook.bat (contents, props changed)
db/derby/code/branches/10.2/bin/derby_common.bat (contents, props changed)
db/derby/code/branches/10.2/bin/derby_common.sh (contents, props changed)
db/derby/code/branches/10.2/bin/ij (props changed)
db/derby/code/branches/10.2/bin/ij.bat (contents, props changed)
db/derby/code/branches/10.2/bin/setEmbeddedCP (props changed)
db/derby/code/branches/10.2/bin/setEmbeddedCP.bat (contents, props changed)
db/derby/code/branches/10.2/bin/setNetworkClientCP (props changed)
db/derby/code/branches/10.2/bin/setNetworkClientCP.bat (contents, props changed)
db/derby/code/branches/10.2/bin/setNetworkServerCP (props changed)
db/derby/code/branches/10.2/bin/setNetworkServerCP.bat (contents, props changed)
db/derby/code/branches/10.2/bin/startNetworkServer (props changed)
db/derby/code/branches/10.2/bin/startNetworkServer.bat (contents, props changed)
db/derby/code/branches/10.2/bin/stopNetworkServer (contents, props changed)
db/derby/code/branches/10.2/bin/stopNetworkServer.bat (contents, props changed)
db/derby/code/branches/10.2/bin/sysinfo (props changed)
db/derby/code/branches/10.2/bin/sysinfo.bat (contents, props changed)
Propchange: db/derby/code/branches/10.2/bin/NetworkServerControl
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/NetworkServerControl.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/NetworkServerControl.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/NetworkServerControl.bat (original)
+++ db/derby/code/branches/10.2/bin/NetworkServerControl.bat Fri Sep 15 12:42:35 2006
@@ -1,36 +1,36 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
-
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
+
Propchange: db/derby/code/branches/10.2/bin/NetworkServerControl.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/dblook
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/dblook.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/dblook.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/dblook.bat (original)
+++ db/derby/code/branches/10.2/bin/dblook.bat Fri Sep 15 12:42:35 2006
@@ -1,36 +1,36 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.dblook %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.dblook %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
-
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.dblook %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.dblook %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
+
Propchange: db/derby/code/branches/10.2/bin/dblook.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Modified: db/derby/code/branches/10.2/bin/derby_common.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/derby_common.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/derby_common.bat (original)
+++ db/derby/code/branches/10.2/bin/derby_common.bat Fri Sep 15 12:42:35 2006
@@ -1,72 +1,72 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_DERBY_HOME=%~dp0..
-
-if "%DERBY_HOME%"=="" set DERBY_HOME=%DEFAULT_DERBY_HOME%
-set DEFAULT_DERBY_HOME=
-
-set _USE_CLASSPATH=yes
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-set DERBY_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-if ""%1""==""-noclasspath"" goto clearclasspath
-set DERBY_CMD_LINE_ARGS=%DERBY_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem here is there is a -noclasspath in the options
-:clearclasspath
-set _USE_CLASSPATH=no
-shift
-goto setupArgs
-
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-
-:doneStart
-rem check the value of DERBY_HOME
-if exist "%DERBY_HOME%\lib\derby.jar" goto setLocalClassPath
-
-:noAntHome
-echo DERBY_HOME is set incorrectly or derby.jar could not be located. Please set DERBY_HOME.
-goto end
-
-:setLocalClassPath
-set LOCALCLASSPATH=%DERBY_HOME%/lib/derby.jar;%DERBY_HOME%/lib/derbynet.jar;%DERBY_HOME%/lib/derbyclient.jar;%DERBY_HOME%/lib/derbytools.jar
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto endcommon
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-
-:endcommon
-
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_DERBY_HOME=%~dp0..
+
+if "%DERBY_HOME%"=="" set DERBY_HOME=%DEFAULT_DERBY_HOME%
+set DEFAULT_DERBY_HOME=
+
+set _USE_CLASSPATH=yes
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+set DERBY_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
+set DERBY_CMD_LINE_ARGS=%DERBY_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneStart
+rem check the value of DERBY_HOME
+if exist "%DERBY_HOME%\lib\derby.jar" goto setLocalClassPath
+
+:noAntHome
+echo DERBY_HOME is set incorrectly or derby.jar could not be located. Please set DERBY_HOME.
+goto end
+
+:setLocalClassPath
+set LOCALCLASSPATH=%DERBY_HOME%/lib/derby.jar;%DERBY_HOME%/lib/derbynet.jar;%DERBY_HOME%/lib/derbyclient.jar;%DERBY_HOME%/lib/derbytools.jar
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto endcommon
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+
+:endcommon
+
Propchange: db/derby/code/branches/10.2/bin/derby_common.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Modified: db/derby/code/branches/10.2/bin/derby_common.sh
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/derby_common.sh?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/derby_common.sh (original)
+++ db/derby/code/branches/10.2/bin/derby_common.sh Fri Sep 15 12:42:35 2006
@@ -160,3 +160,8 @@
;;
esac
fi
+
+# Readjust classpath for MKS
+if [ `expr index $SHELL sh.exe` -gt 0 ]; then
+ LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g'`
+fi
Propchange: db/derby/code/branches/10.2/bin/derby_common.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+LF
Propchange: db/derby/code/branches/10.2/bin/ij
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/ij.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/ij.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/ij.bat (original)
+++ db/derby/code/branches/10.2/bin/ij.bat Fri Sep 15 12:42:35 2006
@@ -1,36 +1,36 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.ij %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.ij %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
-
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.ij %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.ij %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
+
Propchange: db/derby/code/branches/10.2/bin/ij.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/setEmbeddedCP
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/setEmbeddedCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/setEmbeddedCP.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/setEmbeddedCP.bat (original)
+++ db/derby/code/branches/10.2/bin/setEmbeddedCP.bat Fri Sep 15 12:42:35 2006
@@ -1,33 +1,33 @@
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-@rem set DERBY_INSTALL=
-
-@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
-@if "%DERBY_HOME%"=="" goto noderbyhome
-
-@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
-
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
-@goto end
-
-:noderbyhome
-@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
-@echo to the location of your Derby installation.
-@goto end
-
-:end
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+@rem set DERBY_INSTALL=
+
+@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
+@if "%DERBY_HOME%"=="" goto noderbyhome
+
+@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
+
+set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
+@goto end
+
+:noderbyhome
+@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
+@echo to the location of your Derby installation.
+@goto end
+
+:end
Propchange: db/derby/code/branches/10.2/bin/setEmbeddedCP.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/setNetworkClientCP
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/setNetworkClientCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/setNetworkClientCP.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/setNetworkClientCP.bat (original)
+++ db/derby/code/branches/10.2/bin/setNetworkClientCP.bat Fri Sep 15 12:42:35 2006
@@ -1,33 +1,33 @@
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-@rem set DERBY_INSTALL=
-
-@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
-@if "%DERBY_HOME%"=="" goto noderbyhome
-
-@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
-
-set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
-@goto end
-
-:noderbyhome
-@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
-@echo to the location of your Derby installation.
-@goto end
-
-:end
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+@rem set DERBY_INSTALL=
+
+@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
+@if "%DERBY_HOME%"=="" goto noderbyhome
+
+@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_HOME=%%~sX
+
+set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbytools.jar;%CLASSPATH%
+@goto end
+
+:noderbyhome
+@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
+@echo to the location of your Derby installation.
+@goto end
+
+:end
Propchange: db/derby/code/branches/10.2/bin/setNetworkClientCP.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/setNetworkServerCP
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/setNetworkServerCP.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/setNetworkServerCP.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/setNetworkServerCP.bat (original)
+++ db/derby/code/branches/10.2/bin/setNetworkServerCP.bat Fri Sep 15 12:42:35 2006
@@ -1,32 +1,32 @@
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-@rem set DERBY_INSTALL=
-
-@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
-@if "%DERBY_HOME%"=="" goto noderbyhome
-
-@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_INSTALL=%%~sX
-
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%
-@goto end
-
-:noderbyhome
-@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
-@echo to the location of your Derby installation.
-
-:end
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+@rem set DERBY_INSTALL=
+
+@if "%DERBY_HOME%"=="" set DERBY_HOME=%DERBY_INSTALL%
+@if "%DERBY_HOME%"=="" goto noderbyhome
+
+@FOR %%X in ("%DERBY_HOME%") DO SET DERBY_INSTALL=%%~sX
+
+set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbytools.jar;%DERBY_HOME%\lib\derbynet.jar;%CLASSPATH%
+@goto end
+
+:noderbyhome
+@echo DERBY_HOME or DERBY_INSTALL not set. Set one of these variables
+@echo to the location of your Derby installation.
+
+:end
Propchange: db/derby/code/branches/10.2/bin/setNetworkServerCP.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/startNetworkServer
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/startNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/startNetworkServer.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/startNetworkServer.bat (original)
+++ db/derby/code/branches/10.2/bin/startNetworkServer.bat Fri Sep 15 12:42:35 2006
@@ -1,35 +1,35 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl start
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
Propchange: db/derby/code/branches/10.2/bin/startNetworkServer.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Modified: db/derby/code/branches/10.2/bin/stopNetworkServer
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/stopNetworkServer?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/stopNetworkServer (original)
+++ db/derby/code/branches/10.2/bin/stopNetworkServer Fri Sep 15 12:42:35 2006
@@ -25,5 +25,5 @@
. $DERBY_HOME/bin/derby_common.sh
-derby_exec_command="exec \"$JAVACMD\" $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl stop"
+derby_exec_command="exec \"$JAVACMD\" $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown"
eval $derby_exec_command
Propchange: db/derby/code/branches/10.2/bin/stopNetworkServer
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/stopNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/stopNetworkServer.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/stopNetworkServer.bat (original)
+++ db/derby/code/branches/10.2/bin/stopNetworkServer.bat Fri Sep 15 12:42:35 2006
@@ -1,35 +1,35 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.drda.NetworkServerControl shutdown
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
Propchange: db/derby/code/branches/10.2/bin/stopNetworkServer.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF
Propchange: db/derby/code/branches/10.2/bin/sysinfo
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: db/derby/code/branches/10.2/bin/sysinfo.bat
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/sysinfo.bat?view=diff&rev=446703&r1=446702&r2=446703
==============================================================================
--- db/derby/code/branches/10.2/bin/sysinfo.bat (original)
+++ db/derby/code/branches/10.2/bin/sysinfo.bat Fri Sep 15 12:42:35 2006
@@ -1,36 +1,36 @@
-@echo off
-
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-
-@REM http://www.apache.org/licenses/LICENSE-2.0
-
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-
-CALL %~dp0derby_common.bat %*
-
-if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
-if not "%CLASSPATH%"=="" goto runWithClasspath
-
-:runNoClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.sysinfo %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:runWithClasspath
-"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.sysinfo %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set DERBY_CMD_LINE_ARGS=
-
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+
+@REM http://www.apache.org/licenses/LICENSE-2.0
+
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+CALL %~dp0derby_common.bat %*
+
+if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
+if not "%CLASSPATH%"=="" goto runWithClasspath
+
+:runNoClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%LOCALCLASSPATH%" org.apache.derby.tools.sysinfo %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:runWithClasspath
+"%_JAVACMD%" %DERBY_OPTS% -classpath "%CLASSPATH%;%LOCALCLASSPATH%" org.apache.derby.tools.sysinfo %DERBY_ARGS% %DERBY_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set DERBY_CMD_LINE_ARGS=
+
Propchange: db/derby/code/branches/10.2/bin/sysinfo.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Sep 15 12:42:35 2006
@@ -1 +1 @@
-native
+CRLF