perfsonar development work

Author: michael.bischoff
Date: 2008-10-21 09:01:59 -0400 (Tue, 21 Oct 2008)
New Revision: 4646

Added:
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/Datum.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/JaxbTools.java
   trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/LsClientImpl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Base64.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/BufferedSoapStrippingStream.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Level0Impl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/ParseUtil.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/SOAPEndpoint.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryProcessImpl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryQuery.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryStepImpl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/LsQuery.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/RootHintsFileDownloader.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/TopologyElements.java
   trunk/surfnet_java-lsclient-api-impl/src/resources/org/perfsonar/ri/
Modified:
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/ServiceImpl.java
   
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level2/Level2Impl.java
   
trunk/surfnet_java-lsclient-api-impl/src/resources/META-INF/services/org.perfsonar.lsclient.LsClient
   
trunk/surfnet_java-lsclient-api-impl/src/resources/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/jaxb.index
Log:
fixing commit error

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/Datum.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/Datum.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/JaxbTools.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/JaxbTools.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/ServiceImpl.java
===================================================================
--- 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/ServiceImpl.java
  2008-10-21 13:00:46 UTC (rev 4645)
+++ 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/ServiceImpl.java
  2008-10-21 13:01:59 UTC (rev 4646)
@@ -1,25 +1,31 @@
-package nl.surfnet.perfsonar.lsclient.impl.level1.jaxb;
+package org.perfsonar.ri.lsclient.level1.jaxb;
 
 import java.net.URI;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.LookupService;
-import org.perfsonar.lsclient.data.ServiceMetadata;
+import org.perfsonar.lsclient.data.Service;
 
 /**
  * TODO This class should probably be moved over to the org.perfsonar.model 
package at some point.
  * 
  * @author michael.bischoff
  */
-@XmlType(name="service",
 namespace="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";)
+@XmlRootElement(name="service",
 namespace="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";)
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ServiceImpl implements AuthorativeLookupservice, 
ServiceMetadata {
+public class ServiceImpl implements AuthorativeLookupservice, Service {
 
+       public void setAuthorativeLookupservice(
+                       AuthorativeLookupservice authorativeLookupservice) {
+               this.authorativeLookupservice = authorativeLookupservice;
+       }
+
        @XmlElement(name="serviceName", 
namespace="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";)
        private String name;
        
@@ -40,11 +46,18 @@
        
        @XmlElement(name="accessPoint", 
namespace="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";)
        private URI endpoint;
+
+       @XmlTransient
+       private AuthorativeLookupservice authorativeLookupservice;
        
        public ServiceImpl() {
                /* no-arg constructor */
        }
        
+       public ServiceImpl(AuthorativeLookupservice authorativeLookupservice) 
{
+               this.authorativeLookupservice = authorativeLookupservice;
+       }
+       
        public ServiceImpl(URI endpoint) {
                this.endpoint = endpoint;
        }
@@ -113,4 +126,43 @@
                return endpoint.compareTo(o.getEndPoint());
        }
 
+       public AuthorativeLookupservice getAuthorativeLookupservice() {
+               return authorativeLookupservice;
+       }
+
+       @Override
+       public String toString() {
+               return String.valueOf(endpoint);
+       }
+
+       public int compareTo(Service o) {
+               if(endpoint==null) return Integer.MAX_VALUE;
+               return endpoint.compareTo(o.getEndPoint());
+       }
+       
+       @Override
+       public int hashCode() {
+               final int prime = 31;
+               int result = 1;
+               result = prime * result
+                               + ((endpoint == null) ? 0 : 
endpoint.hashCode());
+               return result;
+       }
+
+       @Override
+       public boolean equals(Object obj) {
+               if (this == obj)
+                       return true;
+               if (obj == null)
+                       return false;
+               if (!(obj instanceof Service))
+                       return false;
+               Service other = (Service) obj;
+               if (endpoint == null) {
+                       if (other.getEndPoint() != null)
+                               return false;
+               } else if (!endpoint.equals(other.getEndPoint()))
+                       return false;
+               return true;
+       }
 }


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/ServiceImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level2/Level2Impl.java
===================================================================
--- 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level2/Level2Impl.java
        2008-10-21 13:00:46 UTC (rev 4645)
+++ 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level2/Level2Impl.java
        2008-10-21 13:01:59 UTC (rev 4646)
@@ -1,4 +1,4 @@
-package nl.surfnet.perfsonar.lsclient.impl.level2;
+package org.perfsonar.ri.lsclient.level2;
 
 import org.perfsonar.lsclient.Level0LsClientInterface;
 import org.perfsonar.lsclient.Level1LsClientInterface;


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/nl/surfnet/perfsonar/lsclient/impl/level2/Level2Impl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/LsClientImpl.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/LsClientImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Base64.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Base64.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/BufferedSoapStrippingStream.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/BufferedSoapStrippingStream.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Level0Impl.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/Level0Impl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/ParseUtil.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/ParseUtil.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/SOAPEndpoint.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level0/SOAPEndpoint.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryProcessImpl.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryProcessImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryQuery.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryQuery.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryStepImpl.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/DiscoveryStepImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/LsQuery.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/LsQuery.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/RootHintsFileDownloader.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/RootHintsFileDownloader.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/TopologyElements.java


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/main/java/org/perfsonar/ri/lsclient/level1/TopologyElements.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
trunk/surfnet_java-lsclient-api-impl/src/resources/META-INF/services/org.perfsonar.lsclient.LsClient
===================================================================
--- 
trunk/surfnet_java-lsclient-api-impl/src/resources/META-INF/services/org.perfsonar.lsclient.LsClient
        2008-10-21 13:00:46 UTC (rev 4645)
+++ 
trunk/surfnet_java-lsclient-api-impl/src/resources/META-INF/services/org.perfsonar.lsclient.LsClient
        2008-10-21 13:01:59 UTC (rev 4646)
@@ -1 +1 @@
-nl.surfnet.perfsonar.lsclient.impl.LsClientImpl
+org.perfsonar.ri.lsclient.LsClientImpl

Modified: 
trunk/surfnet_java-lsclient-api-impl/src/resources/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/jaxb.index
===================================================================
--- 
trunk/surfnet_java-lsclient-api-impl/src/resources/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/jaxb.index
        2008-10-21 13:00:46 UTC (rev 4645)
+++ 
trunk/surfnet_java-lsclient-api-impl/src/resources/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/jaxb.index
        2008-10-21 13:01:59 UTC (rev 4646)
@@ -1,2 +1,2 @@
-Result
-AuthorativeLookupserviceImpl
\ No newline at end of file
+ServiceImpl
+Datum
\ No newline at end of file


Property changes on: 
trunk/surfnet_java-lsclient-api-impl/src/resources/nl/surfnet/perfsonar/lsclient/impl/level1/jaxb/jaxb.index
___________________________________________________________________
Name: svn:mime-type
   + text/plain