|
 |
c242d6 |
diff -up ./serverruntime/data/ssl.properties.fix ./serverruntime/data/ssl.properties
|
|
|
c242d6 |
--- ./serverruntime/data/ssl.properties.fix 2011-12-14 17:55:18.000000000 -0500
|
|
|
c242d6 |
+++ ./serverruntime/data/ssl.properties 2011-12-14 17:59:39.000000000 -0500
|
|
|
c242d6 |
@@ -38,7 +38,12 @@ disable_server_ssl=false
|
|
|
c242d6 |
###################################
|
|
|
c242d6 |
# The keystore file and password need to be specified for the
|
|
|
c242d6 |
# server to use. If none is specified, the server falls back
|
|
|
c242d6 |
-# to use the same keystore and password as the daemon
|
|
|
c242d6 |
+# to use the same keystore and password as the daemon. Note
|
|
|
c242d6 |
+# that the server uses the home directory of the userid as its
|
|
|
c242d6 |
+# working directory so a relative path will only work for both
|
|
|
c242d6 |
+# daemon and server if the keystore file is copied. A full path
|
|
|
c242d6 |
+# is required to share a single keystore file between server and
|
|
|
c242d6 |
+# daemon.
|
|
|
c242d6 |
#
|
|
|
c242d6 |
#server_keystore_file=
|
|
|
c242d6 |
-#server_keystore_password=
|
|
|
c242d6 |
\ No newline at end of file
|
|
|
c242d6 |
+#server_keystore_password=
|
|
|
c242d6 |
diff -up ./serverruntime/scripts/linux/daemon.pl.fix ./serverruntime/scripts/linux/daemon.pl
|
|
|
c242d6 |
--- ./serverruntime/scripts/linux/daemon.pl.fix 2011-12-05 18:58:17.000000000 -0500
|
|
|
c242d6 |
+++ ./serverruntime/scripts/linux/daemon.pl 2011-12-13 19:02:13.000000000 -0500
|
|
|
c242d6 |
@@ -43,16 +43,17 @@ else
|
|
|
c242d6 |
$trace = $ENV{DSTORE_TRACING_ON};
|
|
|
c242d6 |
}
|
|
|
c242d6 |
|
|
|
c242d6 |
- $dir= $ENV{PWD};
|
|
|
c242d6 |
- $plugins_dir=$dir;
|
|
|
c242d6 |
+ $dir= "$ENV{PWD}";
|
|
|
c242d6 |
+ $configdir= "/etc/sysconfig/rseserver/";
|
|
|
c242d6 |
+ $plugins_dir="/usr/share/java/eclipse-rse-server";
|
|
|
c242d6 |
|
|
|
c242d6 |
- $ENV{A_PLUGIN_PATH}="$plugins_dir/";
|
|
|
c242d6 |
+ $ENV{A_PLUGIN_PATH}="$dir/";
|
|
|
c242d6 |
|
|
|
c242d6 |
|
|
|
c242d6 |
$oldClasspath = $ENV{CLASSPATH};
|
|
|
c242d6 |
|
|
|
c242d6 |
|
|
|
c242d6 |
- $ENV{CLASSPATH}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar";
|
|
|
c242d6 |
+ $ENV{CLASSPATH}="$dir:$configdir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar";
|
|
|
c242d6 |
if (defined ($oldClasspath))
|
|
|
c242d6 |
{
|
|
|
c242d6 |
$ENV{CLASSPATH}="$ENV{CLASSPATH}:$oldClasspath";
|
|
|
c242d6 |
diff -up ./serverruntime/scripts/linux/server.pl.fix ./serverruntime/scripts/linux/server.pl
|
|
|
c242d6 |
--- ./serverruntime/scripts/linux/server.pl.fix 2011-12-05 18:58:21.000000000 -0500
|
|
|
c242d6 |
+++ ./serverruntime/scripts/linux/server.pl 2011-12-06 18:16:23.000000000 -0500
|
|
|
c242d6 |
@@ -15,18 +15,17 @@ $port = $ARGV[0];
|
|
|
c242d6 |
$timeout = $ARGV[1];
|
|
|
c242d6 |
$clientUserID = $ARGV[2];
|
|
|
c242d6 |
|
|
|
c242d6 |
-$dir= $ENV{PWD};
|
|
|
c242d6 |
-#print("path $dir");
|
|
|
c242d6 |
+$dir="$ENV{PWD}";
|
|
|
c242d6 |
+$configdir="/etc/sysconfig/rseserver";
|
|
|
c242d6 |
|
|
|
c242d6 |
-#$plugins_dir=substr($dir,0,rindex($dir,"/"));
|
|
|
c242d6 |
-$plugins_dir=$dir;
|
|
|
c242d6 |
+$plugins_dir="/usr/share/java/eclipse-rse-server";
|
|
|
c242d6 |
|
|
|
c242d6 |
$ENV{A_PLUGIN_PATH}="$plugins_dir/";
|
|
|
c242d6 |
|
|
|
c242d6 |
$oldClasspath = $ENV{CLASSPATH};
|
|
|
c242d6 |
|
|
|
c242d6 |
|
|
|
c242d6 |
-$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";
|
|
|
c242d6 |
+$ENV{"CLASSPATH"}="$dir:$configdir:$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
|
|
|
c242d6 |
|
|
|
c242d6 |
if (!defined($timeout))
|
|
|
c242d6 |
{
|
|
|
c242d6 |
@@ -44,4 +43,4 @@ else
|
|
|
c242d6 |
}
|
|
|
c242d6 |
}
|
|
|
c242d6 |
|
|
|
c242d6 |
-$ENV{CLASSPATH}=$oldClasspath;
|
|
|
c242d6 |
\ No newline at end of file
|
|
|
c242d6 |
+$ENV{CLASSPATH}=$oldClasspath;
|