* added antclick target to build.xml

* added files needed to build antclick in extra directory
* edited several build and properties files

.gitattributes

@@ -1,6 +1,9 @@
 * text=auto !eol
 build/ant-launcher.jar -text
 build/ant.jar -text
+build/extra/helma.jar -text
+build/extra/launcher.jar -text
+build/extra/mckoidb.jar -text
 code/AntvilleLib-1.3.zip -text
 static/hop.gif -text
 static/layouts/default/big.gif -text

build/build.xml

@@ -37,7 +37,7 @@
       <property name="project" value="antville"/>
       <property name="build.compiler" value="classic"/>
 
-      <property name="cvs.antville.root" value=":pserver:anonymous@adele.helma.at:/opt/cvs/apps"/>
+      <property name="cvs.apps.root" value=":pserver:anonymous@adele.helma.at:/opt/cvs/apps"/>
       <property name="cvs.antville.tag" value="HEAD"/>
       <property name="cvs.hop.root" value=":pserver:anonymous@adele.helma.at:/opt/cvs/hop"/>
       <property name="cvs.hop.tag" value="HEAD"/>
@@ -48,8 +48,9 @@
       <property name="build.static" value="${home.dir}/static"/>
       <property name="build.docs" value="${home.dir}/docs"/>
 
-      <property name="build.work" value="${home.dir}/work"/>
+      <property name="build.work" value="${build.dir}/work"/>
-      <property name="build.dist" value="${home.dir}/dist"/>
+      <property name="build.dist" value="${build.dir}/dist"/>
+      <property name="build.extra" value="${build.dir}/extras"/>
 
       <property name="jar.name" value="${project}"/>
       <property name="package.name" value="${project}-${version}"/>
@@ -72,7 +73,7 @@
    <!-- =================================================================== -->
    <target name="antville" depends="init">
       <mkdir dir="${build.work}"/>
-      <cvs cvsRoot="${cvs.antville.root}" command="export" tag="${cvs.antville.tag}" package="antville" dest="${build.work}"/>
+      <!-- cvs cvsRoot="${cvs.apps.root}" command="export" tag="${cvs.antville.tag}" package="antville" dest="${build.work}"/ -->
       <antcall target="package-zip">
          <param name="filename" value="${package.name}"/>
          <param name="path" value="${build.work}/antville"/>
@@ -85,6 +86,36 @@
    </target>
 
 
+   <!-- =================================================================== -->
+   <!-- generate the antclick distribution packages                         -->
+   <!-- =================================================================== -->
+   <target name="antclick" depends="init">
+      <mkdir dir="${build.work}"/>
+      <copy todir="${build.work}/">
+         <fileset dir="${build.extra}" includes="antclick.sh antclick.bat launcher.jar server.properties"/>
+      </copy>
+
+      <mkdir dir="${build.work}/apps"/>
+      <cvs cvsRoot="${cvs.apps.root}" command="export" tag="${cvs.antville.tag}" package="antville" dest="${build.work}/apps"/>
+      <cvs cvsRoot="${cvs.apps.root}" command="export" tag="HEAD" package="manage" dest="${build.work}/apps"/>
+      <copy file="${build.extra}/db.properties" tofile="${build.work}/apps/antville/db.properties"/>
+
+      <cvs cvsRoot="${cvs.hop.root}" command="export" tag="${cvs.hop.tag}" package="helma/lib" dest="${build.work}/lib"/>
+      <copy file="${build.extra}/helma.jar" todir="${build.work}/lib"/>
+      <copy file="${build.extra}/mckoidb.jar" todir="${build.work}/lib/ext"/>
+
+      <antcall target="package-zip">
+         <param name="filename" value="${package.name}"/>
+         <param name="path" value="${build.work}/antville"/>
+      </antcall>
+      <antcall target="package-tgz">
+         <param name="filename" value="${package.name}"/>
+         <param name="path" value="${build.work}/antville"/>
+      </antcall>
+      <!-- delete dir="${build.work}"/ -->
+   </target>
+
+
 <!-- ************************************************************************* -->
 
 

build/extra/antclick.bat

@@ -0,0 +1,79 @@
+@echo off
+rem Batch file for Starting Helma with a JDK-like virtual machine.
+
+rem To add jar files to the classpath, simply place them into the 
+rem lib/ext directory of this Helma installation.
+
+:: Initialize variables
+:: (don't touch this section)
+set JAVA_HOME=
+set HOP_HOME=
+set HTTP_PORT=
+set XMLRPC_PORT=
+set AJP13_PORT=
+set RMI_PORT=
+set OPTIONS=
+
+:: Set TCP ports for Helma servers
+:: (comment/uncomment to de/activate)
+set HTTP_PORT=8080
+rem set XMLRPC_PORT=8081
+rem set AJP13_PORT=8009
+rem set RMI_PORT=5050
+
+:: Uncomment to set HOP_HOME
+rem set HOP_HOME=c:\program files\helma
+
+:: Uncomment to set JAVA_HOME variable
+rem set JAVA_HOME=c:\program files\java
+
+:: Uncomment to pass options to the Java virtual machine
+rem set JAVA_OPTIONS=-server -Xmx128m
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:::::: No user configuration needed below this line :::::::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:: Setting the script path
+set INSTALL_DIR=%~d0%~p0
+
+:: Using JAVA_HOME variable if defined. Otherwise,
+:: Java executable must be contained in PATH variable
+if "%JAVA_HOME%"=="" goto default
+   set JAVACMD=%JAVA_HOME%\bin\java
+   goto end
+:default
+   set JAVACMD=java
+:end
+
+:: Setting HOP_HOME to script path if undefined
+if "%HOP_HOME%"=="" (
+   set HOP_HOME=%INSTALL_DIR%
+)
+cd %HOP_HOME%
+
+
+:: Setting Helma server options
+if not "%HTTP_PORT%"=="" (
+   echo Starting HTTP server on port %HTTP_PORT%
+   set OPTIONS=%OPTIONS% -w %HTTP_PORT%
+)
+if not "%XMLRPC_PORT%"=="" (
+   echo Starting XML-RPC server on port %XMLRPC_PORT%
+   set OPTIONS=%OPTIONS% -x %XMLRPC_PORT%
+)
+if not "%AJP13_PORT%"=="" (
+   echo Starting AJP13 listener on port %AJP13_PORT%
+   set OPTIONS=%OPTIONS% -jk %AJP13_PORT%
+)
+if not "%RMI_PORT%"=="" (
+   echo Starting RMI server on port %RMI_PORT%
+   set OPTIONS=%OPTIONS% -p %RMI_PORT%
+)
+if not "%HOP_HOME%"=="" (
+   echo Serving applications from %HOP_HOME%
+   set OPTIONS=%OPTIONS% -h "%HOP_HOME%
+)
+
+:: Invoking the Java virtual machine
+%JAVACMD% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS%

build/extra/antclick.sh

@@ -0,0 +1,80 @@
+#!/bin/sh
+# Shell script for starting Helma with a JDK-like virtual machine.
+
+# To add JAR files to the classpath, simply place them into the
+# lib/ext directory.
+
+# uncomment to set JAVA_HOME variable
+# JAVA_HOME=/usr/lib/java
+
+# uncomment to set HOP_HOME, otherwise we get it from the script path
+# HOP_HOME=/usr/local/helma
+
+# options to pass to the Java virtual machine
+# JAVA_OPTIONS="-server -Xmx128m"
+
+# Set TCP ports for Helma servers
+# (comment/uncomment to de/activate)
+HTTP_PORT=8080
+# XMLRPC_PORT=8081
+# AJP13_PORT=8009
+# RMI_PORT=5050
+
+###########################################################
+###### No user configuration needed below this line #######
+###########################################################
+
+# 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
+
+
+# If JAVA_HOME is set, check if java command is executable
+if [ $JAVA_HOME -a ! -x $JAVACMD ] ; then
+   echo "Warning: JAVA_HOME variable may be set incorrectly:"
+   echo "         No executable found at $JAVACMD"
+fi
+
+# Get the Helma installation directory
+INSTALL_DIR="${0%/*}"
+cd $INSTALL_DIR
+INSTALL_DIR=$PWD
+
+# get HOP_HOME variable if it isn't set
+if [ -z "$HOP_HOME" ]; then
+  # try to get HOP_HOME from script file and pwd
+  # strip everyting behind last slash
+  HOP_HOME="${0%/*}"
+  cd $HOP_HOME
+  HOP_HOME=$PWD
+else
+  cd $HOP_HOME
+fi
+echo "Starting Helma in directory $HOP_HOME"
+
+if [ "$HTTP_PORT" ]; then
+   SWITCHES="$SWITCHES -w $HTTP_PORT"
+   echo Starting HTTP server on port $HTTP_PORT
+fi
+if [ "$XMLRPC_PORT" ]; then
+   SWITCHES="$SWITCHES -x $XMLRPC_PORT"
+   echo Starting XML-RPC server on port $XMLRPC_PORT
+fi
+if [ "$AJP13_PORT" ]; then
+   SWITCHES="$SWITCHES -jk $AJP13_PORT"
+   echo Starting AJP13 listener on port $AJP13_PORT
+fi
+if [ "$RMI_PORT" ]; then
+   SWITCHES="$SWITCHES -p $RMI_PORT"
+   echo Starting RMI server on port $RMI_PORT
+fi
+if [ "$HOP_HOME" ]; then
+   SWITCHES="$SWITCHES -h $HOP_HOME"
+fi
+
+# Invoke the Java VM
+$JAVACMD $JAVA_OPTIONS -jar "$INSTALL_DIR/launcher.jar" $SWITCHES

build/extra/apps.properties

@@ -0,0 +1,13 @@
+## mount antville at root
+antville
+antville.mountpoint = /
+antville.appdir = apps/antville/code
+
+## mount the static dir
+antville.static = apps/antville/static
+antville.staticMountpoint = /static
+
+## mount manage app explicitely to avoid 
+## conflict with antville's manage_action
+manage
+manage.mountpoint = /manage/hop

build/extra/server.properties

@@ -0,0 +1,4 @@
+country     = AT
+language    = en
+smtp        = localhost
+allowAdmin  = 127.0.0.1, 10.0.0.1

db/db.properties.mysql

@@ -1,5 +1,5 @@
-# Properties of antville datasource
+# Properties of antville's mysql datasource
-antville.url=jdbc:mysql://[Server-IP]/antville
+antville.url      = jdbc:mysql://localhost/antville
 antville.driver   = org.gjt.mm.mysql.Driver
 antville.user     = antville
 antville.password = antville

db/db.properties.oracle

@@ -1,4 +1,4 @@
-# Properties of antville datasource
+# Properties of antville's oracle datasource
 antville.url      = jdbc:oracle:thin:@[Server-IP]:[Port]:[SID]
 antville.driver   = oracle.jdbc.driver.OracleDriver
 antville.user     = antville