From 8e5c492e0379f01cae7b8234f51a26b84302d258 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 27 Aug 2007 21:05:24 +0200
Subject: [PATCH] Update the documentation in the configuration section

... and rearrange things a bit.
---
 Makefile | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index d3e7509..0d6d167 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,10 @@
 # Configuration section
 ################################################################################
 
-## Location of the server class files
-#
-# The host and path specifying where the web service application
-# infrastructure classes should be deployed. Note, that scp is used for
-# this, so the DEPLOYLOCATION variable should hold a valid scp location.
-
-DEPLOYHOST	= remote-server
-DEPLOYPATH	= /opt/apache-tomcat-5.5.12/webapps/axis/WEB-INF/classes/
-
-DEPLOYLOCATION	= $(DEPLOYHOST):$(DEPLOYPATH)
-
 ## Webservice address information
 #
-# Information about the location of the webservice.
+# Information about the location of the webservice. It will be used when
+# generating the client stubs from the WSDL files.
 
 SERVICEHOST	= amigos30.diku.dk
 SERVICEPORT	= 8080
@@ -27,15 +17,28 @@ SERVICELOCATION = http://$(SERVICEHOST):$(SERVICEPORT)/$(SERVICEPATH)
 #
 # Information about the location and credentials for accessing the
 # webservice framework with the AdminClient. Test the information using
-# the deploy-test rule.
+# the deploy-test rule, which will try to contact the server and list
+# the available webservices.
 #
-# To use default values, set them to the empty string.
+# To use the AdminClient program's default values, leave the variables
+# empty.
 
 ADMINHOST	= amigos30.diku.dk
 ADMINPORT	= 8080
 ADMINUSER	=
 ADMINPASS	=
 
+## Location of the server class files
+#
+# The host and path specifying where the web service application
+# infrastructure classes should be deployed. Note, that scp is used for
+# this, so the DEPLOYLOCATION variable should hold a valid scp location.
+
+DEPLOYHOST	= remote-server
+DEPLOYPATH	= /opt/apache-tomcat-5.5.12/webapps/axis/WEB-INF/classes/
+
+DEPLOYLOCATION	= $(DEPLOYHOST):$(DEPLOYPATH)
+
 ################################################################################
 # Build section
 ################################################################################
-- 
2.11.4.GIT