perfsonar development work

Author: zurawski
Date: 2007-04-12 09:43:05 -0400 (Thu, 12 Apr 2007)
New Revision: 222

Added:
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ContactEmail.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Organization.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceVersion.java
Modified:
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java
Log:

Updates regarding the 'LookupInfoRequest' handler that will allow the 
querying of information from services directly.  The three new fields will be 
used inside of a service definition.

-jason



Added: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ContactEmail.java

Added: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Organization.java

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java 
      2007-04-10 13:18:27 UTC (rev 221)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java 
      2007-04-12 13:43:05 UTC (rev 222)
@@ -54,8 +54,23 @@
         * 
         */
        protected ServiceDescription serviceDescription;
-       
+
        /**
+        * 
+        */     
+       protected ServiceVersion serviceVersion;
+
+       /**
+        * 
+        */     
+       protected Organization organization;
+
+       /**
+        * 
+        */     
+       protected ContactEmail contactEmail;
+
+       /**
         * Constructor.
         */ 
        public Service() {
@@ -64,7 +79,11 @@
                accessPoint = null;
                serviceType = null;
                serviceDescription = null;
-               
+
+               serviceVersion = null;
+               organization = null;
+               contactEmail = null;
+
                parent = null;
                id = "";                
                completed = false;              
@@ -133,6 +152,48 @@
        }                       
 
        /**
+        * Returns the serviceVersion element.
+        */     
+       public ServiceVersion getServiceVersion() {
+               return serviceVersion;
+       }
+       
+       /**
+        * Sets the serviceVersion element.
+        */     
+       public void setServiceVersion(ServiceVersion newServiceVersion) {
+               serviceVersion = newServiceVersion;
+       }
+       
+       /**
+        * Returns the organization element.
+        */     
+       public Organization getOrganization() {
+               return organization;
+       }
+       
+       /**
+        * Sets the organization element.
+        */     
+       public void setOrganization(Organization newOrganization) {
+               organization = newOrganization;
+       }
+       
+       /**
+        * Returns the contactEmail element.
+        */     
+       public ContactEmail getContactEmail() {
+               return contactEmail;
+       }
+       
+       /**
+        * Sets the contactEmail element.
+        */     
+       public void setContactEmail(ContactEmail newContactEmail) {
+               contactEmail = newContactEmail;
+       }
+       
+       /**
         * Add only children related to the interface.
         */             
        public boolean addChild(Element newChild) {
@@ -148,6 +209,15 @@
                else if(newChild.getLocalName().equals("serviceDescription")) 
{                 
                        setServiceDescription((ServiceDescription)newChild);
                }
+               else if(newChild.getLocalName().equals("serviceVersion")) {   
                  
+                       setServiceVersion((ServiceVersion)newChild);
+               }
+               else if(newChild.getLocalName().equals("organization")) {     
                  
+                       setOrganization((Organization)newChild);
+               }
+               else if(newChild.getLocalName().equals("contactEmail")) {     
                  
+                       setContactEmail((ContactEmail)newChild);
+               }                                               
                else {                                          
                        System.err.println("Error: " + getFileName() + " 
addChild(Element) unrecognized child: " + newChild);
                        return false;           
@@ -248,6 +318,15 @@
                if(getServiceDescription() != null) {
                        handler = getServiceDescription().toXML(handler, nss);
                }                               
+               if(getServiceVersion() != null) {
+                       handler = getServiceVersion().toXML(handler, nss);
+               }
+               if(getOrganization() != null) {
+                       handler = getOrganization().toXML(handler, nss);
+               }
+               if(getContactEmail() != null) {
+                       handler = getContactEmail().toXML(handler, nss);
+               }                               
                return handler;
        }       
 
@@ -271,6 +350,15 @@
                if(getServiceDescription() != null) {
                        getServiceDescription().getDOM(service);
                }                                                             
                                  
+               if(getServiceVersion() != null) {
+                       getServiceVersion().getDOM(service);
+               }
+               if(getOrganization() != null) {
+                       getOrganization().getDOM(service);
+               }
+               if(getContactEmail() != null) {
+                       getContactEmail().getDOM(service);
+               }
        }
 
        /**
@@ -278,7 +366,8 @@
         * an output statement.
         */                                                     
        public String toString() {
-               return getFileName() + ": ---> " + getId() + getServiceName() 
+ getAccessPoint() + getServiceType() + getServiceDescription();
+               return getFileName() + ": ---> " + getId() + getServiceName() 
+ getAccessPoint() + getServiceType() + getServiceDescription() + 
getServiceVersion() + getOrganization() + getContactEmail();
+               
        }       
 
 }

Added: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceVersion.java