Author: rickhall
Date: Tue Jun 15 19:20:54 2010
New Revision: 955012
URL: http://svn.apache.org/viewvc?rev=955012&view=rev
Log:
Rename getClass() to loadClass() on Wire.
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ModuleImpl.java
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ext/VBWire.java
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/Wire.java
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ModuleImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ModuleImpl.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ModuleImpl.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ModuleImpl.java
Tue Jun 15 19:20:54 2010
@@ -1119,7 +1119,7 @@ public class ModuleImpl extends Abstract
{
// If we find the class or resource, then return it.
Object result = (isClass)
- ? (Object) wires.get(i).getClass(name)
+ ? (Object) wires.get(i).loadClass(name)
: (Object) wires.get(i).getResource(name);
if (result != null)
{
@@ -1156,7 +1156,7 @@ public class ModuleImpl extends Abstract
{
// Return the class or resource.
return (isClass)
- ? (Object) wire.getClass(name)
+ ? (Object) wire.loadClass(name)
: (Object) wire.getResource(name);
}
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
Tue Jun 15 19:20:54 2010
@@ -543,7 +543,7 @@ class ServiceRegistrationImpl implements
{
// If requester has access to the class, verify it
is the
// same class as the provider.
- allow = (providerWire.getClass(className) ==
requestClass);
+ allow = (providerWire.loadClass(className) ==
requestClass);
}
catch (Exception ex)
{
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ext/VBWire.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ext/VBWire.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ext/VBWire.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ext/VBWire.java
Tue Jun 15 19:20:54 2010
@@ -23,7 +23,7 @@ import java.util.Enumeration;
public interface VBWire
{
- public Class getClass(String name) throws ClassNotFoundException;
+ public Class loadClass(String name) throws ClassNotFoundException;
public URL getResource(String name) throws ResourceNotFoundException;
public Enumeration getResources(String name) throws
ResourceNotFoundException;
}
\ No newline at end of file
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/Wire.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/Wire.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/Wire.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/Wire.java
Tue Jun 15 19:20:54 2010
@@ -72,7 +72,7 @@ public interface Wire extends VBWire
* @throws java.lang.ClassNotFoundException If the class was not found and
* the search should be aborted.
**/
- public Class getClass(String name) throws ClassNotFoundException;
+ public Class loadClass(String name) throws ClassNotFoundException;
/**
* Requests a resource from the exporting module. If the resource is found,
* then an URL is returned. If the resource is not found, then this method
may
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireImpl.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
Tue Jun 15 19:20:54 2010
@@ -78,7 +78,7 @@ public class WireImpl implements Wire
/* (non-Javadoc)
* @see
org.apache.felix.framework.searchpolicy.IWire#getClass(java.lang.String)
*/
- public Class getClass(String name) throws ClassNotFoundException
+ public Class loadClass(String name) throws ClassNotFoundException
{
Class clazz = null;
Modified:
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java?rev=955012&r1=955011&r2=955012&view=diff
==============================================================================
---
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
(original)
+++
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
Tue Jun 15 19:20:54 2010
@@ -87,7 +87,7 @@ public class WireModuleImpl implements W
/* (non-Javadoc)
* @see
org.apache.felix.framework.searchpolicy.IWire#getClass(java.lang.String)
*/
- public Class getClass(String name) throws ClassNotFoundException
+ public Class loadClass(String name) throws ClassNotFoundException
{
// Get the package of the target class.
String pkgName = Util.getClassPackage(name);
