4 files changed, 15 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 29f3f3c..19e0364 100644
--- a/Makefile
+++ b/Makefile
@@ -54,4 +54,11 @@ header:
 		echo ' *:*/' >> $(FILE); cat .tmp >> $(FILE); rm -f .tmp
 sslkeygen:
 	keytool -genkey -keystore mySrvKeystore -keyalg RSA
-	
+createjar: clean all
+	jar cvfm NetCalendar.jar MANIFEST.MF `find . -name \*.class`
+createdist: createjar
+	if [ -d ./dist ]; then rm -Rf dist; fi
+	mkdir ./dist
+	cp NetCalendar.jar dist
+	cp -R *.txt calendardb config.txt images SSL ./dist
+	find ./dist -type d -name .svn | xargs rm -Rf
diff --git a/README.txt b/README.txt
index 1730753..5f894db 100644
--- a/README.txt
+++ b/README.txt
@@ -33,11 +33,11 @@ computer.
 
 3. Start the server with 
 
-	java -jar NetCalendar-$VERSION.jar --server-only
+	java -jar NetCalendar.jar --server-only
 
 4. Start the server with 
 
-	java -jar NetCalendar-$VERSION.jar --client-only \
+	java -jar NetCalendar.jar --client-only \
 	--server-address=$SERVERHOST
 
 In order to stop the server, select "Server -> Shutdown server" in the GUI of
@@ -62,7 +62,7 @@ save them for example into ./SSL.
 	-Djavax.net.ssl.keyStorePassword=$PASSWORD \
 	-Djavax.net.ssl.trustStore=./SSL/serverTrust \
 	-Djavax.net.ssl.trustStorePassword=$PASSWORD \
-	-jar NetCalendar-$VERSION.jar --server-only
+	-jar NetCalendar.jar --server-only
 
 4. Start the server with 
 	java \
@@ -70,7 +70,7 @@ save them for example into ./SSL.
 	-Djavax.net.ssl.keyStorePassword=$PASSWORD \
 	-Djavax.net.ssl.trustStore=./SSL/clientTrust \
 	-Djavax.net.ssl.trustStorePassword=$PASSWORD \
-	-jar NetCalendar-$VERSION.jar --client-only --server-address=$SERVERHOST
+	-jar NetCalendar.jar --client-only --server-address=$SERVERHOST
 
 
 IV. MORE OPTIONS
@@ -80,7 +80,7 @@ without any explicit options given.
 
 If you want to see more available parameters, then run the command
 
-	java -jar NetCalendar-$VERSION.jar --help
+	java -jar NetCalendar.jar --help
 
 It is possible to configure the NetCalendar by editing the configuration file
 which is "config.txt". However, the preferred way is using the client GUI via
diff --git a/config.txt b/config.txt
index a0f486a..dbc3e3d 100644
--- a/config.txt
+++ b/config.txt
@@ -1,5 +1,5 @@
 client_max_events=100;
-client_run=false;
+client_run=true;
 logfile=netcalendar.log;
 passphrase=dsfiu6786sdfsdhf;
 regexp_case_insensitive=true;
diff --git a/shared/Config.java b/shared/Config.java
index 2a9daf5..5d79c6f 100644
--- a/shared/Config.java
+++ b/shared/Config.java
@@ -11,7 +11,7 @@ import java.io.*;
  *
  */
 public final class Config {
-	public static final String VERSION = "NetCalendar 1.0 RC 6 SVN";
+	public static final String VERSION = "NetCalendar 1.0";
 	private static final String CONFIG_FILE = "config.txt";
 	private static HashMap mapConfigVals;