Author: dkulp
Date: Thu Nov 15 06:57:45 2007
New Revision: 595323
URL: http://svn.apache.org/viewvc?rev=595323&view=rev
Log:
Merged revisions 595192 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r595192 | jliu | 2007-11-14 22:02:50 -0500 (Wed, 14 Nov 2007) | 1 line
Fixed a few typos in ServiceContactResolver.
........
Added:
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
- copied unchanged from r595192,
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
- copied unchanged from r595192,
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
Removed:
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContactResolver.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarServiceContactResolver.java
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
incubator/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java?rev=595323&r1=595322&r2=595323&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
Thu Nov 15 06:57:45 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/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java?rev=595323&r1=595322&r2=595323&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
Thu Nov 15 06:57:45 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/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java?rev=595323&r1=595322&r2=595323&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
Thu Nov 15 06:57:45 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/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java?rev=595323&r1=595322&r2=595323&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
Thu Nov 15 06:57:45 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);
