From 07d457f5580cecb5e69de317a009c75f56e10c0e Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 24 Jul 2002 18:33:14 +0000
Subject: [PATCH] Update to new extended start scripts from Antclick
 distribution. Including jetty.jar and servlet.jar into the classpath.

---
 hop.bat | 14 +++++++++-----
 hop.sh  | 27 +++++++++++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/hop.bat b/hop.bat
index 037589ed..dfe5490d 100755
--- a/hop.bat
+++ b/hop.bat
@@ -2,12 +2,16 @@
 
 rem Batch file for starting Hop with a JDK-like virtual machine.
 
-set JARS=lib\helma.jar;lib\crimson.jar;lib\village.jar;lib\jsdk.jar
+rem Set Helma TCP ports
+set WEB_PORT=8080
+set XMLRPC_PORT=8081
+
+rem Set Classpath
+set JARS=lib\helma.jar;lib\crimson.jar;lib\village.jar;lib\servlet.jar;lib\jetty.jar
 set JARS=%JARS%;lib\regexp.jar;lib\netcomponents.jar;lib\jimi.jar;lib\apache-dom.jar
 set JARS=%JARS%;lib\mail.jar;lib\activation.jar;lib\mysql.jar;lib\jdom.jar;lib\minml.jar
 
-set HOP_PORT=8080
+echo Starting Web server on port %WEB_PORT%
+echo Starting XML-RPC server on port %XMLRPC_PORT%
 
-echo Starting Web server on port %HOP_PORT%
-
-java -classpath c:\winnt\java\packages\rmi.zip;%JARS% helma.main.Server -w %HOP_PORT%
+java -classpath %JARS% helma.main.Server -w %WEB_PORT% -x %XMLRPC_PORT%
diff --git a/hop.sh b/hop.sh
index b53caaa2..75ed96cc 100755
--- a/hop.sh
+++ b/hop.sh
@@ -1,11 +1,26 @@
 #!/bin/sh
-# Stupid shell script for starting Hop with a JDK-like virtual machine.
+# Shell script for starting Helma with a JDK-like virtual machine.
 # Presumes that you have your classpath set.
 
-export HOP_PORT=8080 
+# set Helma TCP ports
+WEB_PORT=8080
+XMLRPC_PORT=8081
 
-export JARS=lib/helma.jar:lib/crimson.jar:lib/village.jar:lib/jsdk.jar
-export JARS=$JARS:lib/regexp.jar:lib/netcomponents.jar:lib/jimi.jar:lib/apache-dom.jar
-export JARS=$JARS:lib/mail.jar:lib/activation.jar:lib/mysql.jar:lib/jdom.jar:lib/minml.jar
+# if JAVA_HOME variable is set, use it. Otherwise, java executable
+# must be contained in PATH variable.
+if [  "$JAVA_HOME" ]; then
+    JAVACMD="$JAVA_HOME"/bin/java
+else
+   JAVACMD=java
+fi
 
-java -classpath $CLASSPATH:$JARS helma.main.Server -w $HOP_PORT
+# set classpath
+JARS=lib/helma.jar:lib/crimson.jar:lib/village.jar:lib/servlet.jar:lib/jetty.jar
+JARS=$JARS:lib/regexp.jar:lib/netcomponents.jar:lib/jimi.jar:lib/apache-dom.jar
+JARS=$JARS:lib/mail.jar:lib/activation.jar:lib/mysql.jar:lib/jdom.jar:lib/minml.jar
+
+echo Starting Web server on port $WEB_PORT
+echo Starting XML-RPC server on port $XMLRPC_PORT
+
+# launch
+$JAVACMD -classpath $CLASSPATH:$JARS helma.main.Server -w $WEB_PORT -x $XMLRPC_PORT