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/31 00:19:34 UTC
cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource DiscoverResources.java ResourceDiscoverImpl.java
rsitze 2002/08/30 15:19:34
Modified: discovery/src/java/org/apache/commons/discovery
ResourceIterator.java ResourceClass.java
ResourceNameIterator.java Resource.java
ResourceClassIterator.java
discovery/src/java/org/apache/commons/discovery/resource/names
ResourceNameDiscoverImpl.java
DiscoverNamesInDictionary.java NameDiscoverers.java
DiscoverNamesInFile.java
DiscoverNamesInSystemProperties.java
DiscoverNamesInManagedProperties.java
discovery/src/java/org/apache/commons/discovery/resource/classes
DiscoverClasses.java ResourceClassDiscoverImpl.java
discovery/src/java/org/apache/commons/discovery/ant
ServiceDiscoveryTask.java
discovery/src/java/org/apache/commons/discovery/resource
DiscoverResources.java ResourceDiscoverImpl.java
Removed: discovery/src/java/org/apache/commons/discovery
ResourceName.java
Log:
Changed ResourceName to String.
Note that Discover & Iterator for ResourceName remain
for the moment.
Revision Changes Path
1.3 +2 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceIterator.java
Index: ResourceIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceIterator.java 30 Aug 2002 00:15:19 -0000 1.2
+++ ResourceIterator.java 30 Aug 2002 22:19:33 -0000 1.3
@@ -67,7 +67,7 @@
*/
public abstract Resource nextResource();
- public ResourceName nextResourceName() {
- return nextResource();
+ public String nextResourceName() {
+ return nextResource().getName();
}
}
1.2 +2 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceClass.java
Index: ResourceClass.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceClass.java 30 Aug 2002 00:15:19 -0000 1.1
+++ ResourceClass.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -97,7 +97,7 @@
public Class loadClass() {
if (resourceClass == null && getClassLoader() != null) {
if (log.isDebugEnabled())
- log.debug("getResourceClass: Loading class '" + getName() + "' with " + getClassLoader());
+ log.debug("loadClass: Loading class '" + getName() + "' with " + getClassLoader());
try {
resourceClass = getClassLoader().loadClass(getName());
@@ -109,6 +109,6 @@
}
public String toString() {
- return "LoadableClass[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
+ return "ResourceClass[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
}
}
1.2 +1 -1 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceNameIterator.java
Index: ResourceNameIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceNameIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceNameIterator.java 30 Aug 2002 00:15:19 -0000 1.1
+++ ResourceNameIterator.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -69,5 +69,5 @@
/**
*/
- public ResourceName nextResourceName();
+ public String nextResourceName();
}
1.2 +39 -18 jakarta-commons/discovery/src/java/org/apache/commons/discovery/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/Resource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resource.java 30 Aug 2002 00:15:19 -0000 1.1
+++ Resource.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -60,6 +60,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Vector;
/**
@@ -73,24 +74,33 @@
* @author Costin Manolache
* @author Richard A. Sitze
*/
-public class Resource extends ResourceName
+public class Resource
{
- protected URL resource;
- protected ClassLoader loader;
+ protected final String name;
+ protected final URL resource;
+ protected final ClassLoader loader;
public Resource(String resourceName, URL resource, ClassLoader loader) {
- super(resourceName);
- setResource(resource);
- setClassLoader(loader);
+ this.name = resourceName;
+ this.resource = resource;
+ this.loader = loader;
}
/**
- * Set the value of URL.
- * @param v Value to assign to URL.
+ * Get the value of resourceName.
+ * @return value of resourceName.
*/
- public void setResource(URL resource) {
- this.resource = resource;
+ public String getName() {
+ return name;
}
+
+// /**
+// * Set the value of URL.
+// * @param v Value to assign to URL.
+// */
+// public void setResource(URL resource) {
+// this.resource = resource;
+// }
/**
* Get the value of URL.
@@ -120,15 +130,26 @@
return loader ;
}
- /**
- * Set the value of loader.
- * @param v Value to assign to loader.
- */
- public void setClassLoader(ClassLoader loader) {
- this.loader = loader;
- }
+// /**
+// * Set the value of loader.
+// * @param v Value to assign to loader.
+// */
+// public void setClassLoader(ClassLoader loader) {
+// this.loader = loader;
+// }
public String toString() {
- return "LoadableResourceInfo[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
+ return "Resource[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
+ }
+
+ public static Resource[] toArray(ResourceIterator iterator) {
+ Vector vector = new Vector();
+ while (iterator.hasNext()) {
+ vector.add(iterator.nextResource());
+ }
+ Resource[] resources = new Resource[vector.size()];
+ vector.copyInto(resources);
+
+ return resources;
}
}
1.2 +2 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceClassIterator.java
Index: ResourceClassIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ResourceClassIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceClassIterator.java 30 Aug 2002 00:15:19 -0000 1.1
+++ ResourceClassIterator.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -71,7 +71,7 @@
return nextResourceClass();
}
- public ResourceName nextResourceName() {
- return nextResourceClass();
+ public String nextResourceName() {
+ return nextResourceClass().getName();
}
}
1.2 +5 -6 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/ResourceNameDiscoverImpl.java
Index: ResourceNameDiscoverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/ResourceNameDiscoverImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceNameDiscoverImpl.java 30 Aug 2002 00:15:20 -0000 1.1
+++ ResourceNameDiscoverImpl.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -57,7 +57,6 @@
package org.apache.commons.discovery.resource.names;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
@@ -84,7 +83,7 @@
public ResourceNameIterator findResourceNames(final ResourceNameIterator inputNames) {
return new ResourceNameIterator() {
private ResourceNameIterator resourceNames = null;
- private ResourceName resourceName = null;
+ private String resourceName = null;
public boolean hasNext() {
if (resourceName == null) {
@@ -93,16 +92,16 @@
return resourceName != null;
}
- public ResourceName nextResourceName() {
- ResourceName name = resourceName;
+ public String nextResourceName() {
+ String name = resourceName;
resourceName = null;
return name;
}
- private ResourceName getNextResourceName() {
+ private String getNextResourceName() {
while (inputNames.hasNext() && (resourceNames == null || !resourceNames.hasNext())) {
resourceNames =
- findResourceNames(inputNames.nextResourceName().getName());
+ findResourceNames(inputNames.nextResourceName());
}
return (resourceNames != null && resourceNames.hasNext())
1.2 +2 -3 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java
Index: DiscoverNamesInDictionary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverNamesInDictionary.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverNamesInDictionary.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -60,7 +60,6 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
@@ -143,8 +142,8 @@
return (resources != null && idx < resources.length);
}
- public ResourceName nextResourceName() {
- return new ResourceName(resources[idx++]);
+ public String nextResourceName() {
+ return resources[idx++];
}
};
}
1.2 +1 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java
Index: NameDiscoverers.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NameDiscoverers.java 30 Aug 2002 00:15:20 -0000 1.1
+++ NameDiscoverers.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -59,7 +59,6 @@
import java.util.Vector;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
@@ -132,7 +131,7 @@
return iterator.hasNext();
}
- public ResourceName nextResourceName() {
+ public String nextResourceName() {
return iterator.nextResourceName();
}
1.2 +5 -6 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java
Index: DiscoverNamesInFile.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverNamesInFile.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverNamesInFile.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -66,7 +66,6 @@
import org.apache.commons.discovery.Resource;
import org.apache.commons.discovery.ResourceDiscover;
import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
@@ -151,7 +150,7 @@
private int idx = 0;
private Vector classNames = null;
- private ResourceName resource = null;
+ private String resource = null;
public boolean hasNext() {
if (resource == null) {
@@ -160,13 +159,13 @@
return resource != null;
}
- public ResourceName nextResourceName() {
- ResourceName element = resource;
+ public String nextResourceName() {
+ String element = resource;
resource = null;
return element;
}
- private ResourceName getNextClassName() {
+ private String getNextClassName() {
if (classNames == null || idx >= classNames.size()) {
classNames = getNextClassNames();
idx = 0;
@@ -180,7 +179,7 @@
if (log.isDebugEnabled())
log.debug("getNextClassResource: next class='" + className + "'");
- return new ResourceName(className);
+ return className;
}
private Vector getNextClassNames() {
1.2 +2 -3 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java
Index: DiscoverNamesInSystemProperties.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverNamesInSystemProperties.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverNamesInSystemProperties.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -57,7 +57,6 @@
package org.apache.commons.discovery.resource.names;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
@@ -97,8 +96,8 @@
return resource != null;
}
- public ResourceName nextResourceName() {
- ResourceName element = new ResourceName(resource);
+ public String nextResourceName() {
+ String element = resource;
resource = null;
return element;
}
1.2 +2 -3 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java
Index: DiscoverNamesInManagedProperties.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverNamesInManagedProperties.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverNamesInManagedProperties.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -57,7 +57,6 @@
package org.apache.commons.discovery.resource.names;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
@@ -99,8 +98,8 @@
return resource != null;
}
- public ResourceName nextResourceName() {
- ResourceName element = new ResourceName(resource);
+ public String nextResourceName() {
+ String element = resource;
resource = null;
return element;
}
1.2 +0 -9 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
Index: DiscoverClasses.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverClasses.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverClasses.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -65,7 +65,6 @@
import org.apache.commons.discovery.ResourceClassDiscover;
import org.apache.commons.discovery.ResourceClassIterator;
import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.discovery.resource.ClassLoaders;
@@ -117,14 +116,6 @@
resource = getNextClass();
}
return resource != null;
- }
-
- public ResourceName nextResourceName() {
- return nextResourceClass();
- }
-
- public Resource nextResource() {
- return nextResourceClass();
}
public ResourceClass nextResourceClass() {
1.2 +3 -2 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java
Index: ResourceClassDiscoverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceClassDiscoverImpl.java 30 Aug 2002 00:15:20 -0000 1.1
+++ ResourceClassDiscoverImpl.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -156,9 +156,10 @@
}
private ResourceClass getNextResource() {
- while (inputNames.hasNext() && (classes == null || !classes.hasNext())) {
+ while (inputNames.hasNext() &&
+ (classes == null || !classes.hasNext())) {
classes =
- findResourceClasses(inputNames.nextResourceName().getName());
+ findResourceClasses(inputNames.nextResourceName());
}
return (classes != null && classes.hasNext())
1.5 +6 -7 jakarta-commons/discovery/src/java/org/apache/commons/discovery/ant/ServiceDiscoveryTask.java
Index: ServiceDiscoveryTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/ant/ServiceDiscoveryTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServiceDiscoveryTask.java 30 Aug 2002 00:15:20 -0000 1.4
+++ ServiceDiscoveryTask.java 30 Aug 2002 22:19:33 -0000 1.5
@@ -59,7 +59,6 @@
import java.util.Vector;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.jdk.JDKHooks;
import org.apache.commons.discovery.resource.DiscoverResources;
@@ -77,7 +76,7 @@
{
String name;
int debug=0;
- ResourceName[] drivers = null;
+ String[] drivers = null;
public void setServiceName(String name ) {
this.name=name;
@@ -87,7 +86,7 @@
this.debug=debug;
}
- public ResourceName[] getServiceInfo() {
+ public String[] getServiceInfo() {
return drivers;
}
@@ -98,18 +97,18 @@
disc.addClassLoader( JDKHooks.getJDKHooks().getThreadContextClassLoader() );
disc.addClassLoader( this.getClass().getClassLoader() );
- ResourceNameIterator enum = disc.findResources(name);
+ ResourceNameIterator iterator = disc.findResources(name);
Vector vector = new Vector();
- while (enum.hasNext()) {
- ResourceName resourceInfo = enum.nextResourceName();
+ while (iterator.hasNext()) {
+ String resourceInfo = iterator.nextResourceName();
vector.add(resourceInfo);
if( debug > 0 ) {
System.out.println("Found " + resourceInfo);
}
}
- drivers = new ResourceName[vector.size()];
+ drivers = new String[vector.size()];
vector.copyInto(drivers);
}
1.2 +0 -5 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/DiscoverResources.java
Index: DiscoverResources.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/DiscoverResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscoverResources.java 30 Aug 2002 00:15:20 -0000 1.1
+++ DiscoverResources.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -64,7 +64,6 @@
import org.apache.commons.discovery.Resource;
import org.apache.commons.discovery.ResourceDiscover;
import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.jdk.JDKHooks;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
@@ -117,10 +116,6 @@
resource = getNextResource();
}
return resource != null;
- }
-
- public ResourceName nextResourceName() {
- return nextResource();
}
public Resource nextResource() {
1.2 +3 -4 jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java
Index: ResourceDiscoverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceDiscoverImpl.java 30 Aug 2002 00:15:20 -0000 1.1
+++ ResourceDiscoverImpl.java 30 Aug 2002 22:19:33 -0000 1.2
@@ -60,7 +60,6 @@
import org.apache.commons.discovery.Resource;
import org.apache.commons.discovery.ResourceDiscover;
import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.ResourceName;
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.resource.names.ResourceNameDiscoverImpl;
@@ -160,9 +159,9 @@
}
private Resource getNextResource() {
- while (inputNames.hasNext() && (resources == null || !resources.hasNext())) {
- resources =
- findResources(inputNames.nextResourceName().getName());
+ while (inputNames.hasNext() &&
+ (resources == null || !resources.hasNext())) {
+ resources = findResources(inputNames.nextResourceName());
}
return (resources != null && resources.hasNext())
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>