You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/04 04:02:57 UTC
svn commit: r535058 [1/2] - in /incubator/tuscany/java/sca:
modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/
modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/
modules/core-spring/src/m...
Author: jsdelfino
Date: Thu May 3 19:02:54 2007
New Revision: 535058
URL: http://svn.apache.org/viewvc?view=rev&rev=535058
Log:
Decoupled Java introspectors and Java introspector extension points. Renamed JavaFactory to JavaInterfaceFactory.
Added:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java (with props)
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospectorExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/JavaInterfaceFactory.java (with props)
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/DefaultJavaInterfaceFactory.java (with props)
Removed:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaFactory.java
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/JavaFactory.java
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/DefaultJavaFactory.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospector.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractProcessorTest.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ModelHelper.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/PolicyProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospector.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/xml/JavaInterfaceProcessor.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationImpl.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProvider.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDModuleActivator.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/DefaultCRUDImplementationFactory.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java Thu May 3 19:02:54 2007
@@ -27,10 +27,10 @@
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.osoa.sca.annotations.Remotable;
import org.w3c.dom.Node;
@@ -52,7 +52,7 @@
public final void testVisitInterface() throws InvalidInterfaceException {
DataBindingExtensionPoint registry = new DefaultDataBindingExtensionPoint();
DataBindingJavaInterfaceProcessor processor = new DataBindingJavaInterfaceProcessor(registry);
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
JavaInterface contract = javaFactory.createJavaInterface();
contract.setJavaClass(MockInterface.class);
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java Thu May 3 19:02:54 2007
@@ -33,8 +33,8 @@
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentManager;
import org.apache.tuscany.spi.wire.InvocationChain;
@@ -74,7 +74,7 @@
replay(component, componentManager);
processor = new DataBindingWirePostProcessor(componentManager, mediator);
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
InterfaceContract contract = javaFactory.createJavaInterfaceContract();
contract.setInterface(javaFactory.createJavaInterface());
contract.setCallbackInterface(javaFactory.createJavaInterface());
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java Thu May 3 19:02:54 2007
@@ -36,10 +36,11 @@
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentManager;
import org.apache.tuscany.spi.component.ReferenceBinding;
@@ -139,9 +140,10 @@
}
private Wire createWire(URI sourceUri, URI targetUri) throws InvalidInterfaceException {
- DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaFactory());
+ DefaultJavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaInterfaceFactory(), visitors);
JavaInterface interface1 = introspector.introspect(TestInterface1.class);
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
InterfaceContract contract1 = javaFactory.createJavaInterfaceContract();
contract1.setInterface(interface1);
// contract1.setDataBinding(DOMDataBinding.NAME);
Added: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java?view=auto&rev=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java (added)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java Thu May 3 19:02:54 2007
@@ -0,0 +1,44 @@
+/*
+ * 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.core.spring.implementation.java.impl;
+
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterface;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
+
+/**
+ * An alternate implementation of the SCA Java assembly model factory that creates SCA
+ * Java assembly model objects backed by Spring bean definitions.
+ *
+ * @version $Rev$ $Date$
+ */
+public class BeanJavaInterfaceFactory implements JavaInterfaceFactory {
+
+ public BeanJavaInterfaceFactory() {
+ }
+
+ public JavaInterface createJavaInterface() {
+ return new BeanJavaInterfaceImpl();
+ }
+
+ public JavaInterfaceContract createJavaInterfaceContract() {
+ return new BeanJavaInterfaceContractImpl();
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java Thu May 3 19:02:54 2007
@@ -38,6 +38,8 @@
import org.apache.tuscany.core.spring.implementation.java.impl.BeanJavaImplementationFactory;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospector;
+import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospectorExtensionPoint;
+import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospector;
import org.apache.tuscany.implementation.java.introspect.JavaClassVisitor;
import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
import org.apache.tuscany.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;
@@ -58,9 +60,11 @@
import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.interfacedef.impl.DefaultInterfaceContractMapper;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.interfacedef.java.xml.JavaInterfaceProcessor;
import org.apache.tuscany.policy.PolicyFactory;
@@ -86,10 +90,12 @@
AssemblyFactory assemblyFactory = new BeanAssemblyFactory(new DefaultAssemblyFactory(), beanFactory);
PolicyFactory policyFactory = new DefaultPolicyFactory();
InterfaceContractMapper interfaceContractMapper = new DefaultInterfaceContractMapper();
- JavaFactory javaFactory = new DefaultJavaFactory();
- JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = new DefaultJavaInterfaceIntrospector(javaFactory);
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
+ JavaInterfaceIntrospectorExtensionPoint interfaceVisitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
- JavaClassIntrospectorExtensionPoint classIntrospector = new DefaultJavaClassIntrospector();
+ JavaClassIntrospectorExtensionPoint classVisitors = new DefaultJavaClassIntrospectorExtensionPoint();
+
+ JavaInterfaceIntrospector interfaceIntrospector = new DefaultJavaInterfaceIntrospector(javaFactory, interfaceVisitors);
BaseJavaClassVisitor[] extensions = new BaseJavaClassVisitor[] {
new ConstructorProcessor(assemblyFactory),
@@ -108,8 +114,9 @@
new PolicyProcessor(assemblyFactory, policyFactory)
};
for (JavaClassVisitor e : extensions) {
- classIntrospector.addClassVisitor(e);
+ classVisitors.addClassVisitor(e);
}
+ JavaClassIntrospector classIntrospector = new DefaultJavaClassIntrospector(classVisitors);
// Populate ArtifactProcessor registry
DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java Thu May 3 19:02:54 2007
@@ -28,9 +28,9 @@
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.spi.wire.Wire;
@@ -45,7 +45,7 @@
@SuppressWarnings( {"unchecked"})
public void testCreateInstance() throws Exception {
Operation op = new OperationImpl("hello");
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
op.setInterface(javaFactory.createJavaInterface());
InvocationChain chain = new InvocationChainImpl(op);
Wire wire = EasyMock.createMock(Wire.class);
@@ -89,7 +89,7 @@
}
private InterfaceContract createContract(Class cls) {
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
JavaInterface jInterface = javaFactory.createJavaInterface();
jInterface.setJavaClass(cls);
InterfaceContract service = javaFactory.createJavaInterfaceContract();
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java Thu May 3 19:02:54 2007
@@ -25,8 +25,8 @@
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.wire.ChainHolder;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
@@ -41,7 +41,7 @@
Wire wire = new WireImpl();
Operation op = new OperationImpl();
op.setName("hello");
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
op.setInterface(javaFactory.createJavaInterface());
InvocationChain chain = new InvocationChainImpl(op);
wire.getInvocationChains().add(chain);
@@ -54,7 +54,7 @@
Wire wire = new WireImpl();
Operation op = new OperationImpl();
op.setName("goodbye");
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
op.setInterface(javaFactory.createJavaInterface());
InvocationChain chain = new InvocationChainImpl(op);
wire.getInvocationChains().add(chain);
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java Thu May 3 19:02:54 2007
@@ -34,7 +34,7 @@
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
@@ -66,7 +66,7 @@
* Constructs a new CRUD implementation.
*/
public CRUDImplementation(AssemblyFactory assemblyFactory,
- JavaFactory javaFactory,
+ JavaInterfaceFactory javaFactory,
JavaInterfaceIntrospector introspector) {
// CRUD implementation always provide a single service exposing
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java Thu May 3 19:02:54 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
import org.apache.tuscany.contribution.service.ContributionWriteException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
/**
@@ -48,10 +48,10 @@
private static final QName IMPLEMENTATION_CRUD = new QName("http://crud", "implementation.crud");
private AssemblyFactory assemblyFactory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
private JavaInterfaceIntrospector introspector;
- public CRUDImplementationProcessor(AssemblyFactory assemblyFactory, JavaFactory javaFactory, JavaInterfaceIntrospector introspector) {
+ public CRUDImplementationProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory, JavaInterfaceIntrospector introspector) {
this.assemblyFactory = assemblyFactory;
this.javaFactory = javaFactory;
this.introspector = introspector;
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDModuleActivator.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDModuleActivator.java Thu May 3 19:02:54 2007
@@ -26,8 +26,10 @@
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.core.ExtensionPointRegistry;
import org.apache.tuscany.core.ModuleActivator;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
/**
@@ -55,15 +57,14 @@
assemblyFactory = new DefaultAssemblyFactory();
}
- JavaFactory javaFactory = registry.getExtensionPoint(JavaFactory.class);
+ JavaInterfaceFactory javaFactory = registry.getExtensionPoint(JavaInterfaceFactory.class);
if (javaFactory == null) {
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
}
- JavaInterfaceIntrospectorExtensionPoint introspectorExtensionPoint = registry
- .getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
- implementationArtifactProcessor = new CRUDImplementationProcessor(assemblyFactory, javaFactory,
- introspectorExtensionPoint);
+ JavaInterfaceIntrospectorExtensionPoint visitors = registry.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
+ JavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(javaFactory, visitors);
+ implementationArtifactProcessor = new CRUDImplementationProcessor(assemblyFactory, javaFactory, introspector);
artifactProcessors.addArtifactProcessor(implementationArtifactProcessor);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Thu May 3 19:02:54 2007
@@ -36,8 +36,10 @@
import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
import org.apache.tuscany.implementation.java.context.JavaPropertyValueObjectFactory;
import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospector;
-import org.apache.tuscany.implementation.java.introspect.JavaClassVisitor;
+import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospectorExtensionPoint;
+import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospector;
import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
+import org.apache.tuscany.implementation.java.introspect.JavaClassVisitor;
import org.apache.tuscany.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.BaseJavaClassVisitor;
import org.apache.tuscany.implementation.java.introspect.impl.ConstructorProcessor;
@@ -57,9 +59,11 @@
import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.interfacedef.impl.DefaultInterfaceContractMapper;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.invocation.ProxyFactory;
import org.apache.tuscany.policy.PolicyFactory;
@@ -75,30 +79,30 @@
public class JavaRuntimeModuleActivator implements ModuleActivator {
private AssemblyFactory assemblyFactory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
private PolicyFactory policyFactory;
+ private JavaClassIntrospectorExtensionPoint classVisitors;
public JavaRuntimeModuleActivator() {
assemblyFactory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
policyFactory = new DefaultPolicyFactory();
+ classVisitors = new DefaultJavaClassIntrospectorExtensionPoint();
}
public Map<Class, Object> getExtensionPoints() {
Map<Class, Object> map = new HashMap<Class, Object>();
map.put(ProxyService.class, new org.apache.tuscany.implementation.java.proxy.JDKProxyService());
- map.put(JavaClassIntrospectorExtensionPoint.class, new DefaultJavaClassIntrospector());
- map.put(JavaInterfaceIntrospectorExtensionPoint.class, new DefaultJavaInterfaceIntrospector(javaFactory));
+ map.put(JavaClassIntrospectorExtensionPoint.class, classVisitors);
return map;
}
public void start(ExtensionPointRegistry registry) {
JDKProxyService proxyFactory = (JDKProxyService) registry.getExtensionPoint(ProxyFactory.class);
- JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = registry.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
-
- JavaClassIntrospectorExtensionPoint classIntrospector = registry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
+ JavaInterfaceIntrospectorExtensionPoint interfaceVisitors = registry.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
+ JavaInterfaceIntrospector interfaceIntrospector = new DefaultJavaInterfaceIntrospector(javaFactory, interfaceVisitors);
BaseJavaClassVisitor[] extensions = new BaseJavaClassVisitor[] {
new ConstructorProcessor(assemblyFactory),
new AllowsPassByReferenceProcessor(assemblyFactory),
@@ -116,8 +120,9 @@
new PolicyProcessor(assemblyFactory, policyFactory)
};
for (JavaClassVisitor extension : extensions) {
- classIntrospector.addClassVisitor(extension);
+ classVisitors.addClassVisitor(extension);
}
+ JavaClassIntrospector classIntrospector = new DefaultJavaClassIntrospector(classVisitors);
DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java Thu May 3 19:02:54 2007
@@ -36,8 +36,8 @@
import org.apache.tuscany.implementation.java.mock.Source;
import org.apache.tuscany.implementation.java.mock.SourceImpl;
import org.apache.tuscany.implementation.java.mock.Target;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -58,7 +58,7 @@
private org.apache.tuscany.assembly.Component definition;
private ScopeContainer scopeContainer;
private AssemblyFactory factory = new DefaultAssemblyFactory();
- private JavaFactory javaFactory = new DefaultJavaFactory();
+ private JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
public void testMaxAge() throws Exception {
type.setMaxAge(100);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java Thu May 3 19:02:54 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.interfacedef.Interface;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
@@ -73,7 +73,7 @@
}
public static ComponentService createService(AssemblyFactory factory,
- JavaFactory javaFactory, Class<?> type) {
+ JavaInterfaceFactory javaFactory, Class<?> type) {
org.apache.tuscany.assembly.ComponentService ref = factory.createComponentService();
ref.setName(type.getSimpleName());
JavaInterface i = javaFactory.createJavaInterface();
@@ -85,7 +85,7 @@
}
public static Reference createReference(AssemblyFactory factory,
- JavaFactory javaFactory, String name, Class<?> type) {
+ JavaInterfaceFactory javaFactory, String name, Class<?> type) {
org.apache.tuscany.assembly.Reference ref = factory.createReference();
ref.setName(name);
JavaInterface i = javaFactory.createJavaInterface();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandlerTestCase.java Thu May 3 19:02:54 2007
@@ -31,8 +31,8 @@
import org.apache.tuscany.core.wire.WireImpl;
import org.apache.tuscany.implementation.java.context.ModelHelper;
import org.apache.tuscany.implementation.java.proxy.JDKCallbackInvocationHandler;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.wire.Wire;
/**
@@ -41,11 +41,11 @@
public class JDKCallbackInvocationHandlerTestCase extends TestCase {
private AssemblyFactory assemblyFactory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
protected void setUp() throws Exception {
assemblyFactory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
}
public void testToString() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerProxyTestCase.java Thu May 3 19:02:54 2007
@@ -23,15 +23,15 @@
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.WireImpl;
import org.apache.tuscany.interfacedef.Operation;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.MessageImpl;
@@ -43,7 +43,7 @@
* @version $Rev$ $Date$
*/
public class JDKInvocationHandlerProxyTestCase extends TestCase {
- private JavaInterfaceIntrospectorExtensionPoint introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaFactory());
+ private JavaInterfaceIntrospector introspector;
private Method clientHello;
/**
@@ -53,7 +53,7 @@
public void testDifferentInterface() throws Throwable {
Wire wire = new WireImpl();
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
interfaceContract.setInterface(introspector.introspect(Target.class));
for (Operation operation : interfaceContract.getInterface().getOperations()) {
@@ -77,6 +77,8 @@
protected void setUp() throws Exception {
super.setUp();
clientHello = Client.class.getMethod("hello");
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaInterfaceFactory(), visitors);
}
private interface Target {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java Thu May 3 19:02:54 2007
@@ -39,8 +39,8 @@
import org.apache.tuscany.implementation.java.context.ModelHelper;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.SCAObject;
@@ -61,7 +61,7 @@
private TargetInvoker invoker;
private AssemblyFactory assemblyFactory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
public void testSerializeDeserialize() throws Throwable {
JDKInvocationHandler handler =
@@ -88,7 +88,7 @@
protected void setUp() throws Exception {
assemblyFactory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
SCAObject container = EasyMock.createMock(SCAObject.class);
Contract contract = ModelHelper.createReference(assemblyFactory, javaFactory, "foo", Foo.class);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java Thu May 3 19:02:54 2007
@@ -39,8 +39,8 @@
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.WorkContext;
@@ -56,11 +56,11 @@
public class JDKInvocationHandlerTestCase extends TestCase {
private AssemblyFactory assemblyFactory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
protected void setUp() throws Exception {
assemblyFactory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
}
public void testToString() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKProxyTestCase.java Thu May 3 19:02:54 2007
@@ -27,8 +27,8 @@
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.core.wire.WireImpl;
import org.apache.tuscany.interfacedef.InterfaceContract;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.spi.wire.Wire;
/**
@@ -42,7 +42,7 @@
Wire wire = new WireImpl();
wire.setSourceUri(uri);
Contract contract = new DefaultAssemblyFactory().createComponentReference();
- JavaFactory javaFactory = new DefaultJavaFactory();
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
InterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
interfaceContract.setInterface(javaFactory.createJavaInterface());
contract.setInterfaceContract(interfaceContract);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospector.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospector.java Thu May 3 19:02:54 2007
@@ -21,7 +21,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -31,23 +30,16 @@
import org.apache.tuscany.implementation.java.introspect.impl.JavaIntrospectionHelper;
/**
- * Default implementation of the <code>IntrospectionRegistry</code>
+ * Default Java class introspector implementation.
*
* @version $Rev$ $Date$
*/
-public class DefaultJavaClassIntrospector implements JavaClassIntrospectorExtensionPoint {
+public class DefaultJavaClassIntrospector implements JavaClassIntrospector {
+
+ private List<JavaClassVisitor> visitors;
- private List<JavaClassVisitor> extensions = new ArrayList<JavaClassVisitor>();
-
- public DefaultJavaClassIntrospector() {
- }
-
- public void addClassVisitor(JavaClassVisitor extension) {
- extensions.add(extension);
- }
-
- public void removeClassVisitor(JavaClassVisitor extension) {
- extensions.remove(extension);
+ public DefaultJavaClassIntrospector(JavaClassIntrospectorExtensionPoint visitors) {
+ this.visitors = visitors.getClassVisitors();
}
/**
@@ -76,12 +68,12 @@
*/
public JavaImplementation introspect(Class<?> clazz, JavaImplementation type)
throws IntrospectionException {
- for (JavaClassVisitor extension : extensions) {
+ for (JavaClassVisitor extension : visitors) {
extension.visitClass(clazz, type);
}
for (Constructor<?> constructor : clazz.getConstructors()) {
- for (JavaClassVisitor extension : extensions) {
+ for (JavaClassVisitor extension : visitors) {
extension.visitConstructor(constructor, type);
// Assuming the visitClass or visitConstructor will populate the
// type.getConstructors
@@ -96,14 +88,14 @@
Set<Method> methods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(clazz);
for (Method method : methods) {
- for (JavaClassVisitor processor : extensions) {
+ for (JavaClassVisitor processor : visitors) {
processor.visitMethod(method, type);
}
}
Set<Field> fields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(clazz);
for (Field field : fields) {
- for (JavaClassVisitor extension : extensions) {
+ for (JavaClassVisitor extension : visitors) {
extension.visitField(field, type);
}
}
@@ -113,7 +105,7 @@
visitSuperClass(superClass, type);
}
- for (JavaClassVisitor extension : extensions) {
+ for (JavaClassVisitor extension : visitors) {
extension.visitEnd(clazz, type);
}
return type;
@@ -121,7 +113,7 @@
private void visitSuperClass(Class<?> clazz, JavaImplementation type) throws IntrospectionException {
if (!Object.class.equals(clazz)) {
- for (JavaClassVisitor extension : extensions) {
+ for (JavaClassVisitor extension : visitors) {
extension.visitSuperClass(clazz, type);
}
clazz = clazz.getSuperclass();
Added: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java?view=auto&rev=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java Thu May 3 19:02:54 2007
@@ -0,0 +1,48 @@
+/*
+ * 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.implementation.java.introspect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Default implementation of the <code>IntrospectionRegistry</code>
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultJavaClassIntrospectorExtensionPoint implements JavaClassIntrospectorExtensionPoint {
+
+ private List<JavaClassVisitor> visitors = new ArrayList<JavaClassVisitor>();
+
+ public DefaultJavaClassIntrospectorExtensionPoint() {
+ }
+
+ public void addClassVisitor(JavaClassVisitor visitor) {
+ visitors.add(visitor);
+ }
+
+ public void removeClassVisitor(JavaClassVisitor visitor) {
+ visitors.remove(visitor);
+ }
+
+ public List<JavaClassVisitor> getClassVisitors() {
+ return visitors;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java Thu May 3 19:02:54 2007
@@ -18,21 +18,32 @@
*/
package org.apache.tuscany.implementation.java.introspect;
+import java.util.List;
+
/**
- * A system service which tracks {@link JavaClassVisitor}s
+ * An extension point for Java class visitors.
*
* @version $Rev$ $Date$
*/
-public interface JavaClassIntrospectorExtensionPoint extends JavaClassIntrospector {
+public interface JavaClassIntrospectorExtensionPoint {
/**
- * Registers the given extension.
+ * Registers the given visitor.
+ *
+ * @param visitor
*/
- void addClassVisitor(JavaClassVisitor extension);
+ void addClassVisitor(JavaClassVisitor visitor);
/**
- * Deregisters the given extension.
+ * Deregisters the given visitor.
+ */
+ void removeClassVisitor(JavaClassVisitor visitor);
+
+ /**
+ * Returns the list of visitors.
+ *
+ * @return
*/
- void removeClassVisitor(JavaClassVisitor extension);
+ List<JavaClassVisitor> getClassVisitors();
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessor.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessor.java Thu May 3 19:02:54 2007
@@ -50,7 +50,7 @@
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
@@ -74,10 +74,10 @@
* @version $Rev$ $Date$
*/
public class HeuristicPojoProcessor extends BaseJavaClassVisitor {
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
private JavaInterfaceIntrospector interfaceIntrospector;
- public HeuristicPojoProcessor(AssemblyFactory assemblyFactory, JavaFactory javaFactory, JavaInterfaceIntrospector interfaceIntrospector) {
+ public HeuristicPojoProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory, JavaInterfaceIntrospector interfaceIntrospector) {
super(assemblyFactory);
this.interfaceIntrospector = interfaceIntrospector;
this.javaFactory = javaFactory;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessor.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessor.java Thu May 3 19:02:54 2007
@@ -32,10 +32,10 @@
import org.apache.tuscany.implementation.java.impl.JavaParameterImpl;
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.osoa.sca.annotations.Reference;
/**
@@ -46,10 +46,10 @@
* @version $Rev$ $Date$
*/
public class ReferenceProcessor extends BaseJavaClassVisitor {
- private JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
- private JavaFactory javaFactory;
+ private JavaInterfaceIntrospector interfaceIntrospector;
+ private JavaInterfaceFactory javaFactory;
- public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaFactory javaFactory, JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector) {
+ public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory, JavaInterfaceIntrospector interfaceIntrospector) {
super(assemblyFactory);
this.javaFactory = javaFactory;
this.interfaceIntrospector = interfaceIntrospector;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java Thu May 3 19:02:54 2007
@@ -31,10 +31,10 @@
import org.apache.tuscany.implementation.java.impl.JavaElementImpl;
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Remotable;
@@ -46,10 +46,10 @@
* @version $Rev$ $Date$
*/
public class ServiceProcessor extends BaseJavaClassVisitor {
- private JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
- private JavaFactory javaFactory;
+ private JavaInterfaceIntrospector interfaceIntrospector;
+ private JavaInterfaceFactory javaFactory;
- public ServiceProcessor(AssemblyFactory assemblyFactory, JavaFactory javaFactory, JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector) {
+ public ServiceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory, JavaInterfaceIntrospector interfaceIntrospector) {
super(assemblyFactory);
this.javaFactory = javaFactory;
this.interfaceIntrospector = interfaceIntrospector;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java Thu May 3 19:02:54 2007
@@ -29,7 +29,6 @@
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.DefaultJavaImplementationFactory;
-import org.apache.tuscany.implementation.java.impl.JavaImplementationImpl;
import org.easymock.EasyMock;
/**
@@ -38,21 +37,21 @@
public class DefaultJavaClassIntrospectorTestCase extends TestCase {
public void testRegister() throws Exception {
- DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ DefaultJavaClassIntrospectorExtensionPoint visitors = new DefaultJavaClassIntrospectorExtensionPoint();
JavaClassVisitor extension = EasyMock.createNiceMock(JavaClassVisitor.class);
- introspector.addClassVisitor(extension);
+ visitors.addClassVisitor(extension);
}
public void testUnegister() throws Exception {
- DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ DefaultJavaClassIntrospectorExtensionPoint visitors = new DefaultJavaClassIntrospectorExtensionPoint();
JavaClassVisitor extension = EasyMock.createNiceMock(JavaClassVisitor.class);
- introspector.addClassVisitor(extension);
- introspector.removeClassVisitor(extension);
+ visitors.addClassVisitor(extension);
+ visitors.removeClassVisitor(extension);
}
@SuppressWarnings("unchecked")
public void testWalk() throws Exception {
- DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ DefaultJavaClassIntrospectorExtensionPoint visitors = new DefaultJavaClassIntrospectorExtensionPoint();
JavaClassVisitor extension = EasyMock.createMock(JavaClassVisitor.class);
extension.visitClass(EasyMock.eq(Bar.class), EasyMock.isA(JavaImplementation.class));
extension.visitConstructor(EasyMock.isA(Constructor.class), EasyMock.isA(JavaImplementation.class));
@@ -68,9 +67,10 @@
// mock.expects(once()).method("visitSuperClass");
// mock.expects(once()).method("visitEnd");
EasyMock.replay(extension);
- introspector.addClassVisitor(extension);
+ visitors.addClassVisitor(extension);
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory(assemblyFactory);
+ DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector(visitors);
introspector.introspect(Bar.class, javaImplementationFactory.createJavaImplementation());
EasyMock.verify(extension);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractProcessorTest.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractProcessorTest.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractProcessorTest.java Thu May 3 19:02:54 2007
@@ -28,9 +28,11 @@
import org.apache.tuscany.implementation.java.impl.JavaConstructorImpl;
import org.apache.tuscany.implementation.java.impl.JavaParameterImpl;
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
/**
@@ -40,7 +42,7 @@
*/
public class AbstractProcessorTest extends TestCase {
protected AssemblyFactory factory;
- protected JavaFactory javaFactory;
+ protected JavaInterfaceFactory javaFactory;
protected ConstructorProcessor constructorProcessor;
private ReferenceProcessor referenceProcessor;
private PropertyProcessor propertyProcessor;
@@ -49,12 +51,13 @@
protected AbstractProcessorTest() {
factory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
- referenceProcessor = new ReferenceProcessor(factory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory));
+ javaFactory = new DefaultJavaInterfaceFactory();
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ referenceProcessor = new ReferenceProcessor(factory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory, visitors));
propertyProcessor = new PropertyProcessor(factory);
resourceProcessor = new ResourceProcessor(factory);
constructorProcessor = new ConstructorProcessor(factory);
- referenceProcessor = new ReferenceProcessor(factory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory));
+ referenceProcessor = new ReferenceProcessor(factory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory, visitors));
propertyProcessor = new PropertyProcessor(factory);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessorTestCase.java Thu May 3 19:02:54 2007
@@ -35,9 +35,11 @@
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.DefaultJavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
@@ -90,8 +92,9 @@
processor.visitConstructor(ctor1, type);
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
- JavaFactory javaFactory = new DefaultJavaFactory();
- ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory));
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory, visitors));
PropertyProcessor propertyProcessor = new PropertyProcessor(assemblyFactory);
JavaParameterImpl[] parameters = type.getConstructor().getParameters();
for (int i = 0; i < parameters.length; i++) {
@@ -164,8 +167,9 @@
String[].class);
processor.visitConstructor(ctor1, type);
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
- JavaFactory javaFactory = new DefaultJavaFactory();
- ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory));
+ JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory, new DefaultJavaInterfaceIntrospector(javaFactory, visitors));
PropertyProcessor propertyProcessor = new PropertyProcessor(assemblyFactory);
JavaParameterImpl[] parameters = type.getConstructor().getParameters();
for (int i = 0; i < parameters.length; i++) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java Thu May 3 19:02:54 2007
@@ -28,8 +28,10 @@
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.DefaultJavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.osoa.sca.annotations.Property;
/**
@@ -58,9 +60,10 @@
protected void setUp() throws Exception {
super.setUp();
- DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaFactory());
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaInterfaceFactory(), visitors);
propertyProcessor = new PropertyProcessor(assemblyFactory);
- heuristicProcessor = new HeuristicPojoProcessor(assemblyFactory, new DefaultJavaFactory(), introspector);
+ heuristicProcessor = new HeuristicPojoProcessor(assemblyFactory, new DefaultJavaInterfaceFactory(), introspector);
}
public static class Foo {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicConstructorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicConstructorTestCase.java Thu May 3 19:02:54 2007
@@ -29,9 +29,11 @@
import org.apache.tuscany.implementation.java.impl.DefaultJavaImplementationFactory;
import org.apache.tuscany.implementation.java.impl.JavaElementImpl;
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
-import org.apache.tuscany.interfacedef.java.JavaFactory;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Remotable;
@@ -42,15 +44,16 @@
public class HeuristicConstructorTestCase extends AbstractProcessorTest {
private AssemblyFactory factory;
- private JavaFactory javaFactory;
+ private JavaInterfaceFactory javaFactory;
private HeuristicPojoProcessor processor;
private JavaImplementationFactory javaImplementationFactory;
public HeuristicConstructorTestCase() {
factory = new DefaultAssemblyFactory();
- javaFactory = new DefaultJavaFactory();
+ javaFactory = new DefaultJavaInterfaceFactory();
javaImplementationFactory = new DefaultJavaImplementationFactory(factory);
- DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(javaFactory);
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(javaFactory, visitors);
processor = new HeuristicPojoProcessor(factory, javaFactory, introspector);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java?view=diff&rev=535058&r1=535057&r2=535058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java Thu May 3 19:02:54 2007
@@ -31,8 +31,10 @@
import org.apache.tuscany.implementation.java.impl.JavaConstructorImpl;
import org.apache.tuscany.implementation.java.impl.JavaElementImpl;
import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
-import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.interfacedef.java.impl.DefaultJavaInterfaceFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.interfacedef.util.JavaXMLMapper;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
@@ -51,8 +53,9 @@
private JavaImplementationFactory javaImplementationFactory;
public HeuristicPojoProcessorTestCase() {
- DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaFactory());
- processor = new HeuristicPojoProcessor(new DefaultAssemblyFactory(), new DefaultJavaFactory(), introspector);
+ JavaInterfaceIntrospectorExtensionPoint visitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
+ DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector(new DefaultJavaInterfaceFactory(), visitors);
+ processor = new HeuristicPojoProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory(), introspector);
javaImplementationFactory = new DefaultJavaImplementationFactory(new DefaultAssemblyFactory());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org