perfsonar development work

Author: michael.bischoff
Date: 2008-10-09 08:06:16 -0400 (Thu, 09 Oct 2008)
New Revision: 4599

Removed:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
Modified:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/ImplementationNotFoundException.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/LsClientProvider.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceType.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
Log:


Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/ImplementationNotFoundException.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/ImplementationNotFoundException.java
 2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/ImplementationNotFoundException.java
 2008-10-09 12:06:16 UTC (rev 4599)
@@ -2,4 +2,18 @@
 
 public class ImplementationNotFoundException extends RuntimeException {
 
+       private static final long serialVersionUID = 1L;
+
+       public ImplementationNotFoundException(String message, Throwable 
cause) {
+               super(message, cause);
+       }
+
+       public ImplementationNotFoundException(String message) {
+               super(message);
+       }
+
+       public ImplementationNotFoundException(Throwable cause) {
+               super(cause);
+       }
+
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
 2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
 2008-10-09 12:06:16 UTC (rev 4599)
@@ -31,4 +31,14 @@
         *                 (this is Optional) the string doesn't contain a 
valid XQuery 
         */
        InputStream getRawQueryResult(LookupService lookupService, String 
xquery) throws LsQueryException;
+       
+       /**
+        * @param lookupService (should not be null.)
+        * @param summaryDescription (should not be null.)
+        * @return a InputStream of the response
+        * @throws LsQueryException when there are problems with querying the 
LookupService
+        * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
+        *                 (this is Optional) the string doesn't contain a 
valid XQuery 
+        */
+       InputStream getDiscoveryResponse(LookupService lookupService, String 
summaryDescription) throws LsQueryException;
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2008-10-09 12:06:16 UTC (rev 4599)
@@ -31,7 +31,7 @@
         * 
         * @throws IllegalArgumentException if null or a empty set is 
specified.
         */
-       void setKnownGlobalLookupServices(Set<LookupService> rootServices);
+       void setKnownLookupServices(Set<LookupService> rootServices);
        /**
         * Given some parameters this method returns a set of LookupService's
         * that have one or more services registered to them that know 
something 
@@ -108,7 +108,6 @@
         *  
         * @param hls home lookup service
         * @param service 
-        * @return a non-null Set of (home)LookupServices that know about any 
elements AND any eventTypes AND types
         */
        //Set<ServiceMetadata> getLSQueryLocation(AuthorativeLookupservice 
hls, Service service);
        /** 
@@ -118,7 +117,6 @@
         *   
         * @param hls home lookup service
         * @param service 
-        * @return a non-null Set of (home)LookupServices that know about any 
elements AND any eventTypes AND types
         */
        //Set<ServiceMeasurementMetadata> 
getLSQueryContent(AuthorativeLookupservice hls, Service service);
 

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
 2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
 2008-10-09 12:06:16 UTC (rev 4599)
@@ -39,4 +39,5 @@
         * @see 
Level1LsClientInterface#getLSQueryContent(org.perfsonar.lsclient.data.AuthorativeLookupservice,
 Set, Set, Set)
         */
        Set<ServiceMeasurementMetadata> getContent(Set<TopologyElement> 
elements, Set<EventType> eventTypes, Set<ServiceType> type);
+       
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/LsClientProvider.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/LsClientProvider.java
        2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/LsClientProvider.java
        2008-10-09 12:06:16 UTC (rev 4599)
@@ -35,6 +35,7 @@
         * Looks for a implementation by means of the service provider 
mechanism.
         * See also 
http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service%20Provider  
         * @return a full LS Client 
+        * @throws ImplementationNotFoundException 
         * @see Level2LsClientInterface
         */
        public static LsClient getClient() throws 
ImplementationNotFoundException {
@@ -57,6 +58,6 @@
                while (providers.hasNext()) {
                        return providers.next();                        
                }
-               throw new ImplementationNotFoundException();
+               throw new ImplementationNotFoundException("Unable to find the 
implementation make sure there's a jar on the classpath containing a 
implementation");
        }
 }

Deleted: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
 2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
 2008-10-09 12:06:16 UTC (rev 4599)
@@ -1,9 +1,9 @@
 package org.perfsonar.lsclient.data;
 
 /**
- * @author michael
- * I think this is Service Metadata
+ * @author michael.bischoff
+ * This contains the information blob that services can register when they 
register themselves
  */
 public interface ServiceMeasurementMetadata {
-
+ //TODO
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java
    2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java
    2008-10-09 12:06:16 UTC (rev 4599)
@@ -8,5 +8,5 @@
  *
  */
 public interface ServiceMetadata {
-
+ //TODO
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceType.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceType.java
        2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceType.java
        2008-10-09 12:06:16 UTC (rev 4599)
@@ -1,5 +1,5 @@
 package org.perfsonar.lsclient.data;
 
 public interface ServiceType {
-
+ //TODO
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2008-10-09 11:06:40 UTC (rev 4598)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2008-10-09 12:06:16 UTC (rev 4599)
@@ -39,6 +39,13 @@
        public InputStream getRawQueryResult(LookupService lookupService, 
String xquery) throws LsQueryException, IllegalArgumentException {
                return getLevel0().getRawQueryResult(lookupService, xquery);
        }
+       
+        /* (non-Javadoc)
+        * @see 
org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.perfsonar.lsclient.data.LookupService,
 java.lang.String)
+        */
+       public InputStream getDiscoveryResponse(LookupService lookupService, 
String summaryDescription) throws LsQueryException {
+               return getLevel0().getDiscoveryResponse(lookupService, 
summaryDescription);
+       }
 
        // -- Level 1 --
        
@@ -63,8 +70,8 @@
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level1LsClientInterface#setKnownGlobalLookupServices(java.util.Set)
         */
-       public void setKnownGlobalLookupServices(Set<LookupService> 
rootServices) {
-               getLevel1().setKnownGlobalLookupServices(rootServices);
+       public void setKnownLookupServices(Set<LookupService> rootServices) {
+               getLevel1().setKnownLookupServices(rootServices);
        }
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level1LsClientInterface#startDiscovery(java.util.Set, 
java.util.Set, java.util.Set)