perfsonar development work

Author: mac
Date: 2008-10-31 08:21:01 -0400 (Fri, 31 Oct 2008)
New Revision: 4681

Modified:
   trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
Log:
updates RC10



Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-10-31 
12:20:21 UTC (rev 4680)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-10-31 
12:21:01 UTC (rev 4681)
@@ -1,12 +1,12 @@
 
 ## $Id$
 ## project : perfSONAR
-## author: romradz
+## author: romradz, mac
 
 
 
 # the path of a directory which contains log files
-logDir=/opt/perfsonar/services/xml-ls/WEB-INF/logs
+logDir=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log
 
 
 ##
@@ -16,7 +16,7 @@
 
 # Group=Log levels
 # Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, psRootAppender
+log4j.logger.sonar-debug=DEBUG, psRootAppender
 
 # Group=Log levels
 # Description=Assigns info log messages to the specified log appender.
@@ -59,7 +59,7 @@
 
 # Group=Debug message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -87,7 +87,7 @@
 
 # Group=Info message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -115,7 +115,7 @@
 
 # Group=Warn message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -143,7 +143,7 @@
 
 # Group=Error message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -171,7 +171,7 @@
 
 # Group=Fatal message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -199,7 +199,7 @@
 
 # Group=All message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -225,7 +225,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/opt/perfsonar/services/xml-ls/WEB-INF/logs/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/log/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 #log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
 #log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-10-31 
12:20:21 UTC (rev 4680)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-10-31 
12:21:01 UTC (rev 4681)
@@ -1,192 +1,150 @@
-#Modified at Tue Apr 01 12:58:28 GMT+01:00 2008
+#Modified at Tue Oct 28 13:26:04 GMT 2008
 
+# Group=LS
+# Description=The version number of the service.
+service.r.service_version=1.3
 
+# Group=Database
+# Description=The java class file which implements the connector.
+service.ls.db_type=org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl
 
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of Cleanup functionality
-
-
 # Group=Cleanup
-# Description=The name of the storage component (do not change) which stores 
lookup information.
-component.ls_cleanup_loader.storage_component=ls_storage
-
-# Group=Cleanup
-# Description=The timespan (seconds) within which a service must renew its 
registration with the LS. Otherwise the LS considers the service to be 
unavailable.
-service.ls.ttl=86400
-
-# Group=Cleanup
 # Description=The name of the scheduler component (do not change) which 
schedules all LS actions (registration, cleanup etc.).
 component.ls_cleanup_loader.scheduler_component=ls_scheduler
 
-# Group=Cleanup
-# Description=The interval (seconds) in which the cleanup action is 
executed. The cleanup action updates lookup information.
-component.ls_cleanup_loader.interval=300
+# Group=Database
+# Description=The administrator password for the XML DB.
+service.ls.db_adminpassword=
 
+# Group=LS
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://somewhere
+
+# Group=LS
+# Description=The URL of root.hints (may be more than one as CSV)
+service.r.root_hints=http://www.perfsonar.net/gls.root.hints
+
 # Group=Database
 # Description=The URI of the database.
 service.ls.db_uri=http://localhost:8180/exist/rest/db/ls
 
+# Group=Internals
+# Description=Logging Properties path
+service.log.log4j.config=/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/log4j.properties
 
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of the internal implementation structures
+# Group=LS
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200
 
+# Group=LS
+# Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
+component.registrator.scheduler_component=ls_scheduler
 
-# Group=Internal
-# Description=The type of service used to select the correct message handler 
implementation.
-service.r.type=ls
+# Group=Cleanup
+# Description=The name of the storage component (do not change) which stores 
lookup information.
+component.ls_cleanup_loader.storage_component=ls_storage
 
-# Group=Internal
-# Description=The java class file which implements the ServiceEngine 
interface.
-service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
+# Group=LS
+# Description=The email address of the person who manages the service.
+service.r.contact_email=user@domain
 
-# Group=Internal
-# Description=A CSV of request message types supported by the service.
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest,LSCleanup
+# Group=Misc
+# Description=Misc
+service.ls.service_content_type=lssummary
 
-# Group=Internal
-# Description=Determines whether services can re-register with the LS (yes), 
or have to unregister before they can register with it again or perform 
update operation (no).
-service.ls.allow_replace=yes
+# Group=Cleanup
+# Description=The timespan (seconds) within which a service must renew its 
registration with the LS. Otherwise the LS considers the service to be 
unavailable.
+service.ls.ttl=86400
 
+# Group=LS
+# Description=The description of the service.
+service.r.service_description=My institution perfSONAR LS
+
 # Group=Internal
 # Description=Determines whether the LS is a global LS (true) and accepts 
only summary registration, or a home LS (false).
 service.ls.gls=false
 
+# Group=Cleanup
+# Description=The interval (seconds) in which the cleanup action is 
executed. The cleanup action updates lookup information.
+component.ls_cleanup_loader.interval=300
 
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of Database functionality
+# Group=Internals
+# Description=Sax parser configuration parameter
+service.sax_parser.config=/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/objects.config
 
-
 # Group=Database
-# Description=The administrator password for the XML DB.
-service.ls.db_adminpassword=
+# Description=The database access (http or xmlrpc).
+service.ls.db_access=http
 
-# Group=Database
-# Description=Determines whether to create a username and collection for the 
database (using the LS WebAdmin Wizard servlet).
-initialize.db=yes
+# Group=Internal
+# Description=Determines whether services can re-register with the LS (yes), 
or have to unregister before they can register with it again or perform 
update operation (no).
+service.ls.allow_replace=yes
 
-# Group=Database
-# Description=The database status (do not change).
-service.ls.db_status=on
+# Group=Internal
+# Description=The java class file which implements the ServiceEngine 
interface.
+service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
 
 # Group=Database
-# Description=The URI address of the database.
-service.ls.db_uri.xmlrpc=xmldb:exist://localhost:8180/exist/xmlrpc/db/ls
-
-# Group=Database
-# Description=The database password for the specified username.
-service.ls.db_password=sonar
-
-# Group=Database
-# Description=The name of the collection.
-service.ls.db_username=lookupservice
-
-# Group=Database
-# Description=The java class file which implements the connector.
-service.ls.db_type=org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl
-
-# Group=Database
-# Description=The database access (http or xmlrpc).
-service.ls.db_access=http
-
-# Group=Database
 # Description=The default URI of the HTTP connector.
 service.ls.db_uri.http=http://localhost:8180/exist/rest/db/ls
 
-# Group=Database
-# Description=The database configuration type (do not change).
-service.ls.exist_type=webapp
-
-
-
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of LS functionality
-
-
 # Group=LS
 # Description=The service type.
 service.r.service_type=ls
 
+# Group=Database
+# Description=The URI address of the database.
+service.ls.db_uri.xmlrpc=xmldb:exist://localhost:8180/exist/xmlrpc/db/ls
 
-# Group=LS
-# Description=The URL address of the LS service.
-service.r.ls_url=http://loco4.man.poznan.pl:8180/xml-ls/services/LookupService
+# Group=Database
+# Description=Determines whether to create a username and collection for the 
database (using the LS WebAdmin Wizard servlet).
+initialize.db=yes
 
-# Group=LS
-# Description=The URL of root.hints (may be more than one as CSV)
-service.r.root_hints=http://www.perfsonar.net/gls.root.hints
+# Group=Authentication
+# Description=Determines if authentication is enabled (on) or not (off).
+service.as.authn_active=off
 
-# Group=LS
-# Description=The URL address of the service configured by this 
configuration file.
-service.r.access_point=http://my-ls
+# Group=Authentication
+# Description=The URL address of the Authentication Service.
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
 
 # Group=LS
 # Description=The name of the organisation who is deploying the service.
 service.r.organization_name=PSNC
 
-# Group=LS
-# Description=The name of the service (can contain multiple words).
-service.r.service_name=PSNC test LS
+# Group=Internal
+# Description=A CSV of request message types supported by the service.
+service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest,LSCleanup
 
-# Group=LS
-# Description=The version number of the service.
-service.r.service_version=1.3
+# Group=Internal
+# Description=The type of service used to select the correct message handler 
implementation.
+service.r.type=ls
 
-# Group=LS
-# Description=The email address of the person who manages the service.
-service.r.contact_email=user@domain
+# Group=Database
+# Description=The database status (do not change).
+service.ls.db_status=off
 
 # Group=LS
-# Description=The description of the service.
-service.r.service_description=perfSONAR service
+# Description=The URL address of the LS service.
+service.r.ls_url=http://loco4.man.poznan.pl:8180/geant2-java-xml-ls/services/LookupService
 
 # Group=LS
-# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
-component.registrator.interval=43200000
+# Description=The name of the service (can contain multiple words).
+service.r.service_name=on
 
-# Group=LS
-# Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
-component.registrator.scheduler_component=ls_scheduler
+# Group=Database
+# Description=The database configuration type (do not change).
+service.ls.exist_type=webapp
 
-# Group=LS
-# Way how to get the service lookup information data
-service.ls.service_content_type=lssummary
+# Group=Database
+# Description=The database password for the specified username.
+service.ls.db_password=sonar
 
-
-
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of AuthN functionality
-
-
 # Group=Authentication
-# Description=The URL address of the Authentication Service.
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-
-# Group=Authentication
 # Description=The types of messages for which authentication is to be 
enabled (if required).
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+service.as.authn_for_msg_types=LSRegisterRequest,LSDeregisterRequest,LSQueryRequest,LSControlRequest,LSKeepaliveRequest
 
-# Group=Authentication
-# Description=Determines if authentication is enabled (on) or not (off).
-service.as.authn_active=off
+# Group=Database
+# Description=The name of the collection.
+service.ls.db_username=lookupservice
 
-
-
-
-
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of Logging functionality
-
-
-#Group=Logging
-#Description=The path to the log4j.properties configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
-service.log.log4j.config=/opt/perfsonar/services/xml-ls/WEB-INF/classes/perfsonar/conf/log4j.properties
-
-
-
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of SAX functionality
-
-
-#Group=SAX
-#Description=The path to the file objects.config, including the NMWG 
parser's configuration settings. The parser reads the request or metadata 
configuration files, and creates internally used objects that represent these 
files.
-service.sax_parser.config=/opt/perfsonar/services/xml-ls/WEB-INF/classes/perfsonar/conf/objects.config