You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/28 07:39:02 UTC
svn commit: r437540 - in /incubator/tuscany/java/sca:
api/src/main/java/org/apache/tuscany/api/annotation/
commands/launcher/src/main/resources/META-INF/tuscany/
containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/
con...
Author: jmarino
Date: Sun Aug 27 22:39:00 2006
New Revision: 437540
URL: http://svn.apache.org/viewvc?rev=437540&view=rev
Log:
make java idl extensible and move interfaces to SPI; minor checkstyle cleanup
Added:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java (contents, props changed)
- copied, changed from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospectorImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java (contents, props changed)
- copied, changed from r437499, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/InterfaceJavaProcessorImplTestCase.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java (contents, props changed)
- copied, changed from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospector.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java (with props)
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java (with props)
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java (contents, props changed)
- copied, changed from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaServiceContract.java
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospector.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospectorImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaServiceContract.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/InterfaceJavaProcessorImplTestCase.java
Modified:
incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java
incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceUniqueTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/sca/interfaceJava.scdl
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHostAdmin.java
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
Modified: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java (original)
+++ incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java Sun Aug 27 22:39:00 2006
@@ -35,21 +35,25 @@
/**
* Returns the unique name of the data binding
+ * @return the unique name of the data binding
*/
String name();
/**
- * @return Type of the logical data type
+ * Returns the logical data type
+ * @return the logical data type
*/
Class logicalType() default Object.class;
/**
- * @return Type of the physical data type
+ * Returns the physical data type
+ * @return the physical data type
*/
Class physicalType() default Object.class;
/**
- * @return Context
+ * Returns an array of extensibility elements
+ * @return an array of extensibility elements
*/
DataContext[] context() default {};
Modified: incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl Sun Aug 27 22:39:00 2006
@@ -26,8 +26,8 @@
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
name="org.apache.tuscany.launcher.InterfaceJava">
- <component name="interfaceJava.introspector">
- <system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl"/>
+ <component name="interfaceJava.interfaceProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl"/>
</component>
<component name="interfaceJava.loader">
<system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaLoader"/>
Modified: incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl Sun Aug 27 22:39:00 2006
@@ -57,7 +57,7 @@
</component>
<!-- Introspector and IntrospectionRegistry -->
- <component name="introspector">
+ <component name="interfaceProcessorRegistry">
<system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
</component>
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptIntrospector.java Sun Aug 27 22:39:00 2006
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.container.javascript.rhino.RhinoSCAConfig;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.annotation.Autowire;
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java Sun Aug 27 22:39:00 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.container.javascript.rhino.RhinoSCAConfig;
import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl;
import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.model.ComponentType;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Sun Aug 27 22:39:00 2006
@@ -30,11 +30,10 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.spi.implementation.java.Introspector;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.StAXPropertyFactory;
-import org.apache.tuscany.spi.implementation.java.Introspector;
-
-import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.ConnectorImpl;
@@ -42,20 +41,22 @@
import org.apache.tuscany.core.component.scope.ModuleScopeObjectFactory;
import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.deployer.DeployerImpl;
+import org.apache.tuscany.core.idl.java.InterfaceJavaLoader;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.IntrospectionRegistryImpl;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
import org.apache.tuscany.core.implementation.composite.CompositeLoader;
import org.apache.tuscany.core.implementation.processor.ConstructorProcessor;
import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
import org.apache.tuscany.core.implementation.processor.HeuristicPojoProcessor;
+import org.apache.tuscany.core.implementation.processor.ImplementationProcessorService;
+import org.apache.tuscany.core.implementation.processor.ImplementationProcessorServiceImpl;
import org.apache.tuscany.core.implementation.processor.InitProcessor;
import org.apache.tuscany.core.implementation.processor.MonitorProcessor;
import org.apache.tuscany.core.implementation.processor.PropertyProcessor;
import org.apache.tuscany.core.implementation.processor.ReferenceProcessor;
import org.apache.tuscany.core.implementation.processor.ScopeProcessor;
import org.apache.tuscany.core.implementation.processor.ServiceProcessor;
-import org.apache.tuscany.core.implementation.processor.ImplementationProcessorServiceImpl;
-import org.apache.tuscany.core.implementation.processor.ImplementationProcessorService;
import org.apache.tuscany.core.implementation.system.builder.SystemBindingBuilder;
import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.implementation.system.builder.SystemCompositeBuilder;
@@ -71,14 +72,12 @@
import org.apache.tuscany.core.loader.ComponentLoader;
import org.apache.tuscany.core.loader.ComponentTypeElementLoader;
import org.apache.tuscany.core.loader.IncludeLoader;
-import org.apache.tuscany.core.idl.java.InterfaceJavaLoader;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospector;
import org.apache.tuscany.core.loader.LoaderRegistryImpl;
import org.apache.tuscany.core.loader.PropertyLoader;
import org.apache.tuscany.core.loader.ReferenceLoader;
import org.apache.tuscany.core.loader.ServiceLoader;
import org.apache.tuscany.core.loader.StringParserPropertyFactory;
+import org.apache.tuscany.host.MonitorFactory;
/**
* A default implementation of a Bootstrapper. Please see the documentation on the individual methods for how the
@@ -135,7 +134,7 @@
public Deployer createDeployer() {
ScopeRegistry scopeRegistry = createScopeRegistry(new WorkContextImpl());
Builder builder = createBuilder(scopeRegistry);
- InterfaceJavaIntrospector interfaceIntrospector = new InterfaceJavaIntrospectorImpl();
+ JavaInterfaceProcessorRegistry interfaceIntrospector = new JavaInterfaceProcessorRegistryImpl();
Introspector introspector = createIntrospector(interfaceIntrospector);
LoaderRegistry loader = createLoader(new StringParserPropertyFactory(), introspector);
Connector connector = createConnector();
@@ -173,16 +172,17 @@
// register component type loaders
loaderRegistry.registerLoader(SystemImplementation.class,
- new SystemComponentTypeLoader(introspector));
+ new SystemComponentTypeLoader(introspector));
loaderRegistry.registerLoader(SystemCompositeImplementation.class,
- new SystemCompositeComponentTypeLoader(loaderRegistry));
+ new SystemCompositeComponentTypeLoader(loaderRegistry));
// register element loaders
registerLoader(loaderRegistry, new ComponentLoader(loaderRegistry, propertyFactory));
registerLoader(loaderRegistry, new ComponentTypeElementLoader(loaderRegistry));
registerLoader(loaderRegistry, new CompositeLoader(loaderRegistry, null));
registerLoader(loaderRegistry, new IncludeLoader(loaderRegistry));
- registerLoader(loaderRegistry, new InterfaceJavaLoader(loaderRegistry, new InterfaceJavaIntrospectorImpl()));
+ registerLoader(loaderRegistry,
+ new InterfaceJavaLoader(loaderRegistry, new JavaInterfaceProcessorRegistryImpl()));
registerLoader(loaderRegistry, new PropertyLoader(loaderRegistry));
registerLoader(loaderRegistry, new ReferenceLoader(loaderRegistry));
registerLoader(loaderRegistry, new ServiceLoader(loaderRegistry));
@@ -196,8 +196,8 @@
*
* @return a new Introspector
*/
- public Introspector createIntrospector(InterfaceJavaIntrospector interfaceIntrospector) {
- ImplementationProcessorService service = new ImplementationProcessorServiceImpl(interfaceIntrospector);
+ public Introspector createIntrospector(JavaInterfaceProcessorRegistry registry) {
+ ImplementationProcessorService service = new ImplementationProcessorServiceImpl(registry);
IntrospectionRegistryImpl introspectionRegistry =
new IntrospectionRegistryImpl(monitorFactory.getMonitor(IntrospectionRegistryImpl.Monitor.class));
introspectionRegistry.registerProcessor(new ConstructorProcessor(service));
@@ -205,7 +205,7 @@
introspectionRegistry.registerProcessor(new InitProcessor());
introspectionRegistry.registerProcessor(new ScopeProcessor());
introspectionRegistry.registerProcessor(new PropertyProcessor(service));
- introspectionRegistry.registerProcessor(new ReferenceProcessor(interfaceIntrospector));
+ introspectionRegistry.registerProcessor(new ReferenceProcessor(registry));
introspectionRegistry.registerProcessor(new ServiceProcessor(service));
introspectionRegistry.registerProcessor(new HeuristicPojoProcessor(service));
introspectionRegistry.registerProcessor(new MonitorProcessor(monitorFactory, service));
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java Sun Aug 27 22:39:00 2006
@@ -31,6 +31,8 @@
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.loader.InvalidValueException;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -45,13 +47,13 @@
public class InterfaceJavaLoader extends LoaderExtension<JavaServiceContract> {
public static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0, "interface.java");
- private final InterfaceJavaIntrospector introspector;
+ private final JavaInterfaceProcessorRegistry interfaceRegsitry;
- @Constructor({"registry", "introspector"})
+ @Constructor({"registry", "interfaceRegsitry"})
public InterfaceJavaLoader(@Autowire LoaderRegistry registry,
- @Autowire InterfaceJavaIntrospector introspector) {
+ @Autowire JavaInterfaceProcessorRegistry interfaceRegistry) {
super(registry);
- this.introspector = introspector;
+ this.interfaceRegsitry = interfaceRegistry;
}
public QName getXMLType() {
@@ -81,7 +83,7 @@
JavaServiceContract serviceContract;
try {
- serviceContract = introspector.introspect(interfaceClass, callbackClass);
+ serviceContract = interfaceRegsitry.introspect(interfaceClass, callbackClass);
} catch (InvalidServiceContractException e) {
LoaderException le = new LoaderException(e);
le.setIdentifier(interfaceClass.getName());
Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java (from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospectorImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospectorImpl.java&r1=437499&r2=437540&rev=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospectorImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java Sun Aug 27 22:39:00 2006
@@ -32,6 +32,9 @@
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.idl.OverloadedOperationException;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessor;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
@@ -39,11 +42,25 @@
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getBaseName;
/**
- * Basic implementation of an InterfaceJavaIntrospector.
+ * Default implementation of an InterfaceJavaIntrospector.
*
* @version $Rev$ $Date$
*/
-public class InterfaceJavaIntrospectorImpl implements InterfaceJavaIntrospector {
+public class JavaInterfaceProcessorRegistryImpl implements JavaInterfaceProcessorRegistry {
+
+ private List<JavaInterfaceProcessor> processors = new ArrayList<JavaInterfaceProcessor>();
+
+ public JavaInterfaceProcessorRegistryImpl() {
+ }
+
+ public void registerProcessor(JavaInterfaceProcessor processor) {
+ processors.add(processor);
+ }
+
+ public void unregisterProcessor(JavaInterfaceProcessor processor) {
+ processors.remove(processor);
+ }
+
public <T> JavaServiceContract introspect(Class<T> type) throws InvalidServiceContractException {
Class<?> callbackClass = null;
Callback callback = type.getAnnotation(Callback.class);
@@ -83,6 +100,9 @@
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
}
}
+ for (JavaInterfaceProcessor processor : processors) {
+ processor.visitInterface(type, contract);
+ }
return contract;
}
@@ -116,4 +136,5 @@
}
return operations;
}
+
}
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java Sun Aug 27 22:39:00 2006
@@ -49,7 +49,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.core.idl.java.IllegalCallbackException;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getAllInterfaces;
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getAllPublicAndProtectedFields;
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java Sun Aug 27 22:39:00 2006
@@ -36,8 +36,9 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.core.idl.java.IllegalCallbackException;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospector;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getBaseName;
/**
@@ -47,17 +48,17 @@
*/
public class ImplementationProcessorServiceImpl implements ImplementationProcessorService {
- private InterfaceJavaIntrospector introspector;
+ private JavaInterfaceProcessorRegistry registry;
- public ImplementationProcessorServiceImpl(@Autowire InterfaceJavaIntrospector introspector) {
- this.introspector = introspector;
+ public ImplementationProcessorServiceImpl(@Autowire JavaInterfaceProcessorRegistry registry) {
+ this.registry = registry;
}
public JavaMappedService createService(Class<?> interfaze) throws InvalidServiceContractException {
JavaMappedService service = new JavaMappedService();
service.setName(getBaseName(interfaze));
service.setRemotable(interfaze.getAnnotation(Remotable.class) != null);
- ServiceContract<?> contract = introspector.introspect(interfaze);
+ ServiceContract<?> contract = registry.introspect(interfaze);
service.setServiceContract(contract);
return service;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java Sun Aug 27 22:39:00 2006
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorSupport;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
@@ -36,7 +37,6 @@
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospector;
import static org.apache.tuscany.core.util.JavaIntrospectionHelper.toPropertyName;
/**
@@ -47,10 +47,10 @@
*/
public class ReferenceProcessor extends ImplementationProcessorSupport {
- private InterfaceJavaIntrospector implService;
+ private JavaInterfaceProcessorRegistry regsitry;
- public ReferenceProcessor(@Autowire InterfaceJavaIntrospector implService) {
- this.implService = implService;
+ public ReferenceProcessor(@Autowire JavaInterfaceProcessorRegistry registry) {
+ this.regsitry = registry;
}
public void visitMethod(CompositeComponent<?> parent, Method method,
@@ -91,7 +91,7 @@
reference.setName(name);
ServiceContract contract;
try {
- contract = implService.introspect(method.getParameterTypes()[0]);
+ contract = regsitry.introspect(method.getParameterTypes()[0]);
} catch (InvalidServiceContractException e) {
throw new ProcessingException(e);
}
@@ -138,7 +138,7 @@
reference.setName(name);
ServiceContract contract;
try {
- contract = implService.introspect(field.getType());
+ contract = regsitry.introspect(field.getType());
} catch (InvalidServiceContractException e) {
throw new ProcessingException(e);
}
Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java (from r437499, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/InterfaceJavaProcessorImplTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/InterfaceJavaProcessorImplTestCase.java&r1=437499&r2=437540&rev=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/InterfaceJavaProcessorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java Sun Aug 27 22:39:00 2006
@@ -22,19 +22,26 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessor;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
+import junit.framework.TestCase;
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
/**
* @version $Rev$ $Date$
*/
-public class InterfaceJavaProcessorImplTestCase extends TestCase {
- private InterfaceJavaIntrospectorImpl impl;
+public class JavaInterfaceProcessorRegistryImplTestCase extends TestCase {
+ private JavaInterfaceProcessorRegistryImpl impl;
public void testSimpleInterface() throws InvalidServiceContractException {
JavaServiceContract contract = impl.introspect(Simple.class);
@@ -63,9 +70,22 @@
assertEquals(RuntimeException.class, fault0.getLogical());
}
+ public void testUnregister() throws Exception {
+ JavaInterfaceProcessor processor = createMock(JavaInterfaceProcessor.class);
+ processor.visitInterface(eq(Base.class), isA(JavaServiceContract.class));
+ expectLastCall().once();
+ replay(processor);
+ impl.registerProcessor(processor);
+ impl.introspect(Base.class);
+ impl.unregisterProcessor(processor);
+ impl.introspect(Base.class);
+ verify(processor);
+ }
+
protected void setUp() throws Exception {
super.setUp();
- impl = new InterfaceJavaIntrospectorImpl();
+ impl = new JavaInterfaceProcessorRegistryImpl();
+
}
private static interface Base {
Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImplTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Sun Aug 27 22:39:00 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java Sun Aug 27 22:39:00 2006
@@ -34,7 +34,7 @@
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java Sun Aug 27 22:39:00 2006
@@ -44,8 +44,8 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
import org.apache.tuscany.core.implementation.java.JavaImplementation;
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java Sun Aug 27 22:39:00 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -38,7 +38,7 @@
public class ConstructorAutowireTestCase extends TestCase {
ConstructorProcessor processor =
- new ConstructorProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ConstructorProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
public void testAutowire() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java Sun Aug 27 22:39:00 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* Verifies the constructor processor works when parameters are marked with custom extension annotations
@@ -38,7 +38,7 @@
*/
public class ConstructorProcessorExtensibilityTestCase extends TestCase {
private ConstructorProcessor processor =
- new ConstructorProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ConstructorProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
public void testProcessFirst() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -26,14 +26,14 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
*/
public class ConstructorProcessorTestCase extends TestCase {
private ConstructorProcessor processor =
- new ConstructorProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ConstructorProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
public void testDuplicateConstructor() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java Sun Aug 27 22:39:00 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -37,7 +37,7 @@
public class ConstructorPropertyTestCase extends TestCase {
ConstructorProcessor processor =
- new ConstructorProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ConstructorProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
public void testProperty() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java Sun Aug 27 22:39:00 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -116,7 +116,7 @@
protected void setUp() throws Exception {
super.setUp();
processor =
- new ConstructorProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ConstructorProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
}
// public void testMultiplicityRequired() throws Exception {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java Sun Aug 27 22:39:00 2006
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -57,7 +57,7 @@
protected void setUp() throws Exception {
super.setUp();
ImplementationProcessorServiceImpl service =
- new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl());
+ new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl());
propertyProcessor = new PropertyProcessor(service);
heuristicProcessor = new HeuristicPojoProcessor(service);
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java Sun Aug 27 22:39:00 2006
@@ -28,10 +28,10 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -39,7 +39,7 @@
public class HeuristicConstructorTestCase extends TestCase {
private HeuristicPojoProcessor processor =
- new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
/**
* Verifies a single constructor is chosen with a parameter as the type
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -35,7 +35,7 @@
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* Verfies component type information is properly introspected from an unadorned POJO according to the SCA Java Client
@@ -46,7 +46,7 @@
public class HeuristicPojoProcessorTestCase extends TestCase {
private HeuristicPojoProcessor processor =
- new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
/**
* Verifies a single service interface is computed when only one interface is implemented
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java Sun Aug 27 22:39:00 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* Verifies constructors that have extensible annotation types, i.e. that have parameters marked by annotations which
@@ -39,7 +39,7 @@
public class HeutisticExtensibleConstructorTestCase extends TestCase {
private HeuristicPojoProcessor processor =
- new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new HeuristicPojoProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
/**
* Verifies heuristic processing can be called priot to an extension annotation processors being called.
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java Sun Aug 27 22:39:00 2006
@@ -27,7 +27,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -35,7 +35,7 @@
public class ImplementationProcessorServiceTestCase extends TestCase {
private ImplementationProcessorService implService =
- new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl());
+ new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl());
public void testCreateConversationalService() throws Exception {
JavaMappedService service = implService.createService(Foo.class);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceUniqueTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceUniqueTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceUniqueTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceUniqueTestCase.java Sun Aug 27 22:39:00 2006
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.implementation.processor;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -27,7 +27,7 @@
public class ImplementationProcessorServiceUniqueTestCase extends TestCase {
private ImplementationProcessorService service =
- new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl());
+ new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl());
public void testUniquess1() throws Exception {
Class[] classes = new Class[2];
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.api.annotation.Monitor;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.host.MonitorFactory;
import org.jmock.Mock;
@@ -132,7 +132,7 @@
super.setUp();
monitorFactory = mock(MonitorFactory.class);
processor = new MonitorProcessor((MonitorFactory) monitorFactory.proxy(),
- new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
}
private class Foo {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -26,7 +26,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -102,7 +102,8 @@
protected void setUp() throws Exception {
super.setUp();
type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor = new PropertyProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ JavaInterfaceProcessorRegistryImpl registry = new JavaInterfaceProcessorRegistryImpl();
+ processor = new PropertyProcessor(new ImplementationProcessorServiceImpl(registry));
}
private class Foo {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -27,7 +27,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -37,7 +37,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
ReferenceProcessor processor =
- new ReferenceProcessor(new InterfaceJavaIntrospectorImpl());
+ new ReferenceProcessor(new JavaInterfaceProcessorRegistryImpl());
public void testMethodAnnotation() throws Exception {
processor.visitMethod(null, ReferenceProcessorTestCase.Foo.class.getMethod("setFoo", Ref.class), type, null);
@@ -117,7 +117,7 @@
protected void setUp() throws Exception {
super.setUp();
type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor = new ReferenceProcessor(new InterfaceJavaIntrospectorImpl());
+ processor = new ReferenceProcessor(new JavaInterfaceProcessorRegistryImpl());
}
private interface Ref {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java Sun Aug 27 22:39:00 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.idl.java.IllegalCallbackException;
/**
@@ -40,7 +40,7 @@
public class ServiceCallbackTestCase extends TestCase {
ServiceProcessor processor =
- new ServiceProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ new ServiceProcessor(new ImplementationProcessorServiceImpl(new JavaInterfaceProcessorRegistryImpl()));
public void testMethodCallbackInterface() throws Exception {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java Sun Aug 27 22:39:00 2006
@@ -22,15 +22,14 @@
import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-
-import junit.framework.TestCase;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
+import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import junit.framework.TestCase;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
/**
* @version $Rev$ $Date$
@@ -90,7 +89,8 @@
protected void setUp() throws Exception {
super.setUp();
- processor = new ServiceProcessor(new ImplementationProcessorServiceImpl(new InterfaceJavaIntrospectorImpl()));
+ JavaInterfaceProcessorRegistryImpl registry = new JavaInterfaceProcessorRegistryImpl();
+ processor = new ServiceProcessor(new ImplementationProcessorServiceImpl(registry));
type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Sun Aug 27 22:39:00 2006
@@ -40,8 +40,7 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.implementation.system.wire.SystemInboundWire;
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoaderTestCase.java Sun Aug 27 22:39:00 2006
@@ -25,7 +25,7 @@
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.IntrospectionRegistryImpl;
import org.apache.tuscany.core.implementation.processor.ConstructorProcessor;
import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
@@ -65,9 +65,9 @@
protected void setUp() throws Exception {
super.setUp();
- InterfaceJavaIntrospectorImpl introspector = new InterfaceJavaIntrospectorImpl();
+ JavaInterfaceProcessorRegistryImpl interfaceProcessorRegistry = new JavaInterfaceProcessorRegistryImpl();
ImplementationProcessorService service =
- new ImplementationProcessorServiceImpl(introspector);
+ new ImplementationProcessorServiceImpl(interfaceProcessorRegistry);
IntrospectionRegistryImpl registry = new IntrospectionRegistryImpl();
registry.setMonitor(new NullMonitorFactory().getMonitor(IntrospectionRegistryImpl.Monitor.class));
registry.registerProcessor(new ConstructorProcessor(service));
@@ -75,7 +75,7 @@
registry.registerProcessor(new InitProcessor());
registry.registerProcessor(new ScopeProcessor());
registry.registerProcessor(new PropertyProcessor(service));
- registry.registerProcessor(new ReferenceProcessor(introspector));
+ registry.registerProcessor(new ReferenceProcessor(interfaceProcessorRegistry));
registry.registerProcessor(new ServiceProcessor(service));
registry.registerProcessor(new HeuristicPojoProcessor(service));
loader = new SystemComponentTypeLoader(registry);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java Sun Aug 27 22:39:00 2006
@@ -31,7 +31,7 @@
import static org.apache.tuscany.spi.model.Scope.MODULE;
import junit.framework.TestCase;
-import org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.IntrospectionRegistryImpl;
import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
import org.apache.tuscany.core.implementation.processor.ImplementationProcessorService;
@@ -69,10 +69,10 @@
registry.registerProcessor(new DestroyProcessor());
registry.registerProcessor(new InitProcessor());
registry.registerProcessor(new ScopeProcessor());
- InterfaceJavaIntrospectorImpl introspector = new InterfaceJavaIntrospectorImpl();
- ImplementationProcessorService service = new ImplementationProcessorServiceImpl(introspector);
+ JavaInterfaceProcessorRegistryImpl interfaceProcessorRegistry = new JavaInterfaceProcessorRegistryImpl();
+ ImplementationProcessorService service = new ImplementationProcessorServiceImpl(interfaceProcessorRegistry);
registry.registerProcessor(new PropertyProcessor(service));
- registry.registerProcessor(new ReferenceProcessor(introspector));
+ registry.registerProcessor(new ReferenceProcessor(interfaceProcessorRegistry));
}
@Scope("MODULE")
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Sun Aug 27 22:39:00 2006
@@ -33,7 +33,8 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.core.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+
import org.apache.tuscany.core.implementation.system.model.SystemBinding;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.mock.component.SourceImpl;
Modified: incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl (original)
+++ incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl Sun Aug 27 22:39:00 2006
@@ -58,7 +58,7 @@
</component>
<!-- Introspector and IntrospectionRegistry -->
- <component name="introspector">
+ <component name="interfaceProcessorRegistry">
<system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
</component>
@@ -96,8 +96,8 @@
<system:implementation.system class="org.apache.tuscany.core.implementation.composite.CompositeLoader"/>
</component>
- <component name="interfaceJava.introspector">
- <system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl"/>
+ <component name="interfaceJava.interfaceProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl"/>
</component>
<component name="artifactRepository">
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/sca/interfaceJava.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/sca/interfaceJava.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/sca/interfaceJava.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/sca/interfaceJava.scdl Sun Aug 27 22:39:00 2006
@@ -26,8 +26,8 @@
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
name="org.apache.tuscany.test.InterfaceJava">
- <component name="interfaceJava.introspector">
- <system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl"/>
+ <component name="interfaceJava.interfaceProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl"/>
</component>
<component name="interfaceJava.loader">
<system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaLoader"/>
Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHostAdmin.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHostAdmin.java?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHostAdmin.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHostAdmin.java Sun Aug 27 22:39:00 2006
@@ -22,18 +22,21 @@
import java.util.List;
/**
- * RMI Service hosting Admin Interface to be implemented by host environments that allows
- * SCA Components to register RMI Services to handle inbound service requests over RMI to
- * SCA Components. This interface can be used by admin functions to obtain information on
- * RMI registries started and running in the host environment
+ * RMI Service hosting Admin Interface to be implemented by host environments that allows SCA Components to register RMI
+ * Services to handle inbound service requests over RMI to SCA Components. This interface can be used by admin functions
+ * to obtain information on RMI registries started and running in the host environment
+ *
+ * @version $Rev$ $Date$
*/
public interface RMIHostAdmin {
- // gets all RMI registries running on the host. Each element of the list is an object of type
- // java.rmi.registry
- public List getAllRegistries() throws RemoteServiceException;
+ /**
+ * Returns all RMI registries running on the host.
+ */
+ List<Registry> getAllRegistries() throws RemoteServiceException;
- // gets a registry that is running at a particular port
- public Registry getRegistry(int port) throws RemoteServiceException;
+ /**
+ * Returns a registry that is running at a particular port
+ */
+ Registry getRegistry(int port) throws RemoteServiceException;
- // more methods to be added
}
Copied: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java (from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospector.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java?p2=incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospector.java&r1=437499&r2=437540&rev=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaIntrospector.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java Sun Aug 27 22:39:00 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.idl.java;
+package org.apache.tuscany.spi.idl.java;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/InterfaceJavaIntrospector.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java?rev=437540&view=auto
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java (added)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java Sun Aug 27 22:39:00 2006
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.spi.idl.java;
+
+import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+
+/**
+ * Implementations introspect metadata on a Java interface, populating the corresponding {@link JavaServiceContract}
+ *
+ * @version $Rev$ $Date$
+ */
+public interface JavaInterfaceProcessor {
+
+ void visitInterface(Class<?> clazz, JavaServiceContract contract) throws InvalidServiceContractException;
+
+}
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java?rev=437540&view=auto
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java (added)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java Sun Aug 27 22:39:00 2006
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.spi.idl.java;
+
+/**
+ * A registry of {@link JavaInterfaceProcessor}s. Interface processors update a service contract definition based on a
+ * Java interface
+ *
+ * @version $Rev$ $Date$
+ */
+public interface JavaInterfaceProcessorRegistry extends InterfaceJavaIntrospector {
+
+ /**
+ * Registers the given processor
+ */
+ void registerProcessor(JavaInterfaceProcessor processor);
+
+ /**
+ * Deregisters the given processor
+ */
+ void unregisterProcessor(JavaInterfaceProcessor processor);
+
+}
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java (from r437499, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaServiceContract.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java?p2=incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaServiceContract.java&r1=437499&r2=437540&rev=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/idl/java/JavaServiceContract.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java Sun Aug 27 22:39:00 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.idl.java;
+package org.apache.tuscany.spi.idl.java;
import java.lang.reflect.Type;
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaServiceContract.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl Sun Aug 27 22:39:00 2006
@@ -26,8 +26,8 @@
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
name="org.apache.tuscany.launcher.InterfaceJava">
- <component name="interfaceJava.introspector">
- <system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl"/>
+ <component name="interfaceJava.interfaceProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl"/>
</component>
<component name="interfaceJava.loader">
<system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaLoader"/>
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl?rev=437540&r1=437539&r2=437540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl Sun Aug 27 22:39:00 2006
@@ -57,7 +57,7 @@
</component>
<!-- Introspector and IntrospectionRegistry -->
- <component name="introspector">
+ <component name="interfaceProcessorRegistry">
<system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org