mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-12 10:45:37 +02:00
Code Issues Wiki Activity

[164300] Fix to handle timeout and clientUserID parameters

Browse source
This commit is contained in:
David McKnight 2008-03-04 16:45:20 +00:00
parent e2d2d5b725
commit 14a9495ad6
4 changed files with 58 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl
View file

@ -13,9 +13,7 @@
$port = $ARGV[0]; $port = $ARGV[0];
$timeout = $ARGV[1]; $timeout = $ARGV[1];
$packaged_as = $ARGV[2]; $clientUserID = $ARGV[2];
$clientUserID = $ARGV[3];
$dir= $ENV{PWD}; $dir= $ENV{PWD};
#print("path $dir"); #print("path $dir");
@ -28,18 +26,7 @@ $ENV{A_PLUGIN_PATH}="$plugins_dir/";
$oldClasspath = $ENV{CLASSPATH}; $oldClasspath = $ENV{CLASSPATH};
if ($packaged_as eq "jar") $ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
{
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
}
if ($packaged_as eq "src")
{
$ENV{"CLASSPATH"}="$plugins_dir:$oldClasspath";
}
if (!defined($packaged_as))
{
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
}
if (!defined($timeout)) if (!defined($timeout))
{ {

34
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh
View file

@ -1,20 +1,44 @@
#!/bin/sh #!/bin/sh
#******************************************************************************* #*******************************************************************************
# Copyright (c) 2005, 2006 IBM Corporation and others. # Copyright (c) 2005, 2008 IBM Corporation, Wind River Systems, Inc. and others.
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html # http://www.eclipse.org/legal/epl-v10.html
# #
# Contributors: # Contributors:
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
# Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement)
# Patrick Juhl - Fix for unix (Parameters for port selection)
# David McKnight (IBM) - Fix to handle timeout and clientUserID parameters
#******************************************************************************* #*******************************************************************************
# Shell script to start an RSE communications server # Shell script to start an RSE communications server
# This script will start the datastore server listening on an available socket # This script will start the datastore server listening on an available socket
serverpath=.; serverpath=.;
CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH; CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
export serverpath CLASSPATH export serverpath CLASSPATH
if [ $1 ]
then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 & port=0;
timeout=60000;
clientUserID=$USER;
if [ $# -gt 2 ]; then
clientUserID=$3
fi
if [ $# -gt 1 ]; then
timeout=$2
fi fi
if [ $# -gt 0 ]; then
port=$1
fi
case x$port in
x-h*) echo "Usage: server.sh [port] [timeout] [clientUserId]"
exit 0
;;
esac
java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &

2
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl
View file

@ -24,7 +24,7 @@ $isHelp = $helpFlag cmp $port;
if ($isHelp == 0) if ($isHelp == 0)
{ {
print("command usage:\n"); print("command usage:\n");
print("daemon.linux [<port> | <low port>-<high port>] [ <low server port>-<high server port>]\n"); print("daemon.pl [<port> | <low port>-<high port>] [ <low server port>-<high server port>]\n");
0; 0;
} }
else else

30
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#******************************************************************************* #*******************************************************************************
# Copyright (c) 2005, 2006 IBM Corporation, Wind River Systems, Inc. and others. # Copyright (c) 2005, 2008 IBM Corporation, Wind River Systems, Inc. and others.
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # which accompanies this distribution, and is available at
@ -10,13 +10,35 @@
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
# Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement) # Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement)
# Patrick Juhl - Fix for unix (Parameters for port selection) # Patrick Juhl - Fix for unix (Parameters for port selection)
# David McKnight (IBM) - Fix to handle timeout and clientUserID parameters
#******************************************************************************* #*******************************************************************************
# Shell script to start an RSE communications server # Shell script to start an RSE communications server
# This script will start the datastore server listening on an available socket # This script will start the datastore server listening on an available socket
serverpath=.; serverpath=.;
CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH; CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
export serverpath CLASSPATH export serverpath CLASSPATH
if [ $1 ]
then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $1 &
else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 & port=0;
timeout=60000;
clientUserID=$USER;
if [ $# -gt 2 ]; then
clientUserID=$3
fi
if [ $# -gt 1 ]; then
timeout=$2
fi fi
if [ $# -gt 0 ]; then
port=$1
fi
case x$port in
x-h*) echo "Usage: server.sh [port] [timeout] [clientUserId]"
exit 0
;;
esac
java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &