You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/11/15 04:02:52 UTC
svn commit: r595192 - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/endpoint/
rt/core/src/main/java/org/apache/cxf/endpoint/
rt/core/src/test/java/org/apache/cxf/endpoint/
systests/src/test/java/org/apache/cxf/systest/resolver/
Author: jliu
Date: Wed Nov 14 19:02:50 2007
New Revision: 595192
URL: http://svn.apache.org/viewvc?rev=595192&view=rev
Log:
Fixed a few typos in ServiceContactResolver.
Added:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
- copied, changed from r595188, incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
- copied, changed from r595188, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java
Removed:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
Copied: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java (from r595188, incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java?p2=incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java&p1=incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java&r1=595188&r2=595192&rev=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java Wed Nov 14 19:02:50 2007
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-public interface ServiceContactResolver {
+public interface ServiceContractResolver {
URI getContractLocation(QName qname);
-
}
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java?rev=595192&r1=595191&r2=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java Wed Nov 14 19:02:50 2007
@@ -25,8 +25,8 @@
public interface ServiceContractResolverRegistry {
URI getContractLocation(QName qname);
- void register(ServiceContactResolver resolver);
- void unregister(ServiceContactResolver resolver);
- boolean isRegistered(ServiceContactResolver resolver);
+ void register(ServiceContractResolver resolver);
+ void unregister(ServiceContractResolver resolver);
+ boolean isRegistered(ServiceContractResolver resolver);
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java?rev=595192&r1=595191&r2=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java Wed Nov 14 19:02:50 2007
@@ -31,48 +31,46 @@
public class ServiceContractResolverRegistryImpl implements ServiceContractResolverRegistry {
private Bus bus;
- private List<ServiceContactResolver> resolvers;
+ private List<ServiceContractResolver> resolvers;
/**
- * Initialize registry, and expose as Bus extension.
+ * Initialize registry, and register itself on Bus as an extension.
*/
@PostConstruct
public void init() {
- resolvers = new ArrayList<ServiceContactResolver>();
+ resolvers = new ArrayList<ServiceContractResolver>();
if (bus != null) {
bus.setExtension(this, ServiceContractResolverRegistry.class);
}
}
public URI getContractLocation(QName qname) {
- for (ServiceContactResolver resolver : resolvers) {
- URI contact = resolver.getContractLocation(qname);
- if (null != contact) {
- return contact;
+ for (ServiceContractResolver resolver : resolvers) {
+ URI contractLocation = resolver.getContractLocation(qname);
+ if (null != contractLocation) {
+ return contractLocation;
}
}
return null;
}
- public boolean isRegistered(ServiceContactResolver resolver) {
+ public boolean isRegistered(ServiceContractResolver resolver) {
return resolvers.contains(resolver);
}
- public synchronized void register(ServiceContactResolver resolver) {
- resolvers.add(resolver);
-
+ public synchronized void register(ServiceContractResolver resolver) {
+ resolvers.add(resolver);
}
- public synchronized void unregister(ServiceContactResolver resolver) {
- resolvers.remove(resolver);
-
+ public synchronized void unregister(ServiceContractResolver resolver) {
+ resolvers.remove(resolver);
}
public void setBus(Bus bus) {
this.bus = bus;
}
- protected List<ServiceContactResolver> getResolvers() {
+ protected List<ServiceContractResolver> getResolvers() {
return resolvers;
}
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java?rev=595192&r1=595191&r2=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java Wed Nov 14 19:02:50 2007
@@ -34,8 +34,8 @@
public class ServiceContractResolverRegistryImplTest extends Assert {
private ServiceContractResolverRegistryImpl registry;
- private ServiceContactResolver resolver1;
- private ServiceContactResolver resolver2;
+ private ServiceContractResolver resolver1;
+ private ServiceContractResolver resolver2;
private URI uri1;
private URI uri2;
private IMocksControl control;
@@ -45,8 +45,8 @@
public void setUp() throws URISyntaxException {
registry = new ServiceContractResolverRegistryImpl();
control = EasyMock.createNiceControl();
- resolver1 = control.createMock(ServiceContactResolver.class);
- resolver2 = control.createMock(ServiceContactResolver.class);
+ resolver1 = control.createMock(ServiceContractResolver.class);
+ resolver2 = control.createMock(ServiceContractResolver.class);
uri1 = new URI("http://mock");
uri2 = new URI("file:///foo/bar");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java?rev=595192&r1=595191&r2=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java Wed Nov 14 19:02:50 2007
@@ -55,7 +55,7 @@
registry.init();
assertNotNull(bus.getExtension(ServiceContractResolverRegistry.class));
- JarServiceContactResolver resolver = new JarServiceContactResolver();
+ JarServiceContractResolver resolver = new JarServiceContractResolver();
registry.register(resolver);
Service service = Service.create(serviceName);
Copied: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java (from r595188, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java&p1=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java&r1=595188&r2=595192&rev=595192&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java Wed Nov 14 19:02:50 2007
@@ -29,9 +29,9 @@
import javax.xml.namespace.QName;
-import org.apache.cxf.endpoint.ServiceContactResolver;
+import org.apache.cxf.endpoint.ServiceContractResolver;
-public class JarServiceContactResolver implements ServiceContactResolver {
+public class JarServiceContractResolver implements ServiceContractResolver {
private URI uri;