Attachment 91534 Details for Bug 164300 – patch with suggestions from martin

[patch] patch with suggestions from martin

patch.txt (text/plain), 6.92 KB, created by David McKnight

on 2008-03-04 11:34:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-03-04 11:34:08 EST

Size: 6.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: serverruntime/scripts/unix/daemon.pl
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl,v
>retrieving revision 1.5
>diff -u -r1.5 daemon.pl
>--- serverruntime/scripts/unix/daemon.pl	27 Jun 2007 10:36:59 -0000	1.5
>+++ serverruntime/scripts/unix/daemon.pl	4 Mar 2008 16:32:12 -0000
>@@ -24,7 +24,7 @@
> if ($isHelp == 0)
> {
>    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;
> }
> else
>Index: serverruntime/scripts/unix/server.sh
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh,v
>retrieving revision 1.6
>diff -u -r1.6 server.sh
>--- serverruntime/scripts/unix/server.sh	3 Mar 2008 15:59:45 -0000	1.6
>+++ serverruntime/scripts/unix/server.sh	4 Mar 2008 16:32:12 -0000
>@@ -1,6 +1,6 @@
> #!/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
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -10,13 +10,36 @@
> # 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
> # This script will start the datastore server listening on an available socket
> serverpath=.;
>+
> CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$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 &
>+
>+if [ $# -gt 3 ]
>+then 
>+   echo "Usage: server.sh [port] [timeout] [clientUserID]"   
>+   exit
> fi
>+
>+port=0;
>+timeout=60000;
>+clientUserID=$USER;
>+
>+if [ $# -gt 2 ]; then
>+  clientUserID=$3
>+fi 
>+if [ $# -gt 1 ]; then 
>+  timeout=$2
>+fi
>+if [ $# -gt 0 ]; then
>+  port=$1
>+fi
>+
>+
>+java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &
>+
>+
>Index: serverruntime/scripts/macosx/server.sh
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh,v
>retrieving revision 1.3
>diff -u -r1.3 server.sh
>--- serverruntime/scripts/macosx/server.sh	6 Oct 2006 14:56:35 -0000	1.3
>+++ serverruntime/scripts/macosx/server.sh	4 Mar 2008 16:32:12 -0000
>@@ -1,20 +1,44 @@
> #!/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
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
> # http://www.eclipse.org/legal/epl-v10.html
> #
> # 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
> # This script will start the datastore server listening on an available socket
> serverpath=.;
>+
> CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$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 &
>+
>+if [ $# -gt 3 ]
>+then 
>+   echo "Usage: server.sh [port] [timeout] [clientUserID]"   
>+   exit
> fi
>+
>+port=0;
>+timeout=60000;
>+clientUserID=$USER;
>+
>+if [ $# -gt 2 ]; then
>+  clientUserID=$3
>+fi 
>+if [ $# -gt 1 ]; then 
>+  timeout=$2
>+fi
>+if [ $# -gt 0 ]; then
>+  port=$1
>+fi
>+
>+
>+java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &
>+
>Index: serverruntime/scripts/linux/server.pl
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl,v
>retrieving revision 1.4
>diff -u -r1.4 server.pl
>--- serverruntime/scripts/linux/server.pl	24 Oct 2006 14:09:11 -0000	1.4
>+++ serverruntime/scripts/linux/server.pl	4 Mar 2008 16:32:12 -0000
>@@ -13,9 +13,7 @@
> 
> $port = $ARGV[0];
> $timeout = $ARGV[1];
>-$packaged_as = $ARGV[2];
>-$clientUserID = $ARGV[3];
>-
>+$clientUserID = $ARGV[2];
> 
> $dir= $ENV{PWD};
> #print("path $dir");
>@@ -28,18 +26,7 @@
> $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";
>-}
>-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";
>-}
>+$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))
> {

Actions: View | Diff

Attachments on bug 164300: 80725 | 91521 | 91534