You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rs...@apache.org on 2002/08/22 18:59:02 UTC
cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery/base ImplClass.java Environment.java
rsitze 2002/08/22 09:59:02
Modified: discovery/src/java/org/apache/commons/discovery/tools
ClassLoaderUtils.java
discovery/src/java/org/apache/commons/discovery
ResourceInfo.java ResourceDiscovery.java
DiscoverSingleton.java Service.java
ServiceDiscovery.java
discovery/src/java/org/apache/commons/discovery/base
ImplClass.java Environment.java
Log:
cleaned up imports,
added ResourceInfo.toArray utility function if anybody still wants an array..
Revision Changes Path
1.3 +0 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/tools/ClassLoaderUtils.java
Index: ClassLoaderUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/tools/ClassLoaderUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassLoaderUtils.java 22 Aug 2002 14:23:27 -0000 1.2
+++ ClassLoaderUtils.java 22 Aug 2002 16:59:02 -0000 1.3
@@ -62,10 +62,8 @@
package org.apache.commons.discovery.tools;
import java.io.InputStream;
-import java.util.Enumeration;
import org.apache.commons.discovery.DiscoveryException;
-import org.apache.commons.discovery.ResourceInfo;
import org.apache.commons.discovery.base.ClassLoaders;
1.3 +16 -7 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceInfo.java
Index: ResourceInfo.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceInfo.java 21 Aug 2002 18:54:11 -0000 1.2
+++ ResourceInfo.java 22 Aug 2002 16:59:02 -0000 1.3
@@ -57,20 +57,17 @@
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;
+import java.util.Enumeration;
+import java.util.Vector;
+
/**
* 'Resource' located by discovery.
*
- * @author Richard A. Sitze
* @author Craig R. McClanahan
* @author Costin Manolache
+ * @author Richard A. Sitze
*/
public class ResourceInfo
{
@@ -138,5 +135,17 @@
public String toString() {
return "Resource " + resourceName + " " + loader + " " + location;
+ }
+
+ public static ResourceInfo[] toArray(Enumeration enum) {
+ Vector vector = new Vector();
+ while (enum.hasMoreElements()) {
+ ResourceInfo resourceInfo = (ResourceInfo)enum.nextElement();
+ vector.add(resourceInfo);
+ }
+ ResourceInfo[] resources = new ResourceInfo[vector.size()];
+ vector.copyInto(resources);
+
+ return resources;
}
}
1.7 +0 -1 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceDiscovery.java
Index: ResourceDiscovery.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceDiscovery.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceDiscovery.java 22 Aug 2002 15:20:41 -0000 1.6
+++ ResourceDiscovery.java 22 Aug 2002 16:59:02 -0000 1.7
@@ -60,7 +60,6 @@
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Vector;
import org.apache.commons.discover.jdk.JDKHooks;
import org.apache.commons.discovery.base.ClassLoaders;
1.8 +0 -3 jakarta-commons/discovery/src/java/org/apache/commons/discovery/DiscoverSingleton.java
Index: DiscoverSingleton.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/DiscoverSingleton.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DiscoverSingleton.java 21 Aug 2002 22:48:45 -0000 1.7
+++ DiscoverSingleton.java 22 Aug 2002 16:59:02 -0000 1.8
@@ -61,15 +61,12 @@
package org.apache.commons.discovery;
-import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Properties;
import org.apache.commons.discovery.base.Environment;
import org.apache.commons.discovery.base.ImplClass;
import org.apache.commons.discovery.base.SPInterface;
-import org.apache.commons.discovery.tools.ClassLoaderUtils;
import org.apache.commons.discovery.tools.EnvironmentCache;
1.7 +0 -8 jakarta-commons/discovery/src/java/org/apache/commons/discovery/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/Service.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Service.java 22 Aug 2002 14:23:27 -0000 1.6
+++ Service.java 22 Aug 2002 16:59:02 -0000 1.7
@@ -57,16 +57,8 @@
package org.apache.commons.discovery;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Enumeration;
-import java.util.Vector;
-import org.apache.commons.discovery.base.ClassLoaders;
import org.apache.commons.discovery.base.Environment;
import org.apache.commons.discovery.base.ImplClass;
import org.apache.commons.discovery.base.SPInterface;
1.7 +0 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceDiscovery.java 22 Aug 2002 15:20:41 -0000 1.6
+++ ServiceDiscovery.java 22 Aug 2002 16:59:02 -0000 1.7
@@ -67,8 +67,6 @@
import java.util.Vector;
import org.apache.commons.discovery.base.ClassLoaders;
-import org.apache.commons.discovery.base.ImplClass;
-import org.apache.commons.discovery.base.SPInterface;
/**
1.6 +0 -1 jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java
Index: ImplClass.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ImplClass.java 22 Aug 2002 14:55:15 -0000 1.5
+++ ImplClass.java 22 Aug 2002 16:59:02 -0000 1.6
@@ -65,7 +65,6 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.discovery.DiscoveryException;
-import org.apache.commons.discovery.tools.ClassLoaderUtils;
/**
1.7 +0 -1 jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/Environment.java
Index: Environment.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/Environment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Environment.java 21 Aug 2002 22:48:46 -0000 1.6
+++ Environment.java 22 Aug 2002 16:59:02 -0000 1.7
@@ -63,7 +63,6 @@
import org.apache.commons.discover.jdk.JDKHooks;
import org.apache.commons.discovery.DiscoverClass;
-import org.apache.commons.discovery.tools.ClassLoaderUtils;
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>