perfsonar development work

Author: krzjed
Date: 2009-07-02 05:09:51 -0400 (Thu, 02 Jul 2009)
New Revision: 5205

Added:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/AuthorativeLookupservice.java
Removed:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/AuthorativeLookupService.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/NetworkInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/handlers/
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/lsinfo/
Modified:
   trunk/perfsonar_java-lsclient-api/pom.xml
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.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/data/Service.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel1.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
Log:
Added classes moved from API to implementation

Modified: trunk/perfsonar_java-lsclient-api/pom.xml
===================================================================
--- trunk/perfsonar_java-lsclient-api/pom.xml   2009-06-25 15:35:34 UTC (rev 
5204)
+++ trunk/perfsonar_java-lsclient-api/pom.xml   2009-07-02 09:09:51 UTC (rev 
5205)
@@ -24,7 +24,7 @@
                        <organization>SURFnet</organization>
                </developer>
                <developer>
-                       <id>kjedrzejewski</id>
+                       <id>krzjed</id>
                        <name>Krzysztof Jedrzejewski</name>
                        
<organizationUrl>http://www.man.poznan.pl</organizationUrl>
                        <timezone>1</timezone>

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
   2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
   2009-07-02 09:09:51 UTC (rev 5205)
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import org.perfsonar.lsclient.data.AuthorativeLookupService;
+import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 
 /**
  * Represents a step in the discovery process.
@@ -25,7 +25,7 @@
         * @return a (possibly empty) set of Authoratative lookup services 
         * or null if this step failed.
         */
-       Set<AuthorativeLookupService> getServices();
+       Set<AuthorativeLookupservice> getServices();
 
        /**
         * If this step has completely failed.

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
 2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2009-07-02 09:09:51 UTC (rev 5205)
@@ -1,17 +1,14 @@
 package org.perfsonar.lsclient;
 
-import java.util.List;
 import java.util.Set;
 
-import org.perfsonar.lsclient.data.AuthorativeLookupService;
+import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.LookupService;
-import org.perfsonar.lsclient.data.NetworkInterface;
 import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
-import org.perfsonar.lsclient.handlers.NetworkInterfaceHandler;
 
 /**
  * Specified java interface for the perfSONAR LS Level-1 api.
@@ -22,176 +19,176 @@
  * @since 1.0
  */
 public interface Level1LsClientInterface {
-       /**
-        * Allows one to redefine the set of root global services to be used. 
In
-        * other words the set supplied here replaces the default set 
supplied by
-        * the implementation (this default set can be empty depending on the
-        * implementation) During discovery the set of root 
GobalLookupServices is
-        * used. The set functions as a Roots File - Similar to a root.hints 
in
-        * DNS(we simply require a point of entry by which we can discover 
others).
-        * see: http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/doc/dLS/gLS/
-        * phase_1_color.html#bootstrapping
-        * 
-        * @param rootServices
-        *            a non-empty set of GobalLookupServices that will act as 
a
-        *            Roots file
-        * 
-        * @throws IllegalArgumentException
-        *             if null or a empty set is specified.
-        */
-       void setKnownLookupServices(Set<LookupService> rootServices);
+    /**
+     * Allows one to redefine the set of root global services to be used. In
+     * other words the set supplied here replaces the default set supplied by
+     * the implementation (this default set can be empty depending on the
+     * implementation) During discovery the set of root GobalLookupServices 
is
+     * used. The set functions as a Roots File - Similar to a root.hints in
+     * DNS(we simply require a point of entry by which we can discover 
others).
+     * see: http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/doc/dLS/gLS/
+     * phase_1_color.html#bootstrapping
+     * 
+     * @param rootServices
+     *            a non-empty set of GobalLookupServices that will act as a
+     *            Roots file
+     * 
+     * @throws IllegalArgumentException
+     *             if null or a empty set is specified.
+     */
+    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 
about
-        * the given parameters. More formally it should be interpreted as
-        * any(topologyElement) AND any(eventType) AND any(serviceType) where 
any()
-        * is true if one or more of the elements within the specified set are
-        * present.
-        * 
-        * @param elements
-        *            a set of topologyElements of which one or more should 
match
-        * @param eventTypes
-        *            a set of eventTypes of which one or more should match
-        * @param types
-        *            a set of serviceTypes of which one or more should match
-        * @return a non-null Set of non-null (home)LookupServices that know 
about
-        *         any elements AND any eventTypes AND types
-        * 
-        * @throw 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
-        *        non-null this is because currently there isn't a way to 
determine
-        *        the serviceType in the LS at this point. Also it's use 
during
-        *        discovery is questionable.
-        */
-       Set<AuthorativeLookupService> discover(Set<TopologyElement> elements,
-                       Set<EventType> eventTypes, Set<ServiceType> types);
+    /**
+     * Given some parameters this method returns a set of LookupService's 
that
+     * have one or more services registered to them that know something about
+     * the given parameters. More formally it should be interpreted as
+     * any(topologyElement) AND any(eventType) AND any(serviceType) where 
any()
+     * is true if one or more of the elements within the specified set are
+     * present.
+     * 
+     * @param elements
+     *            a set of topologyElements of which one or more should match
+     * @param eventTypes
+     *            a set of eventTypes of which one or more should match
+     * @param types
+     *            a set of serviceTypes of which one or more should match
+     * @return a non-null Set of non-null (home)LookupServices that know 
about
+     *         any elements AND any eventTypes AND types
+     * 
+     * @throw 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
+     *        non-null this is because currently there isn't a way to 
determine
+     *        the serviceType in the LS at this point. Also it's use during
+     *        discovery is questionable.
+     */
+    Set<AuthorativeLookupservice> discover(Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> types);
 
-       /**
-        * starts a 
{@link
 DiscoveryProcess} allowing one to take more fine-grained
-        * control over the discovery process.
-        * 
-        * @param elements
-        *            a set of topologyElements of which one or more should 
match
-        * @param eventTypes
-        *            a set of eventTypes of which one or more should match
-        * @param types
-        *            a set of serviceTypes of which one or more should match
-        * @return DiscoveryProcess Object representing the discovery process 
see
-        *         
{@link
 DiscoveryProcess}
-        */
-       DiscoveryProcess startDiscovery(Set<TopologyElement> elements,
-                       Set<EventType> eventTypes, Set<ServiceType> types);
+    /**
+     * starts a 
{@link
 DiscoveryProcess} allowing one to take more fine-grained
+     * control over the discovery process.
+     * 
+     * @param elements
+     *            a set of topologyElements of which one or more should match
+     * @param eventTypes
+     *            a set of eventTypes of which one or more should match
+     * @param types
+     *            a set of serviceTypes of which one or more should match
+     * @return DiscoveryProcess Object representing the discovery process see
+     *         
{@link
 DiscoveryProcess}
+     */
+    DiscoveryProcess startDiscovery(Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> types);
 
-       /**
-        * Given some parameters this method returns a set of 
{@link
 Service} that
-        * is retrieved from a home lookup service. It returns all 
{@link
 Service}
-        * of services that knows something about the specified parameters. 
More
-        * formally it should be interpreted as any(topologyElement) AND
-        * any(eventType) AND any(serviceType) where any() is true if one or 
more of
-        * the elements within the specified set are present.
-        * 
-        * @param hls
-        *            home lookup service
-        * @param elements
-        *            a set of topologyElements of which one or more should 
match
-        * @param eventTypes
-        *            a set of eventTypes of which one or more should match
-        * @param types
-        *            a set of serviceTypes of which one or more should match
-        * @return a non-null Set of (home)LookupServices that know about any
-        *         elements AND any eventTypes AND types
-        * 
-        * @throw 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
-        *        non-null this is because currently there isn't a way to 
determine
-        *        the serviceType in the LS at this point. Also it's use 
during
-        *        discovery is questionable.
-        */
-       Set<Service> getLSQueryLocation(AuthorativeLookupService hls,
-                       Set<TopologyElement> elements, Set<EventType> 
eventTypes,
-                       Set<ServiceType> types);
+    /**
+     * Given some parameters this method returns a set of 
{@link
 Service} that
+     * is retrieved from a home lookup service. It returns all 
{@link
 Service}
+     * of services that knows something about the specified parameters. More
+     * formally it should be interpreted as any(topologyElement) AND
+     * any(eventType) AND any(serviceType) where any() is true if one or 
more of
+     * the elements within the specified set are present.
+     * 
+     * @param hls
+     *            home lookup service
+     * @param elements
+     *            a set of topologyElements of which one or more should match
+     * @param eventTypes
+     *            a set of eventTypes of which one or more should match
+     * @param types
+     *            a set of serviceTypes of which one or more should match
+     * @return a non-null Set of (home)LookupServices that know about any
+     *         elements AND any eventTypes AND types
+     * 
+     * @throw 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
+     *        non-null this is because currently there isn't a way to 
determine
+     *        the serviceType in the LS at this point. Also it's use during
+     *        discovery is questionable.
+     */
+    Set<Service> getLSQueryLocation(AuthorativeLookupservice hls,
+            Set<TopologyElement> elements, Set<EventType> eventTypes,
+            Set<ServiceType> types);
 
-       /**
-        * Given some parameters this method returns a set of
-        * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup
-        * service. It returns all 
{@link
 Service} of services that knows something
-        * about the specified parameters. More formally it should be 
interpreted as
-        * any(topologyElement) AND any(eventType) AND any(serviceType) where 
any()
-        * is true if one or more of the elements within the specified set are
-        * present.
-        * 
-        * @param hls
-        *            home lookup service
-        * @param elements
-        *            a set of topologyElements of which one or more should 
match
-        * @param eventTypes
-        *            a set of eventTypes of which one or more should match
-        * @param types
-        *            a set of serviceTypes of which one or more should match
-        * @return a non-null Set of (home)LookupServices that know about any
-        *         elements AND any eventTypes AND types
-        * 
-        * @throws 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
-        *         non-null this is because currently there isn't a way to 
determine
-        *         the serviceType in the LS at this point. Also it's use 
during
-        *         discovery is questionable.
-        */
-       Set<ServiceMeasurementMetadata> getLSQueryContent(
-                       AuthorativeLookupService hls, Set<TopologyElement> 
elements,
-                       Set<EventType> eventTypes, Set<ServiceType> types);
+    /**
+     * Given some parameters this method returns a set of
+     * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup
+     * service. It returns all 
{@link
 Service} of services that knows something
+     * about the specified parameters. More formally it should be 
interpreted as
+     * any(topologyElement) AND any(eventType) AND any(serviceType) where 
any()
+     * is true if one or more of the elements within the specified set are
+     * present.
+     * 
+     * @param hls
+     *            home lookup service
+     * @param elements
+     *            a set of topologyElements of which one or more should match
+     * @param eventTypes
+     *            a set of eventTypes of which one or more should match
+     * @param types
+     *            a set of serviceTypes of which one or more should match
+     * @return a non-null Set of (home)LookupServices that know about any
+     *         elements AND any eventTypes AND types
+     * 
+     * @throws 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
+     *         non-null this is because currently there isn't a way to 
determine
+     *         the serviceType in the LS at this point. Also it's use during
+     *         discovery is questionable.
+     */
+    Set<ServiceMeasurementMetadata> getLSQueryContent(
+            AuthorativeLookupservice hls, Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> types);
 
-       /**
-        * TODO evaluate Given a service this method returns a set of
-        * 
{@link
 ServiceMetadata} that is retrieved from a home lookup service.
-        * 
-        * @param hls
-        *            home lookup service
-        * @param service
-        */
-       // Set<ServiceMetadata> getLSQueryLocation(AuthorativeLookupservice 
hls,
-       // Service service);
-       /**
-        * TODO evaluate Given a service returns a set of
-        * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup
-        * service.
-        * 
-        * @param hls
-        *            home lookup service
-        * @param servicegetLSMeasuredInterfaces
-        *            (LookupService hls, Service service) throws 
LsQueryException
-        */
-       // Set<ServiceMeasurementMetadata>
-       // getLSQueryContent(AuthorativeLookupservice hls, Service service);
-       /**
-        * Finds interfaces measured by given measurement service. If this 
method
-        * result is stored only temporary, method processLSMeasuredInterfaces
-        * should be used instead, because it uses less memory.
-        * 
-        * @param hls
-        *            Lookup Service that contains information that are 
searched for
-        * @param service
-        *            service that measures interfaces that are searched for
-        * @return 
{@link
 List} of interfaces given service collect informations of
-        * 
-        * @throws LsQueryException
-        *             when problems with connection or response parsing 
occurs
-        */
-       List<NetworkInterface> getLSMeasuredInterfaces(LookupService hls,
-                       Service service) throws LsQueryException;
-
-       /**
-        * Finds interfaces measured by given measurement service and 
processes it
-        * using given handler.
-        * 
-        * @param hls
-        *            Lookup Service that contains information thar are 
searched for
-        * @param service
-        *            service that measures interfaces that are searched for
-        * @param handler
-        *            
{@link
 NetworkInterfaceHandler} containing instructions for
-        *            processing found 
{@link
 NetworkInterface}s
-        * @throws LsQueryException
-        *             when problems with connection or response parsing 
occurs
-        */
-       void processLSMeasuredInterfaces(LookupService hls, Service service,
-                       NetworkInterfaceHandler handler) throws 
LsQueryException;
+    /**
+     * TODO evaluate Given a service this method returns a set of
+     * 
{@link
 ServiceMetadata} that is retrieved from a home lookup service.
+     * 
+     * @param hls
+     *            home lookup service
+     * @param service
+     */
+    // Set<ServiceMetadata> getLSQueryLocation(AuthorativeLookupservice hls,
+    // Service service);
+    /**
+     * TODO evaluate Given a service returns a set of
+     * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup
+     * service.
+     * 
+     * @param hls
+     *            home lookup service
+     * @param servicegetLSMeasuredInterfaces
+     *            (LookupService hls, Service service) throws 
LsQueryException
+     */
+    Set<ServiceMeasurementMetadata> getLSQueryContent(
+            AuthorativeLookupservice hls, Service service);
+    // /**
+    // * Finds interfaces measured by given measurement service. If this 
method
+    // * result is stored only temporary, method processLSMeasuredInterfaces
+    // * should be used instead, because it uses less memory.
+    // *
+    // * @param hls
+    // * Lookup Service that contains information that are searched for
+    // * @param service
+    // * service that measures interfaces that are searched for
+    // * @return 
{@link
 List} of interfaces given service collect informations
+    // of
+    // *
+    // * @throws LsQueryException
+    // * when problems with connection or response parsing occurs
+    // */
+    // List<NetworkInterface> getLSMeasuredInterfaces(LookupService hls,
+    // Service service) throws LsQueryException;
+    // /**
+    // * Finds interfaces measured by given measurement service and 
processes it
+    // * using given handler.
+    // *
+    // * @param hls
+    // * Lookup Service that contains information thar are searched for
+    // * @param service
+    // * service that measures interfaces that are searched for
+    // * @param handler
+    // * 
{@link
 NetworkInterfaceHandler} containing instructions for
+    // * processing found 
{@link
 NetworkInterface}s
+    // * @throws LsQueryException
+    // * when problems with connection or response parsing occurs
+    // */
+    // void processLSMeasuredInterfaces(LookupService hls, Service service,
+    // NetworkInterfaceHandler handler) throws LsQueryException;
 }

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

Added: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/AuthorativeLookupservice.java

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

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
    2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
    2009-07-02 09:09:51 UTC (rev 5205)
@@ -7,7 +7,7 @@
  * @author michael.bischoff
  */
 public interface Service extends Comparable<Service> {
-       AuthorativeLookupService getAuthorativeLookupService();
+       AuthorativeLookupservice getAuthorativeLookupService();
        
        URI getEndPoint();
        

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel1.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel1.java
  2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel1.java
  2009-07-02 09:09:51 UTC (rev 5205)
@@ -7,7 +7,7 @@
 import org.perfsonar.lsclient.DiscoveryStep;
 import org.perfsonar.lsclient.Level0LsClientInterface;
 import org.perfsonar.lsclient.Level1LsClientInterface;
-import org.perfsonar.lsclient.data.AuthorativeLookupService;
+import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
@@ -34,8 +34,8 @@
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level1LsClientInterface#discover(java.util.Set, 
java.util.Set, java.util.Set)
         */
-       public Set<AuthorativeLookupService> discover(Set<TopologyElement> 
elements, Set<EventType> eventTypes, Set<ServiceType> type) {
-               Set<AuthorativeLookupService> result = new 
HashSet<AuthorativeLookupService>(50);
+       public Set<AuthorativeLookupservice> discover(Set<TopologyElement> 
elements, Set<EventType> eventTypes, Set<ServiceType> type) {
+               Set<AuthorativeLookupservice> result = new 
HashSet<AuthorativeLookupservice>(50);
                DiscoveryProcess process = startDiscovery(elements, 
eventTypes, type);
                for(DiscoveryStep step : process) {
                        if(!step.hasFailed()) 
result.addAll(step.getServices());

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
  2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
  2009-07-02 09:09:51 UTC (rev 5205)
@@ -6,7 +6,7 @@
 import org.perfsonar.lsclient.Level0LsClientInterface;
 import org.perfsonar.lsclient.Level1LsClientInterface;
 import org.perfsonar.lsclient.Level2LsClientInterface;
-import org.perfsonar.lsclient.data.AuthorativeLookupService;
+import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
 import org.perfsonar.lsclient.data.Service;
@@ -34,9 +34,9 @@
         * @see 
org.perfsonar.lsclient.Level2LsClientInterface#getContent(java.util.Set, 
java.util.Set, java.util.Set)
         */
        public Set<ServiceMeasurementMetadata> 
getContent(Set<TopologyElement> elements, Set<EventType> eventTypes,     
Set<ServiceType> type) {
-               Set<AuthorativeLookupService> homeLookupServices = 
level1.discover(elements, eventTypes, type);
+               Set<AuthorativeLookupservice> homeLookupServices = 
level1.discover(elements, eventTypes, type);
                Set<ServiceMeasurementMetadata> result = new 
HashSet<ServiceMeasurementMetadata>(homeLookupServices.size()*4);
-               for(AuthorativeLookupService homeLookupService : 
homeLookupServices) {
+               for(AuthorativeLookupservice homeLookupService : 
homeLookupServices) {
                        
result.addAll(level1.getLSQueryContent(homeLookupService, elements, 
eventTypes, type));
                }               
                return result;
@@ -46,9 +46,9 @@
         * @see 
org.perfsonar.lsclient.Level2LsClientInterface#getLocation(java.util.Set, 
java.util.Set, java.util.Set)
         */
        public Set<Service> getLocation(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> type) {
-               Set<AuthorativeLookupService> authorativeLSes = 
level1.discover(elements, eventTypes, type);
+               Set<AuthorativeLookupservice> authorativeLSes = 
level1.discover(elements, eventTypes, type);
                Set<Service> result = new 
HashSet<Service>(authorativeLSes.size()*4);
-               for(AuthorativeLookupService authorativeLS : authorativeLSes) 
{
+               for(AuthorativeLookupservice authorativeLS : authorativeLSes) 
{
                        
result.addAll(level1.getLSQueryLocation(authorativeLS, elements, eventTypes, 
type));
                }               
                return result;

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
        2009-06-25 15:35:34 UTC (rev 5204)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2009-07-02 09:09:51 UTC (rev 5205)
@@ -1,7 +1,6 @@
 package org.perfsonar.lsclient.helpers;
 
 import java.io.InputStream;
-import java.util.List;
 import java.util.Set;
 
 import org.perfsonar.lsclient.DiscoveryProcess;
@@ -10,15 +9,13 @@
 import org.perfsonar.lsclient.Level2LsClientInterface;
 import org.perfsonar.lsclient.LsClient;
 import org.perfsonar.lsclient.LsQueryException;
-import org.perfsonar.lsclient.data.AuthorativeLookupService;
+import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.LookupService;
-import org.perfsonar.lsclient.data.NetworkInterface;
 import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
-import org.perfsonar.lsclient.handlers.NetworkInterfaceHandler;
 
 /**
  * Abstract class that makes use of delegates so levels can easily be swapped
@@ -74,7 +71,7 @@
         * 
org.perfsonar.lsclient.Level1LsClientInterface#discover(java.util.Set,
         * java.util.Set, java.util.Set)
         */
-       public Set<AuthorativeLookupService> discover(
+       public Set<AuthorativeLookupservice> discover(
                        Set<TopologyElement> elements, Set<EventType> 
eventTypes,
                        Set<ServiceType> type) {
                return getLevel1().discover(elements, eventTypes, type);
@@ -89,7 +86,7 @@
         * java.util.Set)
         */
        public Set<ServiceMeasurementMetadata> getLSQueryContent(
-                       AuthorativeLookupService aLs, Set<TopologyElement> 
elements,
+                       AuthorativeLookupservice aLs, Set<TopologyElement> 
elements,
                        Set<EventType> eventTypes, Set<ServiceType> type) {
                return getLevel1().getLSQueryContent(aLs, elements, 
eventTypes, type);
        }
@@ -102,7 +99,7 @@
         * .perfsonar.lsclient.data.HomeLookupService, java.util.Set, 
java.util.Set,
         * java.util.Set)
         */
-       public Set<Service> getLSQueryLocation(AuthorativeLookupService aLs,
+       public Set<Service> getLSQueryLocation(AuthorativeLookupservice aLs,
                        Set<TopologyElement> elements, Set<EventType> 
eventTypes,
                        Set<ServiceType> type) {
                return getLevel1().getLSQueryLocation(aLs, elements, 
eventTypes, type);
@@ -158,30 +155,32 @@
                return getLevel2().getLocation(elements, eventTypes, type);
        }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSMeasuredInterfaces(
-        * org.perfsonar.lsclient.data.AuthorativeLookupservice,
-        * org.perfsonar.lsclient.data.Service)
-        */
-       public List<NetworkInterface> getLSMeasuredInterfaces(LookupService 
hls,
-                       Service service) throws LsQueryException {
-               return getLevel1().getLSMeasuredInterfaces(hls, service);
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#processLSMeasuredInterfaces
-        * (org.perfsonar.lsclient.data.LookupService,
-        * org.perfsonar.lsclient.data.Service,
-        * org.perfsonar.lsclient.handlers.NetworkInterfaceHandler)
-        */
-       public void processLSMeasuredInterfaces(LookupService hls, Service 
service,
-                       NetworkInterfaceHandler handler) throws 
LsQueryException {
-               getLevel1().processLSMeasuredInterfaces(hls, service, 
handler);
-       }
+    // /*
+    // * (non-Javadoc)
+    // *
+    // * @see
+    // * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSMeasuredInterfaces(
+    // * org.perfsonar.lsclient.data.AuthorativeLookupservice,
+    // * org.perfsonar.lsclient.data.Service)
+    // */
+    // public List<NetworkInterface> getLSMeasuredInterfaces(LookupService 
hls,
+    // Service service) throws LsQueryException {
+    // return getLevel1().getLSMeasuredInterfaces(hls, service);
+    // }
+    //
+    // /*
+    // * (non-Javadoc)
+    // *
+    // * @see
+    // *
+    // 
org.perfsonar.lsclient.Level1LsClientInterface#processLSMeasuredInterfaces
+    // * (org.perfsonar.lsclient.data.LookupService,
+    // * org.perfsonar.lsclient.data.Service,
+    // * org.perfsonar.lsclient.handlers.NetworkInterfaceHandler)
+    // */
+    // public void processLSMeasuredInterfaces(LookupService hls, Service
+    // service,
+    // NetworkInterfaceHandler handler) throws LsQueryException {
+    // getLevel1().processLSMeasuredInterfaces(hls, service, handler);
+    // }
 }