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/04/11 09:44:36 UTC
svn commit: r527405 [2/2] - in /incubator/tuscany/java/sca/modules:
core-spring/src/test/java/test/model/variant/
implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/
implementation-java-runtime/src/test/java...
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidPropertyException.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/InvalidPropertyException.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidPropertyException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidPropertyException.java Wed Apr 11 00:44:29 2007
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.implementation.java.introspect.impl;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Denotes an invalid usage of {@link org.osoa.sca.annotations.Property}
*
* @version $Rev$ $Date$
*/
-public class InvalidPropertyException extends ProcessingException {
+public class InvalidPropertyException extends IntrospectionException {
private static final long serialVersionUID = -2682862652069727948L;
public InvalidPropertyException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidReferenceException.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/InvalidReferenceException.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidReferenceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidReferenceException.java Wed Apr 11 00:44:29 2007
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.implementation.java.introspect.impl;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Denotes an invalid usage of {@link org.osoa.sca.annotations.Reference}
*
* @version $Rev$ $Date$
*/
-public class InvalidReferenceException extends ProcessingException {
+public class InvalidReferenceException extends IntrospectionException {
private static final long serialVersionUID = -3285246635989254165L;
public InvalidReferenceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidResourceException.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/InvalidResourceException.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidResourceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidResourceException.java Wed Apr 11 00:44:29 2007
@@ -20,14 +20,14 @@
import java.lang.reflect.Member;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Denotes an invalid usage of {@link @org.apache.tuscany.api.annotation.Resource}
*
* @version $Rev$ $Date$
*/
-public class InvalidResourceException extends ProcessingException {
+public class InvalidResourceException extends IntrospectionException {
private static final long serialVersionUID = 511728001735534934L;
public InvalidResourceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidServiceType.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/InvalidServiceType.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidServiceType.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidServiceType.java Wed Apr 11 00:44:29 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.implementation.java.introspect.impl;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Thrown when a service type specified by an {@link org.osoa.sca.annotations.Service} annotation is invalid, e.g. it is
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public class InvalidServiceType extends ProcessingException {
+public class InvalidServiceType extends IntrospectionException {
private static final long serialVersionUID = -1076466639416644386L;
private Class<?> serviceType;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/NoConstructorException.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/NoConstructorException.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/NoConstructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/NoConstructorException.java Wed Apr 11 00:44:29 2007
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.implementation.java.introspect.impl;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Thrown when a suitable constructor for a component implementation cannot be found
*
* @version $Rev$ $Date$
*/
-public class NoConstructorException extends ProcessingException {
+public class NoConstructorException extends IntrospectionException {
private static final long serialVersionUID = 3086706387280694424L;
public NoConstructorException() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/PropertyProcessor.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/PropertyProcessor.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/PropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/PropertyProcessor.java Wed Apr 11 00:44:29 2007
@@ -27,6 +27,7 @@
* @version $Rev$ $Date$
*/
public class PropertyProcessor extends AbstractPropertyProcessor<Property> {
+
public PropertyProcessor() {
super(Property.class);
}
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -31,11 +31,12 @@
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Parameter;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceContractImpl;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.osoa.sca.annotations.Reference;
/**
@@ -46,8 +47,13 @@
* @version $Rev$ $Date$
*/
public class ReferenceProcessor extends BaseJavaClassIntrospectorExtension {
+ private JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
+
+ public ReferenceProcessor(JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector) {
+ this.interfaceIntrospector = interfaceIntrospector;
+ }
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
Reference annotation = method.getAnnotation(Reference.class);
if (annotation == null) {
return; // Not a reference annotation.
@@ -69,7 +75,7 @@
type.getReferenceMembers().put(name, element);
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
Reference annotation = field.getAnnotation(Reference.class);
if (annotation == null) {
return;
@@ -88,7 +94,7 @@
}
public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
- throws ProcessingException {
+ throws IntrospectionException {
Reference refAnnotation = parameter.getAnnotation(Reference.class);
if (refAnnotation == null) {
return;
@@ -119,7 +125,7 @@
}
}
- private org.apache.tuscany.assembly.Reference createReference(JavaElement element, String name) throws ProcessingException {
+ private org.apache.tuscany.assembly.Reference createReference(JavaElement element, String name) throws IntrospectionException {
org.apache.tuscany.assembly.Reference reference = new ReferenceImpl();
JavaInterfaceContract interfaceContract = new JavaInterfaceContractImpl();
reference.setInterfaceContract(interfaceContract);
@@ -156,7 +162,7 @@
reference.getInterfaceContract().setCallbackInterface(callbackInterface);
}
} catch (InvalidInterfaceException e) {
- throw new ProcessingException(e);
+ throw new IntrospectionException(e);
}
return reference;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.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/ResourceProcessor.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java Wed Apr 11 00:44:29 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.implementation.java.impl.Parameter;
import org.apache.tuscany.implementation.java.impl.Resource;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Processes an {@link @Resource} annotation, updating the component type with
@@ -37,10 +37,7 @@
*/
public class ResourceProcessor extends BaseJavaClassIntrospectorExtension {
- public ResourceProcessor() {
- }
-
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
org.apache.tuscany.api.annotation.Resource annotation = method
.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
if (annotation == null) {
@@ -66,7 +63,7 @@
type.add(resource);
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
org.apache.tuscany.api.annotation.Resource annotation = field
.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
@@ -99,7 +96,7 @@
}
public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
- throws ProcessingException {
+ throws IntrospectionException {
org.apache.tuscany.api.annotation.Resource resourceAnnotation = parameter
.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
if (resourceAnnotation != null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessor.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/ScopeProcessor.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessor.java Wed Apr 11 00:44:29 2007
@@ -21,7 +21,7 @@
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Scope;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Processes the {@link Scope} annotation and updates the component type with the corresponding implmentation scope
@@ -29,10 +29,10 @@
* @version $Rev$ $Date$
*/
public class ScopeProcessor extends BaseJavaClassIntrospectorExtension {
-
+
public <T> void visitClass(Class<T> clazz,
JavaImplementationDefinition type)
- throws ProcessingException {
+ throws IntrospectionException {
org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class);
if (annotation == null) {
type.setScope(Scope.STATELESS);
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -29,11 +29,12 @@
import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceContractImpl;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Remotable;
@@ -45,8 +46,13 @@
* @version $Rev$ $Date$
*/
public class ServiceProcessor extends BaseJavaClassIntrospectorExtension {
+ private JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
+
+ public ServiceProcessor(JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector) {
+ this.interfaceIntrospector = interfaceIntrospector;
+ }
- public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
org.osoa.sca.annotations.Service annotation = clazz.getAnnotation(org.osoa.sca.annotations.Service.class);
if (annotation == null) {
// scan intefaces for remotable
@@ -57,7 +63,7 @@
try {
service = createService(interfaze);
} catch (InvalidInterfaceException e) {
- throw new ProcessingException(e);
+ throw new IntrospectionException(e);
}
type.getServices().add(service);
}
@@ -82,13 +88,13 @@
try {
service = createService(interfaze);
} catch (InvalidInterfaceException e) {
- throw new ProcessingException(e);
+ throw new IntrospectionException(e);
}
type.getServices().add(service);
}
}
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
Callback annotation = method.getAnnotation(Callback.class);
if (annotation == null) {
@@ -112,7 +118,7 @@
type.getCallbackMembers().put(name, new JavaElement(method, 0));
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
Callback annotation = field.getAnnotation(Callback.class);
if (annotation == null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceTypeNotFoundException.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/ServiceTypeNotFoundException.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceTypeNotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceTypeNotFoundException.java Wed Apr 11 00:44:29 2007
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.implementation.java.introspect.impl;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Thrown when a service interface cannot be determined based on a heuristic evaluation of an implementation
*
* @version $Rev$ $Date$
*/
-public class ServiceTypeNotFoundException extends ProcessingException {
+public class ServiceTypeNotFoundException extends IntrospectionException {
private static final long serialVersionUID = -5124437274726947007L;
public ServiceTypeNotFoundException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java Wed Apr 11 00:44:29 2007
@@ -46,15 +46,19 @@
JavaImplementationConstants {
private JavaImplementationFactory javaFactory;
- private JavaClassIntrospectorExtensionPoint introspectionRegistry;
+ private JavaClassIntrospectorExtensionPoint introspector;
- public JavaImplementationProcessor(JavaImplementationFactory javaFactory) {
+ public JavaImplementationProcessor(JavaImplementationFactory javaFactory, JavaClassIntrospectorExtensionPoint introspector) {
this.javaFactory = javaFactory;
- this.introspectionRegistry = new DefaultJavaClassIntrospector();
+ this.introspector = introspector;
+ }
+
+ public JavaImplementationProcessor(JavaClassIntrospectorExtensionPoint introspector) {
+ this(new DefaultJavaImplementationFactory(new DefaultAssemblyFactory()), introspector);
}
public JavaImplementationProcessor() {
- this(new DefaultJavaImplementationFactory(new DefaultAssemblyFactory()));
+ this(new DefaultJavaImplementationFactory(new DefaultAssemblyFactory()), new DefaultJavaClassIntrospector());
}
public JavaImplementation read(XMLStreamReader reader) throws ContributionReadException {
@@ -100,7 +104,7 @@
//FIXME JavaImplementationDefinition should not be mandatory
if (javaImplementation instanceof JavaImplementationDefinition) {
- introspectionRegistry.introspect(javaImplementation.getJavaClass(), (JavaImplementationDefinition)javaImplementation);
+ introspector.introspect(javaImplementation.getJavaClass(), (JavaImplementationDefinition)javaImplementation);
//FIXME the introspector should always create at least one service
if (javaImplementation.getServices().isEmpty()) {
@@ -122,13 +126,6 @@
public Class<JavaImplementation> getModelType() {
return JavaImplementation.class;
- }
-
- /**
- * @param introspectionRegistry the introspectionRegistry to set
- */
- public void setIntrospectionRegistry(JavaClassIntrospectorExtensionPoint introspectionRegistry) {
- this.introspectionRegistry = introspectionRegistry;
}
/**
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -35,28 +35,28 @@
public class DefaultJavaClassIntrospectorTestCase extends TestCase {
public void testRegister() throws Exception {
- DefaultJavaClassIntrospector registry = new DefaultJavaClassIntrospector();
- JavaClassIntrospectorExtension processor = EasyMock.createNiceMock(JavaClassIntrospectorExtension.class);
- registry.addExtension(processor);
+ DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ JavaClassIntrospectorExtension extension = EasyMock.createNiceMock(JavaClassIntrospectorExtension.class);
+ introspector.addExtension(extension);
}
public void testUnegister() throws Exception {
- DefaultJavaClassIntrospector registry = new DefaultJavaClassIntrospector();
- JavaClassIntrospectorExtension processor = EasyMock.createNiceMock(JavaClassIntrospectorExtension.class);
- registry.addExtension(processor);
- registry.removeExtension(processor);
+ DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ JavaClassIntrospectorExtension extension = EasyMock.createNiceMock(JavaClassIntrospectorExtension.class);
+ introspector.addExtension(extension);
+ introspector.removeExtension(extension);
}
@SuppressWarnings("unchecked")
public void testWalk() throws Exception {
- DefaultJavaClassIntrospector registry = new DefaultJavaClassIntrospector();
- JavaClassIntrospectorExtension processor = EasyMock.createMock(JavaClassIntrospectorExtension.class);
- processor.visitClass(EasyMock.eq(Bar.class), EasyMock.isA(JavaImplementationDefinition.class));
- processor.visitConstructor(EasyMock.isA(Constructor.class), EasyMock.isA(JavaImplementationDefinition.class));
- processor.visitMethod(EasyMock.isA(Method.class), EasyMock.isA(JavaImplementationDefinition.class));
- processor.visitField(EasyMock.isA(Field.class), EasyMock.isA(JavaImplementationDefinition.class));
- processor.visitSuperClass(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementationDefinition.class));
- processor.visitEnd(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementationDefinition.class));
+ DefaultJavaClassIntrospector introspector = new DefaultJavaClassIntrospector();
+ JavaClassIntrospectorExtension extension = EasyMock.createMock(JavaClassIntrospectorExtension.class);
+ extension.visitClass(EasyMock.eq(Bar.class), EasyMock.isA(JavaImplementationDefinition.class));
+ extension.visitConstructor(EasyMock.isA(Constructor.class), EasyMock.isA(JavaImplementationDefinition.class));
+ extension.visitMethod(EasyMock.isA(Method.class), EasyMock.isA(JavaImplementationDefinition.class));
+ extension.visitField(EasyMock.isA(Field.class), EasyMock.isA(JavaImplementationDefinition.class));
+ extension.visitSuperClass(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementationDefinition.class));
+ extension.visitEnd(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementationDefinition.class));
// mock.expects(once()).method("visitClass");
// mock.expects(once()).method("visitMethod");
@@ -64,10 +64,10 @@
// mock.expects(once()).method("visitConstructor");
// mock.expects(once()).method("visitSuperClass");
// mock.expects(once()).method("visitEnd");
- EasyMock.replay(processor);
- registry.addExtension(processor);
- registry.introspect(Bar.class, new JavaImplementationDefinition());
- EasyMock.verify(processor);
+ EasyMock.replay(extension);
+ introspector.addExtension(extension);
+ introspector.introspect(Bar.class, new JavaImplementationDefinition());
+ EasyMock.verify(extension);
}
protected void setUp() throws Exception {
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -27,12 +27,13 @@
import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Parameter;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.implementation.java.introspect.impl.ConstructorProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.PropertyProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.ReferenceProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.ResourceProcessor;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
/**
@@ -43,7 +44,7 @@
public class AbstractProcessorTest extends TestCase {
protected AssemblyFactory factory = new DefaultAssemblyFactory();
protected ConstructorProcessor constructorProcessor;
- private ReferenceProcessor referenceProcessor = new ReferenceProcessor();
+ private ReferenceProcessor referenceProcessor = new ReferenceProcessor(new DefaultJavaInterfaceIntrospector());
private PropertyProcessor propertyProcessor = new PropertyProcessor();
private ResourceProcessor resourceProcessor = new ResourceProcessor();
// private MonitorProcessor monitorProcessor = new MonitorProcessor(new NullMonitorFactory());
@@ -51,13 +52,12 @@
protected AbstractProcessorTest() {
constructorProcessor = new ConstructorProcessor();
- referenceProcessor = new ReferenceProcessor();
- referenceProcessor.setInterfaceVisitorExtensionPoint(new DefaultJavaInterfaceIntrospector());
+ referenceProcessor = new ReferenceProcessor(new DefaultJavaInterfaceIntrospector());
propertyProcessor = new PropertyProcessor();
}
protected <T> void visitConstructor(Constructor<T> constructor,
- JavaImplementationDefinition type) throws ProcessingException {
+ JavaImplementationDefinition type) throws IntrospectionException {
constructorProcessor.visitConstructor(constructor, type);
ConstructorDefinition<?> definition = type.getConstructorDefinition();
if (definition == null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.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/AbstractPropertyProcessorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java Wed Apr 11 00:44:29 2007
@@ -43,12 +43,12 @@
*/
public class AbstractPropertyProcessorTestCase extends TestCase {
- private JavaClassIntrospectorExtension processor;
+ private JavaClassIntrospectorExtension extension;
public void testVisitMethod() throws Exception {
Method method = Foo.class.getMethod("setBar", String.class);
JavaImplementationDefinition type = new JavaImplementationDefinition();
- processor.visitMethod(method, type);
+ extension.visitMethod(method, type);
Property prop = getProperty(type, "test");
assertNotNull(prop);
}
@@ -57,7 +57,7 @@
Method method = Foo.class.getMethod("setNoParamsBar");
JavaImplementationDefinition type = new JavaImplementationDefinition();
try {
- processor.visitMethod(method, type);
+ extension.visitMethod(method, type);
fail();
} catch (IllegalPropertyException e) {
// expected
@@ -68,7 +68,7 @@
Method method = Foo.class.getMethod("setBadBar", String.class);
JavaImplementationDefinition type = new JavaImplementationDefinition();
try {
- processor.visitMethod(method, type);
+ extension.visitMethod(method, type);
fail();
} catch (IllegalPropertyException e) {
// expected
@@ -78,9 +78,9 @@
public void testDuplicateMethod() throws Exception {
Method method = Foo.class.getMethod("setBar", String.class);
JavaImplementationDefinition type = new JavaImplementationDefinition();
- processor.visitMethod(method, type);
+ extension.visitMethod(method, type);
try {
- processor.visitMethod(method, type);
+ extension.visitMethod(method, type);
fail();
} catch (DuplicatePropertyException e) {
// expected
@@ -90,7 +90,7 @@
public void testVisitField() throws Exception {
Field field = Foo.class.getDeclaredField("d");
JavaImplementationDefinition type = new JavaImplementationDefinition();
- processor.visitField(field, type);
+ extension.visitField(field, type);
Property prop = getProperty(type, "test");
assertNotNull(prop);
}
@@ -100,7 +100,7 @@
JavaImplementationDefinition type = new JavaImplementationDefinition();
ConstructorDefinition<Foo> def = new ConstructorDefinition<Foo>(ctor);
Parameter parameter = def.getParameters()[0];
- processor.visitConstructorParameter(parameter, type);
+ extension.visitConstructorParameter(parameter, type);
assertEquals("test", def.getParameters()[0].getName());
assertNotNull(getProperty(type, "test"));
}
@@ -108,7 +108,7 @@
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
super.setUp();
- processor = new TestProcessor();
+ extension = new TestProcessor();
}
@Retention(RUNTIME)
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -86,8 +86,7 @@
Constructor<Mixed> ctor1 = Mixed.class.getConstructor(String.class, String.class, String.class);
processor.visitConstructor(ctor1, type);
- ReferenceProcessor referenceProcessor = new ReferenceProcessor();
- referenceProcessor.setInterfaceVisitorExtensionPoint(new DefaultJavaInterfaceIntrospector());
+ ReferenceProcessor referenceProcessor = new ReferenceProcessor(new DefaultJavaInterfaceIntrospector());
PropertyProcessor propertyProcessor = new PropertyProcessor();
Parameter[] parameters = type.getConstructorDefinition().getParameters();
for (int i = 0; i < parameters.length; i++) {
@@ -159,8 +158,7 @@
Set.class,
String[].class);
processor.visitConstructor(ctor1, type);
- ReferenceProcessor referenceProcessor = new ReferenceProcessor();
- referenceProcessor.setInterfaceVisitorExtensionPoint(new DefaultJavaInterfaceIntrospector());
+ ReferenceProcessor referenceProcessor = new ReferenceProcessor(new DefaultJavaInterfaceIntrospector());
PropertyProcessor propertyProcessor = new PropertyProcessor();
Parameter[] parameters = type.getConstructorDefinition().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/EagerInitProcessorTestCase.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/EagerInitProcessorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/EagerInitProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/EagerInitProcessorTestCase.java Wed Apr 11 00:44:29 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.implementation.java.introspect.impl.EagerInitProcessor;
import org.osoa.sca.annotations.EagerInit;
@@ -30,14 +30,14 @@
*/
public class EagerInitProcessorTestCase extends TestCase {
- public void testNoLevel() throws ProcessingException {
+ public void testNoLevel() throws IntrospectionException {
EagerInitProcessor processor = new EagerInitProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
processor.visitClass(Level.class, type);
}
- public void testSubclass() throws ProcessingException {
+ public void testSubclass() throws IntrospectionException {
EagerInitProcessor processor = new EagerInitProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -55,9 +55,7 @@
super.setUp();
DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector();
propertyProcessor = new PropertyProcessor();
- propertyProcessor.setInterfaceVisitorExtensionPoint(introspector);
- heuristicProcessor = new HeuristicPojoProcessor();
- heuristicProcessor.setInterfaceVisitorExtensionPoint(introspector);
+ heuristicProcessor = new HeuristicPojoProcessor(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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -24,7 +24,7 @@
import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.implementation.java.introspect.impl.AmbiguousConstructorException;
import org.apache.tuscany.implementation.java.introspect.impl.HeuristicPojoProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.NoConstructorException;
@@ -42,11 +42,10 @@
public HeuristicConstructorTestCase() {
DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector();
- processor = new HeuristicPojoProcessor();
- processor.setInterfaceVisitorExtensionPoint(introspector);
+ processor = new HeuristicPojoProcessor(introspector);
}
- private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
for (Constructor<T> constructor : clazz.getConstructors()) {
visitConstructor(constructor, type);
}
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
import org.apache.tuscany.interfacedef.util.JavaXMLMapper;
import org.osoa.sca.annotations.Property;
@@ -47,11 +47,10 @@
public HeuristicPojoProcessorTestCase() {
DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector();
- processor = new org.apache.tuscany.implementation.java.introspect.impl.HeuristicPojoProcessor();
- processor.setInterfaceVisitorExtensionPoint(introspector);
+ processor = new HeuristicPojoProcessor(introspector);
}
- private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
for (Constructor<T> constructor : clazz.getConstructors()) {
visitConstructor(constructor, type);
}
@@ -158,7 +157,7 @@
assertEquals(0, type.getProperties().size());
}
- public void testParentInterface() throws ProcessingException, NoSuchMethodException {
+ public void testParentInterface() throws IntrospectionException, NoSuchMethodException {
JavaImplementationDefinition type = new JavaImplementationDefinition();
Constructor<Child> ctor = Child.class.getConstructor();
type.setConstructorDefinition(new ConstructorDefinition<Child>(ctor));
@@ -192,7 +191,7 @@
assertEquals(1, type.getServices().size());
}
- public void testProtectedRemotableRefField() throws ProcessingException, NoSuchMethodException {
+ public void testProtectedRemotableRefField() throws IntrospectionException, NoSuchMethodException {
JavaImplementationDefinition type = new JavaImplementationDefinition();
Constructor<ProtectedRemotableRefFieldImpl> ctor = ProtectedRemotableRefFieldImpl.class.getConstructor();
type.setConstructorDefinition(new ConstructorDefinition<ProtectedRemotableRefFieldImpl>(ctor));
@@ -200,7 +199,7 @@
assertNotNull(ModelHelper.getReference(type, "otherRef"));
}
- public void testProtectedRemotableRefMethod() throws ProcessingException, NoSuchMethodException {
+ public void testProtectedRemotableRefMethod() throws IntrospectionException, NoSuchMethodException {
JavaImplementationDefinition type = new JavaImplementationDefinition();
Constructor<ProtectedRemotableRefMethodImpl> ctor = ProtectedRemotableRefMethodImpl.class.getConstructor();
type.setConstructorDefinition(new ConstructorDefinition<ProtectedRemotableRefMethodImpl>(ctor));
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.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/HeutisticExtensibleConstructorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java Wed Apr 11 00:44:29 2007
@@ -24,7 +24,7 @@
import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
/**
@@ -40,11 +40,10 @@
public HeutisticExtensibleConstructorTestCase() {
DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector();
- processor = new org.apache.tuscany.implementation.java.introspect.impl.HeuristicPojoProcessor();
- processor.setInterfaceVisitorExtensionPoint(introspector);
+ processor = new HeuristicPojoProcessor(introspector);
}
- private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ private <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
for (Constructor<T> constructor : clazz.getConstructors()) {
visitConstructor(constructor, type);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessorTestCase.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/ReferenceProcessorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ReferenceProcessorTestCase.java Wed Apr 11 00:44:29 2007
@@ -112,8 +112,7 @@
protected void setUp() throws Exception {
super.setUp();
type = new JavaImplementationDefinition();
- processor = new ReferenceProcessor();
- processor.setInterfaceVisitorExtensionPoint(new DefaultJavaInterfaceIntrospector());
+ processor = new ReferenceProcessor(new DefaultJavaInterfaceIntrospector());
}
private interface Ref {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessorTestCase.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/ScopeProcessorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessorTestCase.java Wed Apr 11 00:44:29 2007
@@ -23,7 +23,7 @@
import org.apache.tuscany.assembly.Component;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Scope;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.implementation.java.introspect.impl.ScopeProcessor;
import org.easymock.EasyMock;
@@ -34,7 +34,7 @@
Component parent;
- public void testCompositeScope() throws ProcessingException {
+ public void testCompositeScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -43,7 +43,7 @@
assertEquals(Scope.COMPOSITE, type.getScope());
}
- public void testSessionScope() throws ProcessingException {
+ public void testSessionScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -51,7 +51,7 @@
assertEquals(Scope.SESSION, type.getScope());
}
- public void testConversationalScope() throws ProcessingException {
+ public void testConversationalScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -59,7 +59,7 @@
assertEquals(Scope.CONVERSATION, type.getScope());
}
- public void testRequestScope() throws ProcessingException {
+ public void testRequestScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -67,7 +67,7 @@
assertEquals(Scope.REQUEST, type.getScope());
}
- public void testSystemScope() throws ProcessingException {
+ public void testSystemScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -75,7 +75,7 @@
assertEquals(Scope.SYSTEM, type.getScope());
}
- public void testStatelessScope() throws ProcessingException {
+ public void testStatelessScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
@@ -83,7 +83,7 @@
assertEquals(Scope.STATELESS, type.getScope());
}
- public void testNoScope() throws ProcessingException {
+ public void testNoScope() throws IntrospectionException {
ScopeProcessor processor = new ScopeProcessor();
JavaImplementationDefinition type =
new JavaImplementationDefinition();
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.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/ServiceCallbackTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java Wed Apr 11 00:44:29 2007
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.implementation.java.introspect.impl.IllegalCallbackReferenceException;
import org.apache.tuscany.implementation.java.introspect.impl.ServiceProcessor;
import org.apache.tuscany.interfacedef.InvalidCallbackException;
@@ -42,8 +42,7 @@
@Override
protected void setUp() throws Exception {
- processor = new ServiceProcessor();
- processor.setInterfaceVisitorExtensionPoint(new DefaultJavaInterfaceIntrospector());
+ processor = new ServiceProcessor(new DefaultJavaInterfaceIntrospector());
}
public void testMethodCallbackInterface() throws Exception {
@@ -107,7 +106,7 @@
try {
processor.visitClass(BadFooImpl.class, type);
fail();
- } catch (ProcessingException e) {
+ } catch (IntrospectionException e) {
// expected
assertTrue(e.getCause() instanceof InvalidCallbackException);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessorTestCase.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/ServiceProcessorTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessorTestCase.java Wed Apr 11 00:44:29 2007
@@ -93,8 +93,7 @@
protected void setUp() throws Exception {
super.setUp();
DefaultJavaInterfaceIntrospector introspector = new DefaultJavaInterfaceIntrospector();
- processor = new ServiceProcessor();
- processor.setInterfaceVisitorExtensionPoint(introspector);
+ processor = new ServiceProcessor(introspector);
type = new JavaImplementationDefinition();
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospector.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/DefaultJavaInterfaceIntrospector.java Wed Apr 11 00:44:29 2007
@@ -51,18 +51,18 @@
private static final String UNKNOWN_DATABINDING = null;
private JavaFactory javaFactory;
- private List<JavaInterfaceIntrospectorExtension> processors = new ArrayList<JavaInterfaceIntrospectorExtension>();
+ private List<JavaInterfaceIntrospectorExtension> extensions = new ArrayList<JavaInterfaceIntrospectorExtension>();
public DefaultJavaInterfaceIntrospector() {
this.javaFactory = new DefaultJavaFactory();
}
- public void addIntrospectorExtension(JavaInterfaceIntrospectorExtension processor) {
- processors.add(processor);
+ public void addExtension(JavaInterfaceIntrospectorExtension extension) {
+ extensions.add(extension);
}
- public void removeIntrospectorExtension(JavaInterfaceIntrospectorExtension processor) {
- processors.remove(processor);
+ public void removeExtension(JavaInterfaceIntrospectorExtension extension) {
+ extensions.remove(extension);
}
public JavaInterface introspect(Class<?> type) throws InvalidInterfaceException {
@@ -86,8 +86,8 @@
javaInterface.getOperations().addAll(getOperations(type, remotable, conversational).values());
- for (JavaInterfaceIntrospectorExtension processor : processors) {
- processor.visitInterface(type);
+ for (JavaInterfaceIntrospectorExtension extension : extensions) {
+ extension.visitInterface(type);
}
return javaInterface;
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java Wed Apr 11 00:44:29 2007
@@ -27,13 +27,13 @@
public interface JavaInterfaceIntrospectorExtensionPoint extends JavaInterfaceIntrospector {
/**
- * Registers the given visitor
+ * Registers the given extension.
*/
- void addIntrospectorExtension(JavaInterfaceIntrospectorExtension visitor);
+ void addExtension(JavaInterfaceIntrospectorExtension visitor);
/**
- * Deregisters the given visitor
+ * Deregisters the given extension.
*/
- void removeIntrospectorExtension(JavaInterfaceIntrospectorExtension visitor);
+ void removeExtension(JavaInterfaceIntrospectorExtension visitor);
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java Wed Apr 11 00:44:29 2007
@@ -68,15 +68,15 @@
}
public void testUnregister() throws Exception {
- org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtension processor = createMock(org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtension.class);
- processor.visitInterface(eq(Base.class));
+ org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtension extension = createMock(org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtension.class);
+ extension.visitInterface(eq(Base.class));
expectLastCall().once();
- replay(processor);
- impl.addIntrospectorExtension(processor);
+ replay(extension);
+ impl.addExtension(extension);
impl.introspect(Base.class);
- impl.removeIntrospectorExtension(processor);
+ impl.removeExtension(extension);
impl.introspect(Base.class);
- verify(processor);
+ verify(extension);
}
protected void setUp() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org