From 68f516710caab922171d338842e22581f6fe2f96 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 25 Jul 2002 12:09:35 +0000
Subject: [PATCH] Improved start scripts, added jetty jar files.

---
 build/antclick/hop.bat | 31 ++++++++++++++++++-------------
 build/antclick/hop.sh  | 28 ++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/build/antclick/hop.bat b/build/antclick/hop.bat
index 8599a80a..d8be7b15 100755
--- a/build/antclick/hop.bat
+++ b/build/antclick/hop.bat
@@ -1,13 +1,18 @@
-@echo off
-
-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;lib\mckoidb.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 %HOP_PORT%
-
-java -classpath %JARS% helma.main.Server -w %HOP_PORT%
+@echo off
+
+rem Batch file for starting Hop with a JDK-like virtual machine.
+
+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\mckoidb.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
+
+echo Starting Web server on port %WEB_PORT%
+echo Starting XML-RPC server on port %XMLRPC_PORT%
+
+java -classpath %JARS% helma.main.Server -w %WEB_PORT% -x %XMLRPC_PORT%
diff --git a/build/antclick/hop.sh b/build/antclick/hop.sh
index 41bc2aef..f91fb4cd 100755
--- a/build/antclick/hop.sh
+++ b/build/antclick/hop.sh
@@ -1,11 +1,27 @@
 #!/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:lib/mckoidb.jar
-export JARS=$JARS:lib/gnu-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/mckoidb.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