From f52702305db6895c7d2765e6a7712b5fd2afb52d Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Wed, 26 Apr 2006 17:59:55 +0000 Subject: [PATCH] provider server defs according to OS types --- .../serverruntime/{ => data}/minerFile.dat | 0 .../serverruntime/{ => data}/patterns.dat | 0 .../{ => data}/rsecomm.properties | 0 .../serverruntime/{ => data}/ssl.properties | 0 .../serverruntime/scripts/aix/auth.pl | 48 ++++++++++++++++ .../{daemon.linux => scripts/aix/daemon.pl} | 0 .../{server.aix => scripts/aix/server.sh} | 3 +- .../serverruntime/{ => scripts/linux}/auth.pl | 0 .../serverruntime/scripts/linux/daemon.pl | 44 ++++++++++++++ .../{server.linux => scripts/linux/server.pl} | 0 .../serverruntime/scripts/unix/auth.pl | 57 +++++++++++++++++++ .../{daemon.unix => scripts/unix/daemon.pl} | 0 .../{server.unix => scripts/unix/server.sh} | 0 .../windows/daemon.bat} | 0 .../windows/server.bat} | 0 .../windows/setup.bat} | 0 .../serverruntime/server.zseries | 15 ----- .../serverruntime/setup.env.zseries | 15 ----- 18 files changed, 151 insertions(+), 31 deletions(-) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{ => data}/minerFile.dat (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{ => data}/patterns.dat (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{ => data}/rsecomm.properties (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{ => data}/ssl.properties (100%) create mode 100644 rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{daemon.linux => scripts/aix/daemon.pl} (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{server.aix => scripts/aix/server.sh} (66%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{ => scripts/linux}/auth.pl (100%) create mode 100644 rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{server.linux => scripts/linux/server.pl} (100%) create mode 100644 rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{daemon.unix => scripts/unix/daemon.pl} (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{server.unix => scripts/unix/server.sh} (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{daemon.win.bat => scripts/windows/daemon.bat} (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{run.win.bat => scripts/windows/server.bat} (100%) rename rse/plugins/org.eclipse.rse.services.dstore/serverruntime/{win.env.bat => scripts/windows/setup.bat} (100%) delete mode 100644 rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.zseries delete mode 100644 rse/plugins/org.eclipse.rse.services.dstore/serverruntime/setup.env.zseries diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/minerFile.dat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/minerFile.dat rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/patterns.dat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/patterns.dat rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/rsecomm.properties b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/rsecomm.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/rsecomm.properties rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/rsecomm.properties diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/ssl.properties b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/ssl.properties rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl new file mode 100644 index 00000000000..15580d4cf09 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl @@ -0,0 +1,48 @@ +#!/usr/bin/perl -w + +use Shell; + +if (!defined($ARGV[0]) || !defined($ARGV[1]) || !defined($ARGV[2]) || !defined($ARGV[3]) || !defined($ARGV[4])) +{ + print("command usage:\n"); + print("auth.pl USER, PATH, PORT, TIMEOUT, TICKET\n"); +} +else +{ + $userIN = $ARGV[0]; + $pathIN = $ARGV[1]; + $portIN = $ARGV[2]; + $timeoutIN = $ARGV[3]; + $ticketIN = $ARGV[4]; + + $pwdIN = ; + chomp($pwdIN); + + + @passwdStruct = getpwnam($userIN); + + if (@passwdStruct == 0) + { + print("invalid user name\n"); + 0; + } + else + { + $passwd=$passwdStruct[1]; + $encryptedPWD = crypt($pwdIN, $passwd); + $classpath=$ENV{CLASSPATH}; + $suOptions="-"; + + if ($passwd eq $encryptedPWD) + { + print("success\n"); + system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); + 1; + } + else + { + print("incorrect password\n"); + 0; + } + } +} diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/daemon.pl similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/daemon.pl diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.aix b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh similarity index 66% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.aix rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh index 06d0f3925ee..7eecdd7b720 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.aix +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh @@ -5,4 +5,5 @@ export serverpath=.; export PATH=/usr/java131/jre/bin:$PATH export CLASSPATH=/usr/java131/jre/lib/rt.jar:/usr/jdk_base/lib/classes.zip:$CLASSPATH -export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH;java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 & \ No newline at end of file +export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH; +java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 & \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl new file mode 100644 index 00000000000..23853b8a131 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl -w + + +$port = "4035"; +$helpFlag = "-h"; + +if (defined($ARGV[0])) +{ + $port = $ARGV[0]; +} + + +$isHelp = $helpFlag cmp $port; +if ($isHelp == 0) +{ + print("command usage:\n"); + print("daemon.linux [ | -]\n"); + 0; +} +else +{ + $trace = $ENV{DSTORE_TRACING_ON}; + $user=`whoami`; chomp($user); + $match = $user cmp "root"; + + if ($match != 0) + { + print("To run the server daemon, you must be root\n"); + 0; + } + else + { + $dir= $ENV{PWD}; + $plugins_dir=$dir; + + $ENV{A_PLUGIN_PATH}="$plugins_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"; + + system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_TRACING_ON=$trace org.eclipse.dstore.core.server.ServerLauncher $port"); + } +} diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl new file mode 100644 index 00000000000..8ca83ce06c0 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl @@ -0,0 +1,57 @@ +#!/usr/bin/perl -w + +use Shell; + +if (!defined($ARGV[0]) || !defined($ARGV[1]) || !defined($ARGV[2]) || !defined($ARGV[3]) || !defined($ARGV[4])) +{ + print("command usage:\n"); + print("auth.pl USER, PATH, PORT, TIMEOUT, TICKET\n"); +} +else +{ + $userIN = $ARGV[0]; + $pathIN = $ARGV[1]; + $portIN = $ARGV[2]; + $timeoutIN = $ARGV[3]; + $ticketIN = $ARGV[4]; + + $pwdIN = ; + chomp($pwdIN); + + + @passwdStruct = getpwnam($userIN); + + if (@passwdStruct == 0) + { + print("invalid user name\n"); + 0; + } + else + { + $passwd=$passwdStruct[1]; + $encryptedPWD = crypt($pwdIN, $passwd); + $classpath=$ENV{CLASSPATH}; + $suOptions="-p"; + + if ($passwd eq $encryptedPWD) + { + print("success\n"); + + $os = uname(); + chomp($os); + + if (lc($os) eq "aix") + { + $suOptions="-"; + } + + system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); + 1; + } + else + { + print("incorrect password\n"); + 0; + } + } +} diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/win.env.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/setup.bat similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/serverruntime/win.env.bat rename to rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/setup.bat diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.zseries b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.zseries deleted file mode 100644 index 9ebc4e577ee..00000000000 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.zseries +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# Shell script to start RSE communications server -# This script will start the datastore listening on any socket -# that's available. -# -. setup.env.zseries -export serverpath=.; - -export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH; - -if [ $1 ] - then java -DA_PLUGIN_PATH=$serverpath -Dclient.username=$1 org.eclipse.dstore.core.server.Server 0 60000 & - else java -DA_PLUGIN_PATH=$serverpath org.eclipse.dstore.core.server.Server 0 60000 & -fi \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/setup.env.zseries b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/setup.env.zseries deleted file mode 100644 index 9378f125dbf..00000000000 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/setup.env.zseries +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# QShell script to start RSE communications server -# Usage: runServer portNumber socketTimeOut -# - -export JAVA_HOME=/sysroot/usr/lpp/java/IBM/J1.3 -SHELL=/bin/sh -TZ=EST5EDT -LANG=C -export PATH=$PATH:/bin:.:/usr/sbin:/sysroot/usr/lpp/internet/bin:/sysroot/usr/lpp/internet/sbin:$JAVA_HOME/bin:$JAVA_HOME/bin/ - -export _CEE_RUNOPTS="ALL31(ON) HEAP(32M,32K,ANYWHERE,KEEP)" - -