perfsonar development work

Author: roman
Date: 2007-04-13 07:38:24 -0400 (Fri, 13 Apr 2007)
New Revision: 2328

Modified:
   trunk/perfsonar/src/org/perfsonar/commons/messages/LookupInfoRequest.java
Log:

New elements supported in the lookup information:
- service version
- organization
- contact email

They are represented by following properties in service.properties file:
- service.r.service_version
- service.r.organization_name
- service.r.contact_email



example response from the service:

<?xml version="1.0" encoding="UTF-8"?>
<nmwg:message id="id1_resp" messageIdRef="id1" type="LookupInfoResponse" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
    <nmwg:metadata id="localhost.-328befe6:111eab9856d:-7fff"/>
    <nmwg:data id="localhost.-328befe6:111eab9856d:-7ffe" 
metadataIdRef="localhost.-328befe6:111eab9856d:-7fff">
        <psservice:datum 
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
            <psservice:service>
                <psservice:serviceName>Java RRD MA</psservice:serviceName>
                <psservice:serviceType>RRD MA</psservice:serviceType>
                <psservice:serviceDescription>Java RRD MA, perfSONAR 
project</psservice:serviceDescription>
                <psservice:serviceVersion>2.0</psservice:serviceVersion>
                <psservice:organization>PSNC</psservice:organization>
                
<psservice:contactEmail></psservice:contactEmail>
            </psservice:service>
        </psservice:datum>
    </nmwg:data>
</nmwg:message>







Modified: 
trunk/perfsonar/src/org/perfsonar/commons/messages/LookupInfoRequest.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/commons/messages/LookupInfoRequest.java 
  2007-04-12 13:45:14 UTC (rev 2327)
+++ trunk/perfsonar/src/org/perfsonar/commons/messages/LookupInfoRequest.java 
  2007-04-13 11:38:24 UTC (rev 2328)
@@ -24,6 +24,9 @@
 import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceName;
 import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceType;
 import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Organization;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceVersion;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ContactEmail;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -213,7 +216,30 @@
         sd.setServiceDescription(serviceDescString);
         service.setServiceDescription(sd);
 
+        //service version
+        String serviceVersionString = (String) 
commonParameters.get("service_version");
+        if (serviceVersionString == null)
+               serviceVersionString = "";
+        ServiceVersion sv = new ServiceVersion();
+        sv.setServiceVersion(serviceVersionString);
+        service.setServiceVersion(sv);
 
+        //organization owning the service
+        String organizationString = (String) 
commonParameters.get("organization_name");
+        if (organizationString == null)
+               organizationString = "";
+        Organization organization = new Organization();
+        organization.setOrganization(organizationString);
+        service.setOrganization(organization);
+
+        //organization owning the service
+        String contactEmailString = (String) 
commonParameters.get("contact_email");
+        if (contactEmailString == null)
+               contactEmailString = "";
+        ContactEmail contactEmail = new ContactEmail();
+        contactEmail.setContactEmail(contactEmailString);
+        service.setContactEmail(contactEmail);
+
         return response;
 
     }