perfsonar development work

Author: uros
Date: 2006-10-06 10:22:12 -0400 (Fri, 06 Oct 2006)
New Revision: 1676

Added:
   trunk/perfsonar/conf/tcmp-service-content.xml
   trunk/perfsonar/src/org/perfsonar/service/measurementPoint/register/
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/register/LSRegistrationComponent.java
Modified:
   trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
   trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml
   trunk/perfsonar/conf/components.properties.mp
   trunk/perfsonar/conf/service.properties.tcmp
   trunk/perfsonar/src/org/perfsonar/commons/auxiliary/ComponentNames.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
Log:
Added support for LS Registration. Structure of the tcmp-service-content.xml 
sent as an service content to LS Service is yet to be discussed. Maybe we 
should replace all occurancies of LSRegistrationComponent class with generic 
class located in service/commons dir?

Modified: trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2006-10-05 19:04:23 
UTC (rev 1675)
+++ trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2006-10-06 14:22:12 
UTC (rev 1676)
@@ -42,6 +42,26 @@
         <dirname property="current.path.tcmp" file="."/>
     </target>
 
+
+    <target name="__get-config-file">
+        <input message="Enter the path of metadata config file 
[${basedir}/conf/tcmp-service-content.xml]:"
+               addproperty="config.file"
+               defaultvalue="${basedir}/conf/tcmp-service-content.xml"/>
+        <available file="${config.file}" property="config.file.present"/>
+    </target>
+
+    <target name="_get-config-file_1" depends="__get-config-file" 
if="config.file.present">
+        <echo message="Accepted metadata config file: ${config.file}"/>
+    </target>
+
+    <target name="_get-config-file_2" depends="__get-config-file" 
unless="config.file.present">
+        <echo message="!!!!!! ERROR: Provided metadata config file does not 
exist !!!!!!"/>
+        <property name="config.file" value="xxxxxxxx"/>
+    </target>
+
+    <target name="get-config-file" depends="_get-config-file_1, 
_get-config-file_2">
+    </target>
+    
     <!-- creating const.properties file -->
 
     <target name="set-const-properties-for-tcmp"
@@ -129,28 +149,20 @@
                     get-server-address,
                     get-pcap-storage-dir,
                     get-local-ifs,
-                    get-remote-ifs">
+                    get-remote-ifs,
+                    get-config-file">
 
         <propertyfile file="conf/service.properties" 
                         comment="This file was created by the ant script.">
 
-            <entry  key="service.name" value="Tracefile Capture Measurement 
Point"/>
             <entry  key="service.r.type" value="mp"/>
-            <entry  key="service.r.location" value="${server.address}"/>
-            <entry  key="service.r.description" value="this is Tracefile 
Capture MP service"/>
-            <entry  key="service.r.parameters" value=""/>
-            <entry  key="service.r.access_point.address" value=""/>
-            <entry  key="service.r.access_point.type" value="http"/>
-            <entry  key="service.r.access_point.description" value="test 
deployment"/>
-            <entry  key="service.r.technology" value="webservice"/>
-            <entry  key="service.r.discovery.location" value=""/>
-            <entry  key="service.r.organization.name" value=""/>
-            <entry  key="service.r.organization.contact" value=""/>
-            <entry  key="service.r.auth_realm" value=""/>
-            <entry  key="service.r.version" value="1.0"/>
+            <entry  key="service.r.access_point" 
value="http://${server.address}:8080/axis/services/TCMPService"/>
+            <entry  key="service.r.service_name" value="Java TC MP"/>
+            <entry  key="service.r.service_type" value="TC MP"/>
+            <entry  key="service.r.service_description" value="Java TC MP, 
perfSONAR project"/>
+            
+            <entry  key="service.conf_file" value="${config.file}"/>
 
-            <entry  key="service.administrator" value=""/>
-
             <entry  key="service.log.log4j.config" 
value="${current.path.tcmp}/perfsonar/conf/log4j.properties"/>
             <entry  key="service.sax_parser.config" 
value="${current.path.tcmp}/perfsonar/src/objects.config"/>
 
@@ -161,6 +173,10 @@
             <entry  key="service.mp.tcmp.remote.interfaces" 
value="${remote.ifs}"/>
             <entry  key="service.mp.tcmp.pcap.file.storage.dir" 
value="${pcap.storage.dir}"/>
 
+            <entry  key="service.r.ls_url" value=""/>
+            <entry  key="component.registrator.interval" value="30000"/>
+            <entry  key="component.registrator.scheduler_component" 
value="scheduler"/>
+
         </propertyfile>
 
         <echo message="service.properties file created"/>

Modified: trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml      2006-10-05 
19:04:23 UTC (rev 1675)
+++ trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml      2006-10-06 
14:22:12 UTC (rev 1676)
@@ -34,6 +34,7 @@
                 description="Compiles Java files of TC MP">
         <javac srcdir="src" destdir="${build}" deprecation="yes">
             <include 
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/**" />
+            <include 
name="org/perfsonar/service/measurementPoint/register/**" />
             <include name="org/perfsonar/service/web/**" />
             <exclude 
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/**"
 />
             <classpath refid="classpath"/>
@@ -51,6 +52,7 @@
         <jar destfile="${build}/${app.jar}">
             <fileset dir="${build}">
                 <include 
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/**" />
+                <include 
name="org/perfsonar/service/measurementPoint/register/**" />
                 <include name="org/perfsonar/service/web/**" />
                 <exclude 
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/**"
 />
             </fileset>

Modified: trunk/perfsonar/conf/components.properties.mp
===================================================================
--- trunk/perfsonar/conf/components.properties.mp       2006-10-05 19:04:23 
UTC (rev 1675)
+++ trunk/perfsonar/conf/components.properties.mp       2006-10-06 14:22:12 
UTC (rev 1676)
@@ -8,6 +8,12 @@
 #Logger component - must be the second one!
 
logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
+# Simple scheduler
+scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+
+# Registration in LS
+registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent
+
 #Service specific components
 #...
 

Modified: trunk/perfsonar/conf/service.properties.tcmp
===================================================================
--- trunk/perfsonar/conf/service.properties.tcmp        2006-10-05 19:04:23 
UTC (rev 1675)
+++ trunk/perfsonar/conf/service.properties.tcmp        2006-10-06 14:22:12 
UTC (rev 1676)
@@ -13,21 +13,20 @@
 
 ## general service properties
 
-service.name=Tracefile Capture Measurement Point
 service.r.type=mp
-service.r.location=193.2.18.163
-service.r.description=this is Tracefile Capture MP service
-service.r.parameters=
-service.r.access_point.address=sonar2.ljubljana.arnes.si:8080/axis/services/TCMPService
-service.r.access_point.type=http
-service.r.access_point.description=test deployment
-service.r.technology=webservice
-service.r.discovery.location=
-service.r.organization.name=ARNES
-
-service.r.auth_realm=ARNES
-service.r.version=1.0
+service.r.access_point=http://sonar2.ljubljana.arnes.si:8080/axis/services/TCMPService
+service.r.service_name=Java TC MP
+service.r.service_type=TC MP
+service.r.service_description=Java TC MP, perfSONAR project
 
+## Location of XML file describing service content
+service.conf_file=C:\\Documents and Settings\\urosj\\My 
Documents\\Devel\\Eclipse\\perfSONAR\\perfsonar\\conf\\tcmp-service-content.xml
+
+## LS registration
+service.r.ls_url=http://sonar3.ljubljana.arnes.si:8080/axis/services/LookupService
+component.registrator.interval=30000
+component.registrator.scheduler_component=scheduler
+
 ## Data required by Service registration (parameters in Metadata) - # # # to 
be combined with "service.r.*" properties # # #
 
service.registration.accessPoint=http://sonar2.ljubljana.arnes.si:8080/axis/services/TCMPService
 service.registration.serviceName=TCMP

Added: trunk/perfsonar/conf/tcmp-service-content.xml


Property changes on: trunk/perfsonar/conf/tcmp-service-content.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/ComponentNames.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/commons/auxiliary/ComponentNames.java   
  2006-10-05 19:04:23 UTC (rev 1675)
+++ trunk/perfsonar/src/org/perfsonar/commons/auxiliary/ComponentNames.java   
  2006-10-06 14:22:12 UTC (rev 1676)
@@ -13,6 +13,8 @@
     public static final String LOGGER = "logger";
     
     public static final String SCHEDULER = "scheduler";
+    
+    public static final String REGISTRATOR = "registrator";
 
     
 } //ComponentNames

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/register/LSRegistrationComponent.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/register/LSRegistrationComponent.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-10-05 19:04:23 UTC (rev 1675)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-10-06 14:22:12 UTC (rev 1676)
@@ -33,6 +33,7 @@
 import org.perfsonar.service.commons.engine.ServiceEngine;
 
 import 
org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeMeasurementExecutor;
+import 
org.perfsonar.service.measurementPoint.register.LSRegistrationComponent;
 
 import org.perfsonar.commons.messages.BaseChaining;
 //import org.perfsonar.commons.messages.MABaseChaining;
@@ -67,6 +68,12 @@
      *  The object to log control/debugging messages
      */
     protected LoggerComponent logger = null;
+    
+    
+    /**
+     *  The object to register to LS Service with
+     */
+    private LSRegistrationComponent lsRegistration= null;
 
 
     protected ConfigurationComponent configuration = null;
@@ -89,6 +96,10 @@
         this.configuration = (ConfigurationComponent)
             AuxiliaryComponentManager.getInstance().
                 getComponent(ComponentNames.CONFIG);
+                
+        this.lsRegistration= (LSRegistrationComponent)
+            AuxiliaryComponentManager.
+                getInstance().getComponent(ComponentNames.REGISTRATOR);
 
     }