Attachment #91534 for bug #164300

Lines 24-30 Link Here

(-)serverruntime/scripts/unix/daemon.pl (-1 / +1 lines)
24	if ($isHelp == 0)	24	if ($isHelp == 0)
25	{	25	{
26	print("command usage:\n");	26	print("command usage:\n");
27	print("daemon.linux [<port> \| <low port>-<high port>] [ <low server port>-<high server port>]\n");	27	print("daemon.pl [<port> \| <low port>-<high port>] [ <low server port>-<high server port>]\n");
28	0;	28	0;
29	}	29	}
30	else	30	else

Lines 1-6 Link Here

(-)serverruntime/scripts/unix/server.sh (-4 / +27 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#*******************************************************************************	2	#*******************************************************************************
3	# Copyright (c) 2005, 2006 IBM Corporation, Wind River Systems, Inc. and others.	3	# Copyright (c) 2005, 2008 IBM Corporation, Wind River Systems, Inc. and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
Lines 10-22 Link Here
10	# IBM Corporation - initial API and implementation	10	# IBM Corporation - initial API and implementation
11	# Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement)	11	# Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement)
12	# Patrick Juhl - Fix for unix (Parameters for port selection)	12	# Patrick Juhl - Fix for unix (Parameters for port selection)
		13	# David McKnight (IBM) - Fix to handle timeout and clientUserID parameters
13	#*******************************************************************************	14	#*******************************************************************************
14	# Shell script to start an RSE communications server	15	# Shell script to start an RSE communications server
15	# This script will start the datastore server listening on an available socket	16	# This script will start the datastore server listening on an available socket
16	serverpath=.;	17	serverpath=.;
		18
17	CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;	19	CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
18	export serverpath CLASSPATH	20	export serverpath CLASSPATH
19	if [ $1 ]	21
20	then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $1 &	22	if [ $# -gt 3 ]
21	else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &	23	then
		24	echo "Usage: server.sh [port] [timeout] [clientUserID]"
		25	exit
22	fi	26	fi
		27
		28	port=0;
		29	timeout=60000;
		30	clientUserID=$USER;
		31
		32	if [ $# -gt 2 ]; then
		33	clientUserID=$3
		34	fi
		35	if [ $# -gt 1 ]; then
		36	timeout=$2
		37	fi
		38	if [ $# -gt 0 ]; then
		39	port=$1
		40	fi
		41
		42
		43	java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &
		44
		45

Lines 1-20 Link Here

(-)serverruntime/scripts/macosx/server.sh (-5 / +29 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#*******************************************************************************	2	#*******************************************************************************
3	# Copyright (c) 2005, 2006 IBM Corporation and others.	3	# Copyright (c) 2005, 2008 IBM Corporation, Wind River Systems, Inc. and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
7	# http://www.eclipse.org/legal/epl-v10.html	7	# http://www.eclipse.org/legal/epl-v10.html
8	#	8	#
9	# Contributors:	9	# Contributors:
10	# IBM Corporation - initial API and implementation	10	# IBM Corporation - initial API and implementation
		11	# Martin Oberhuber (Wind River) - Fix for solaris (Bourne Shell export statement)
		12	# Patrick Juhl - Fix for unix (Parameters for port selection)
		13	# David McKnight (IBM) - Fix to handle timeout and clientUserID parameters
11	#*******************************************************************************	14	#*******************************************************************************
12	# Shell script to start an RSE communications server	15	# Shell script to start an RSE communications server
13	# This script will start the datastore server listening on an available socket	16	# This script will start the datastore server listening on an available socket
14	serverpath=.;	17	serverpath=.;
		18
15	CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;	19	CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
16	export serverpath CLASSPATH	20	export serverpath CLASSPATH
17	if [ $1 ]	21
18	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 &	22	if [ $# -gt 3 ]
19	else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &	23	then
		24	echo "Usage: server.sh [port] [timeout] [clientUserID]"
		25	exit
20	fi	26	fi
		27
		28	port=0;
		29	timeout=60000;
		30	clientUserID=$USER;
		31
		32	if [ $# -gt 2 ]; then
		33	clientUserID=$3
		34	fi
		35	if [ $# -gt 1 ]; then
		36	timeout=$2
		37	fi
		38	if [ $# -gt 0 ]; then
		39	port=$1
		40	fi
		41
		42
		43	java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout &
		44





$port = $ARGV[0];
$timeout = $ARGV[1];
$clientUserID = $ARGV[2];
$clientUserID = $ARGV[3];


$dir= $ENV{PWD};
#print("path $dir");

$oldClasspath = $ENV{CLASSPATH};


$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))
{

Return to bug 164300

Lines 13-21 Link Here

(-)serverruntime/scripts/linux/server.pl (-15 / +2 lines)
13		13
14	$port = $ARGV[0];	14	$port = $ARGV[0];
15	$timeout = $ARGV[1];	15	$timeout = $ARGV[1];
16	$packaged_as = $ARGV[2];	16	$clientUserID = $ARGV[2];
17	$clientUserID = $ARGV[3];
18
19		17
20	$dir= $ENV{PWD};	18	$dir= $ENV{PWD};
21	#print("path $dir");	19	#print("path $dir");
Lines 28-45 Link Here
28	$oldClasspath = $ENV{CLASSPATH};	26	$oldClasspath = $ENV{CLASSPATH};
29		27
30		28
31	if ($packaged_as eq "jar")	29	$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";
32	{
33	$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";
34	}
35	if ($packaged_as eq "src")
36	{
37	$ENV{"CLASSPATH"}="$plugins_dir:$oldClasspath";
38	}
39	if (!defined($packaged_as))
40	{
41	$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";
42	}
43		30
44	if (!defined($timeout))	31	if (!defined($timeout))
45	{	32	{