You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/02/12 21:03:25 UTC
svn commit: r506613 - in /incubator/tuscany/java/sca:
extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/
extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/
kernel/core/src/main/java/org/apache...
Author: rfeng
Date: Mon Feb 12 12:03:22 2007
New Revision: 506613
URL: http://svn.apache.org/viewvc?view=rev&rev=506613
Log:
TUSCANY-1059: Use the simple name of the java interface to derive the name of a SCA service for now
Modified:
incubator/tuscany/java/sca/extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java
incubator/tuscany/java/sca/extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/RubyIntrospector.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
Modified: incubator/tuscany/java/sca/extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java (original)
+++ incubator/tuscany/java/sca/extensions/javascript/container/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java Mon Feb 12 12:03:22 2007
@@ -80,7 +80,7 @@
try {
ServiceContract<?> sc = processorRegistry.introspect(Class.forName(serviceClass));
service.setServiceContract(sc);
- service.setName(sc.getInterfaceClass().getName());
+ service.setName(sc.getInterfaceClass().getSimpleName());
componentType.add(service);
} catch (ClassNotFoundException e) {
throw new MissingResourceException("Interface not found", e);
Modified: incubator/tuscany/java/sca/extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/RubyIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/RubyIntrospector.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/RubyIntrospector.java (original)
+++ incubator/tuscany/java/sca/extensions/ruby/container/src/main/java/org/apache/tuscany/container/ruby/RubyIntrospector.java Mon Feb 12 12:03:22 2007
@@ -80,7 +80,7 @@
try {
ServiceContract<?> sc = processorRegistry.introspect(Class.forName(serviceClass));
service.setServiceContract(sc);
- service.setName(sc.getInterfaceClass().getName());
+ service.setName(sc.getInterfaceClass().getSimpleName());
componentType.add(service);
} catch (ClassNotFoundException e) {
throw new MissingResourceException("Interface not found", e);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java Mon Feb 12 12:03:22 2007
@@ -68,7 +68,7 @@
public JavaMappedService createService(Class<?> interfaze) throws InvalidServiceContractException {
JavaMappedService service = new JavaMappedService();
// create a relative URI
- service.setUri(URI.create("#" + interfaze.getName()));
+ service.setUri(URI.create("#" + interfaze.getSimpleName()));
service.setRemotable(interfaze.getAnnotation(Remotable.class) != null);
ServiceContract<?> contract = registry.introspect(interfaze);
service.setServiceContract(contract);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java Mon Feb 12 12:03:22 2007
@@ -61,7 +61,7 @@
processor.visitEnd(null, SingleInterfaceImpl.class, type, null);
assertEquals(1, type.getServices().size());
assertEquals(PropertyInterface.class,
- type.getServices().get(PropertyInterface.class.getName())
+ type.getServices().get(PropertyInterface.class.getSimpleName())
.getServiceContract().getInterfaceClass());
assertTrue(type.getProperties().isEmpty());
assertTrue(type.getReferences().isEmpty());
@@ -79,7 +79,7 @@
processor.visitEnd(null, SingleInterfaceWithPropertyReferenceImpl.class, type, null);
assertEquals(1, type.getServices().size());
assertEquals(Interface1.class,
- type.getServices().get(Interface1.class.getName())
+ type.getServices().get(Interface1.class.getSimpleName())
.getServiceContract().getInterfaceClass());
assertEquals(1, type.getProperties().size());
assertEquals(ComplexProperty.class, type.getProperties().get("property").getJavaType());
@@ -156,7 +156,7 @@
Constructor<Child> ctor = Child.class.getConstructor();
type.setConstructorDefinition(new ConstructorDefinition<Child>(ctor));
processor.visitEnd(null, Child.class, type, null);
- assertTrue(type.getServices().containsKey(Interface1.class.getName()));
+ assertTrue(type.getServices().containsKey(Interface1.class.getSimpleName()));
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java Mon Feb 12 12:03:22 2007
@@ -46,7 +46,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, FooImpl.class, type, null);
- JavaMappedService service = type.getServices().get(Foo.class.getName());
+ JavaMappedService service = type.getServices().get(Foo.class.getSimpleName());
assertNotNull(service);
Method method = FooImpl.class.getMethod("setCallback", FooCallback.class);
processor.visitMethod(null, method, type, null);
@@ -57,7 +57,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, FooImpl.class, type, null);
- JavaMappedService service = type.getServices().get(Foo.class.getName());
+ JavaMappedService service = type.getServices().get(Foo.class.getSimpleName());
assertNotNull(service);
Field field = FooImpl.class.getDeclaredField("callback");
processor.visitField(null, field, type, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java Mon Feb 12 12:03:22 2007
@@ -41,18 +41,18 @@
public void testMultipleInterfaces() throws Exception {
processor.visitClass(null, FooMultiple.class, type, null);
assertEquals(2, type.getServices().size());
- JavaMappedService service = type.getServices().get(Baz.class.getName());
+ JavaMappedService service = type.getServices().get(Baz.class.getSimpleName());
ServiceContract contract = service.getServiceContract();
assertEquals(Baz.class, contract.getInterfaceClass());
assertEquals(Bar.class, contract.getCallbackClass());
assertEquals("ServiceProcessorTestCase$Bar", contract.getCallbackName());
- assertNotNull(type.getServices().get(Bar.class.getName()));
+ assertNotNull(type.getServices().get(Bar.class.getSimpleName()));
}
public void testSingleInterfaces() throws Exception {
processor.visitClass(null, FooSingle.class, type, null);
assertEquals(1, type.getServices().size());
- assertNotNull(type.getServices().get(Baz.class.getName()));
+ assertNotNull(type.getServices().get(Baz.class.getSimpleName()));
}
public void testMultipleNoService() throws Exception {
@@ -63,7 +63,7 @@
public void testRemotableNoService() throws Exception {
processor.visitClass(null, FooRemotableNoService.class, type, null);
assertEquals(1, type.getServices().size());
- JavaMappedService service = type.getServices().get(BazRemotable.class.getName());
+ JavaMappedService service = type.getServices().get(BazRemotable.class.getSimpleName());
ServiceContract contract = service.getServiceContract();
assertEquals(BazRemotable.class, contract.getInterfaceClass());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java?view=diff&rev=506613&r1=506612&r2=506613
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java Mon Feb 12 12:03:22 2007
@@ -54,7 +54,7 @@
CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
SystemImplementation impl = new SystemImplementation(BasicInterfaceImpl.class);
PojoComponentType<?, ?, ?> componentType = loader.loadByIntrospection(parent, impl, null);
- ServiceDefinition service = componentType.getServices().get(BasicInterface.class.getName());
+ ServiceDefinition service = componentType.getServices().get(BasicInterface.class.getSimpleName());
assertEquals(BasicInterface.class, service.getServiceContract().getInterfaceClass());
Property<?> property = componentType.getProperties().get("publicProperty");
assertEquals(String.class, property.getJavaType());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org