perfsonar development work

Author: mac
Date: 2007-01-03 07:26:06 -0500 (Wed, 03 Jan 2007)
New Revision: 1876

Modified:
   trunk/perfsonar/conf/template/const.properties.ls-template
   trunk/perfsonar/conf/template/service.properties.ls-template
Log:
Ant targets for XML Lookup Service (finally)

New templates support new ant targets

Modified: trunk/perfsonar/conf/template/const.properties.ls-template
===================================================================
--- trunk/perfsonar/conf/template/const.properties.ls-template  2007-01-03 
12:25:25 UTC (rev 1875)
+++ trunk/perfsonar/conf/template/const.properties.ls-template  2007-01-03 
12:26:06 UTC (rev 1876)
@@ -6,18 +6,18 @@
 # Project: perfSONAR
 #
 
+service.home=%SERVICE_HOME%
+deploy.root=%DEPLOY_ROOT%
+tomcat.home=%TOMCAT_HOME%
 
-### the path to Axis deployment
-axis.home=%AXIS_HOME%
 
-
 ### Axis params for web service deployment:
 
 # name the host to admin
-target.server=localhost
+target.server=%TARGET_SERVER%
 
 # the port to connect to
-target.port=8080
+target.port=%TARGET_PORT%
 
 # name of deployed webservice
 webservice.name=LookupService
@@ -28,15 +28,10 @@
 release.servicename=XML_LS
 release.version=0.2
 
-### JUnit testing Lookup Service
-ls.test.server=%R_ACCESS_POINT%
-
-
 #############################################################
 ### the following does not need to be changed !
 #############################################################
 
-
 build=build
 package.root=org/perfsonar
 package.nmwg.root=org/ggf

Modified: trunk/perfsonar/conf/template/service.properties.ls-template
===================================================================
--- trunk/perfsonar/conf/template/service.properties.ls-template        
2007-01-03 12:25:25 UTC (rev 1875)
+++ trunk/perfsonar/conf/template/service.properties.ls-template        
2007-01-03 12:26:06 UTC (rev 1876)
@@ -1,6 +1,6 @@
 
###############################################################################
 ##
-##  Service configuration file 
+##  Service configuration file
 ##  for Lookup Service
 ##
 ##  
---------------------------------------------------------------------------
@@ -21,9 +21,10 @@
 service.basepath=%SERVICE_BASEPATH%
 service.log.log4j.config=%LOG4J_PROPERTIES%
 service.sax_parser.config=%SAX_PARSER_CONFIG%
+service.log.dir=%LOG_DIR%
 
 # --- registration 
------------------------------------------------------------------------
-#      name of parameter which starts with "service.r." indicates that 
+#      name of parameter which starts with "service.r." indicates that
 #       this parameter belongs to the Lookup Information
 
 service.r.type=ls
@@ -61,6 +62,10 @@
 #Allow re-registration (simple update)
 service.ls.allow_replace=yes
 
+#test
+ls.test.server=%LS_TEST_SERVER%
+
+
 # --- Service properties 
---------------------------------------------------------------
 
 
service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine