commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery ResourceInfo.java ServiceDiscovery12.java ServiceDiscoveryTask.java ServiceDiscovery.java ServiceInfo.java
Date Wed, 21 Aug 2002 18:52:02 GMT
rsitze      2002/08/21 11:52:01

  Modified:    discovery/src/java/org/apache/commons/discovery
                        ServiceDiscovery12.java ServiceDiscoveryTask.java
                        ServiceDiscovery.java
  Added:       discovery/src/java/org/apache/commons/discovery
                        ResourceInfo.java
  Removed:     discovery/src/java/org/apache/commons/discovery
                        ServiceInfo.java
  Log:
  Changed ServiceInfo to ResourceInfo.
  
  Revision  Changes    Path
  1.3       +3 -6      jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscovery12.java
  
  Index: ServiceDiscovery12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscovery12.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceDiscovery12.java	20 Aug 2002 16:38:56 -0000	1.2
  +++ ServiceDiscovery12.java	21 Aug 2002 18:52:01 -0000	1.3
  @@ -82,7 +82,7 @@
           return Thread.currentThread().getContextClassLoader();
       }
    
  -    public ServiceInfo[] findServices( String name ) {
  +    public ResourceInfo[] findServices( String name ) {
           // use each loader to find if META-INF/services.
           // find all resources, etc.
       
  @@ -130,10 +130,7 @@
                                           continue;
                                       if( serviceImplName.startsWith( "#" ))
                                           continue;
  -                                    ServiceInfo sinfo=new ServiceInfo();
  -                                    sinfo.setImplName( serviceImplName );
  -                                    sinfo.setLoader( loader );
  -                                    sinfo.setURL( baseURL );
  +                                    ResourceInfo sinfo=new ResourceInfo(serviceImplName,
loader, baseURL);
                                       results.add(sinfo);
                                       System.out.println("XXX " + sinfo.toString());
                                   }
  @@ -152,7 +149,7 @@
               }
           }
   
  -        ServiceInfo resultA[]=new ServiceInfo[ results.size() ];
  +        ResourceInfo resultA[]=new ResourceInfo[ results.size() ];
           results.copyInto( resultA );
           return resultA;
       }
  
  
  
  1.3       +2 -2      jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscoveryTask.java
  
  Index: ServiceDiscoveryTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscoveryTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceDiscoveryTask.java	21 Aug 2002 11:47:18 -0000	1.2
  +++ ServiceDiscoveryTask.java	21 Aug 2002 18:52:01 -0000	1.3
  @@ -77,7 +77,7 @@
   {
       String name;
       int debug=0;
  -    ServiceInfo drivers[]=null;
  +    ResourceInfo drivers[]=null;
           
       public void setServiceName(String name ) {
           this.name=name;
  @@ -87,7 +87,7 @@
           this.debug=debug;
       }
   
  -    public ServiceInfo[] getServiceInfo() {
  +    public ResourceInfo[] getServiceInfo() {
           return drivers;
       }
   
  
  
  
  1.3       +1 -1      jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscovery.java
  
  Index: ServiceDiscovery.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ServiceDiscovery.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceDiscovery.java	21 Aug 2002 11:47:18 -0000	1.2
  +++ ServiceDiscovery.java	21 Aug 2002 18:52:01 -0000	1.3
  @@ -132,6 +132,6 @@
        */
       public abstract ClassLoader getThreadClassLoader();
    
  -    public abstract ServiceInfo[] findServices( String name );
  +    public abstract ResourceInfo[] findServices( String name );
   
   }
  
  
  
  1.1                  jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceInfo.java
  
  Index: ResourceInfo.java
  ===================================================================
  /*
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  
  package org.apache.commons.discovery;
  
  import java.io.BufferedReader;
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.util.Properties;
  import java.util.Vector;
  import java.net.URL;
  
  /**
   * 'Service' located by the discovery.
   * 
   * @author Richard A. Sitze
   * @author Craig R. McClanahan
   * @author Costin Manolache
   */
  public class ResourceInfo 
  {
      String      resourceName;
      ClassLoader loader;
      URL         location;
  
      public ResourceInfo() {
      }
  
      public ResourceInfo(String resourceName, ClassLoader loader, URL location) {
          setResourceName( resourceName );
          setLoader( loader );
          setURL( location );
      }
  
      /**
       * Get the value of URL.
       * @return value of URL.
       */
      public URL getURL() {
          return location;
      }
      
      /**
       * Set the value of URL.
       * @param v  Value to assign to URL.
       */
      public void setURL(URL  v) {
          this.location = v;
      }
      
  
      /**
       * Get the value of resourceName.
       * @return value of resourceName.
       */
      public String getResourceName() {
          return resourceName;
      }
      
      /**
       * Set the value of resourceName.
       * @param v  Value to assign to resourceName.
       */
      public void setResourceName(String  v) {
          this.resourceName = v;
      }
      
      /**
       * Get the value of loader.
       * @return value of loader.
       */
      public ClassLoader getLoader() {
          return loader;
      }
      
      /**
       * Set the value of loader.
       * @param v  Value to assign to loader.
       */
      public void setLoader(ClassLoader  v) {
          this.loader = v;
      }
      
      public String toString() {
          return "Resource " + resourceName + " " + loader + " " + location;
      }
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message