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 [1/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...
Author: jsdelfino
Date: Wed Apr 11 00:44:29 2007
New Revision: 527405
URL: http://svn.apache.org/viewvc?view=rev&rev=527405
Log:
Minor cleanup of the interface and class introspection framework.
Added:
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IntrospectionException.java
- copied, changed from r527378, incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/ProcessingException.java
Removed:
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/ProcessingException.java
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/BaseJavaClassIntrospectorExtension.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/DuplicatePropertyException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IllegalPropertyException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospector.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtension.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/AbstractPropertyProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AmbiguousConstructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ContextProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConversationProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DestroyProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateConstructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateDestructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateInitException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateReferenceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateResourceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/EagerInitProcessor.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/IllegalCallbackReferenceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalContextException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalDestructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalInitException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalReferenceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalResourceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InitProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConstructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConversationalImplementation.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidPropertyException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidReferenceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidResourceException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidServiceType.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/NoConstructorException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/PropertyProcessor.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/ResourceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessor.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/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.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/AbstractPropertyProcessorTestCase.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/EagerInitProcessorTestCase.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/ReferenceProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ScopeProcessorTestCase.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/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/test/java/org/apache/tuscany/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
Modified: incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/test/java/test/model/variant/VariantRuntimeContext.java Wed Apr 11 00:44:29 2007
@@ -29,6 +29,7 @@
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.bean.impl.BeanJavaImplementationFactory;
+import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospector;
import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
import org.apache.tuscany.interfacedef.java.xml.JavaInterfaceProcessor;
import org.apache.tuscany.policy.PolicyFactory;
@@ -65,7 +66,7 @@
registry.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, registry));
registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
registry.addArtifactProcessor(new JavaInterfaceProcessor());
- registry.addArtifactProcessor(new JavaImplementationProcessor(javaImplementationFactory));
+ registry.addArtifactProcessor(new JavaImplementationProcessor(javaImplementationFactory, new DefaultJavaClassIntrospector()));
// Create a resolver
DefaultArtifactResolver resolver = new DefaultArtifactResolver();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java Wed Apr 11 00:44:29 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospector;
+import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtension;
import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
import org.apache.tuscany.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;
import org.apache.tuscany.implementation.java.introspect.impl.ConstructorProcessor;
@@ -68,43 +69,41 @@
/**
* @see org.apache.tuscany.spi.bootstrap.ModuleActivator#start(org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry)
*/
- public void start(ExtensionPointRegistry registry) {
- JavaInterfaceIntrospectorExtensionPoint javaInterfaceProcessorRegistry = registry
+ public void start(ExtensionPointRegistry extensionPointRegistry) {
+ JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = extensionPointRegistry
.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
- JavaClassIntrospectorExtensionPoint introspectionRegistry = registry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
- BaseJavaClassIntrospectorExtension[] extensions = new BaseJavaClassIntrospectorExtension[] {new ConstructorProcessor(),
- new AllowsPassByReferenceProcessor(),
- new ContextProcessor(),
- new ConversationProcessor(),
- new DestroyProcessor(),
- new EagerInitProcessor(),
- new InitProcessor(),
- new PropertyProcessor(),
- new ReferenceProcessor(),
- new ResourceProcessor(),
- new ScopeProcessor(),
- new ServiceProcessor(),
- new HeuristicPojoProcessor()
+ JavaClassIntrospectorExtensionPoint classIntrospector = extensionPointRegistry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
+ BaseJavaClassIntrospectorExtension[] extensions = new BaseJavaClassIntrospectorExtension[] {
+ new ConstructorProcessor(),
+ new AllowsPassByReferenceProcessor(),
+ new ContextProcessor(),
+ new ConversationProcessor(),
+ new DestroyProcessor(),
+ new EagerInitProcessor(),
+ new InitProcessor(),
+ new PropertyProcessor(),
+ new ReferenceProcessor(interfaceIntrospector),
+ new ResourceProcessor(),
+ new ScopeProcessor(),
+ new ServiceProcessor(interfaceIntrospector),
+ new HeuristicPojoProcessor(interfaceIntrospector)
};
- for (BaseJavaClassIntrospectorExtension e : extensions) {
- e.setRegistry(introspectionRegistry);
- e.setInterfaceVisitorExtensionPoint(javaInterfaceProcessorRegistry);
- introspectionRegistry.addExtension(e);
+ for (JavaClassIntrospectorExtension e : extensions) {
+ classIntrospector.addExtension(e);
}
- StAXArtifactProcessorRegistry artifactProcessorRegistry = registry
+ StAXArtifactProcessorRegistry artifactProcessorRegistry = extensionPointRegistry
.getExtensionPoint(StAXArtifactProcessorRegistry.class);
- JavaImplementationProcessor javaImplementationProcessor = new JavaImplementationProcessor();
- javaImplementationProcessor.setIntrospectionRegistry(introspectionRegistry);
+ JavaImplementationProcessor javaImplementationProcessor = new JavaImplementationProcessor(classIntrospector);
artifactProcessorRegistry.addArtifactProcessor(javaImplementationProcessor);
- BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
+ BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setScopeRegistry(registry.getExtensionPoint(ScopeRegistry.class));
- builder.setProxyService(registry.getExtensionPoint(ProxyService.class));
- builder.setWorkContext(registry.getExtensionPoint(WorkContext.class));
+ builder.setScopeRegistry(extensionPointRegistry.getExtensionPoint(ScopeRegistry.class));
+ builder.setProxyService(extensionPointRegistry.getExtensionPoint(ProxyService.class));
+ builder.setWorkContext(extensionPointRegistry.getExtensionPoint(WorkContext.class));
builderRegistry.register(JavaImplementation.class, builder);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=527405&r1=527404&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java Wed Apr 11 00:44:29 2007
@@ -42,7 +42,7 @@
* @version $Rev$ $Date$
*/
public class JDKInvocationHandlerProxyTestCase extends TestCase {
- private JavaInterfaceIntrospectorExtensionPoint registry = new DefaultJavaInterfaceIntrospector();
+ private JavaInterfaceIntrospectorExtensionPoint introspector = new DefaultJavaInterfaceIntrospector();
private Method clientHello;
/**
@@ -55,7 +55,7 @@
Contract contract = new DefaultAssemblyFactory().createComponentReference();
JavaInterfaceContract interfaceContract = new JavaInterfaceContractImpl();
contract.setInterfaceContract(interfaceContract);
- interfaceContract.setInterface(registry.introspect(Target.class));
+ interfaceContract.setInterface(introspector.introspect(Target.class));
for (Operation operation : contract.getInterfaceContract().getInterface().getOperations()) {
InvocationChain chain = new InvocationChainImpl(operation);
wire.addInvocationChain(operation, chain);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/BaseJavaClassIntrospectorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/BaseJavaClassIntrospectorExtension.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/BaseJavaClassIntrospectorExtension.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/BaseJavaClassIntrospectorExtension.java Wed Apr 11 00:44:29 2007
@@ -26,11 +26,6 @@
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Parameter;
-import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
/**
* A convenience class for annotation processors which alleviates the need to
@@ -38,64 +33,31 @@
*
* @version $Rev$ $Date$
*/
-@EagerInit
public abstract class BaseJavaClassIntrospectorExtension implements JavaClassIntrospectorExtension {
protected AssemblyFactory factory;
- protected JavaClassIntrospectorExtensionPoint registry;
- protected JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
-
- public BaseJavaClassIntrospectorExtension() {
- super();
- this.factory = new DefaultAssemblyFactory();
- }
- /**
- * @param registry
- */
- public BaseJavaClassIntrospectorExtension(JavaClassIntrospectorExtensionPoint registry) {
- super();
- this.registry = registry;
+ public BaseJavaClassIntrospectorExtension() {
this.factory = new DefaultAssemblyFactory();
}
- @Reference
- public void setRegistry(JavaClassIntrospectorExtensionPoint registry) {
- this.registry = registry;
- }
-
- @Reference
- public void setInterfaceVisitorExtensionPoint(JavaInterfaceIntrospectorExtensionPoint interfaceIntrospectorExtensionPoint) {
- this.interfaceIntrospector = interfaceIntrospectorExtensionPoint;
- }
-
- @Init
- public void init() {
- registry.addExtension(this);
- }
-
- @Destroy
- public void destroy() {
- registry.removeExtension(this);
- }
-
- public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
}
- public <T> void visitSuperClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitSuperClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
}
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
}
- public <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type) throws IntrospectionException {
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
}
- public <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
}
- public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type) throws IntrospectionException {
}
}
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -37,17 +37,17 @@
*/
public class DefaultJavaClassIntrospector implements JavaClassIntrospectorExtensionPoint {
- private List<JavaClassIntrospectorExtension> processors = new ArrayList<JavaClassIntrospectorExtension>();
+ private List<JavaClassIntrospectorExtension> extensions = new ArrayList<JavaClassIntrospectorExtension>();
public DefaultJavaClassIntrospector() {
}
- public void addExtension(JavaClassIntrospectorExtension processor) {
- processors.add(processor);
+ public void addExtension(JavaClassIntrospectorExtension extension) {
+ extensions.add(extension);
}
- public void removeExtension(JavaClassIntrospectorExtension processor) {
- processors.remove(processor);
+ public void removeExtension(JavaClassIntrospectorExtension extension) {
+ extensions.remove(extension);
}
/**
@@ -75,20 +75,20 @@
* </ol>
*/
public JavaImplementationDefinition introspect(Class<?> clazz, JavaImplementationDefinition type)
- throws ProcessingException {
- for (JavaClassIntrospectorExtension processor : processors) {
- processor.visitClass(clazz, type);
+ throws IntrospectionException {
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ extension.visitClass(clazz, type);
}
for (Constructor<?> constructor : clazz.getConstructors()) {
- for (JavaClassIntrospectorExtension processor : processors) {
- processor.visitConstructor(constructor, type);
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ extension.visitConstructor(constructor, type);
// Assuming the visitClass or visitConstructor will populate the
// type.getConstructors
ConstructorDefinition<?> definition = type.getConstructors().get(constructor);
if (definition != null) {
for (Parameter p : definition.getParameters()) {
- processor.visitConstructorParameter(p, type);
+ extension.visitConstructorParameter(p, type);
}
}
}
@@ -96,15 +96,15 @@
Set<Method> methods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(clazz);
for (Method method : methods) {
- for (JavaClassIntrospectorExtension processor : processors) {
+ for (JavaClassIntrospectorExtension processor : extensions) {
processor.visitMethod(method, type);
}
}
Set<Field> fields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(clazz);
for (Field field : fields) {
- for (JavaClassIntrospectorExtension processor : processors) {
- processor.visitField(field, type);
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ extension.visitField(field, type);
}
}
@@ -113,16 +113,16 @@
visitSuperClass(superClass, type);
}
- for (JavaClassIntrospectorExtension processor : processors) {
- processor.visitEnd(clazz, type);
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ extension.visitEnd(clazz, type);
}
return type;
}
- private void visitSuperClass(Class<?> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ private void visitSuperClass(Class<?> clazz, JavaImplementationDefinition type) throws IntrospectionException {
if (!Object.class.equals(clazz)) {
- for (JavaClassIntrospectorExtension processor : processors) {
- processor.visitSuperClass(clazz, type);
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ extension.visitSuperClass(clazz, type);
}
clazz = clazz.getSuperclass();
if (clazz != null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DuplicatePropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DuplicatePropertyException.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/DuplicatePropertyException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/DuplicatePropertyException.java Wed Apr 11 00:44:29 2007
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class DuplicatePropertyException extends ProcessingException {
+public class DuplicatePropertyException extends IntrospectionException {
private static final long serialVersionUID = 5536415875694904037L;
public DuplicatePropertyException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IllegalPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IllegalPropertyException.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/IllegalPropertyException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IllegalPropertyException.java Wed Apr 11 00:44:29 2007
@@ -25,7 +25,7 @@
*
* @version $Rev$ $Date$
*/
-public class IllegalPropertyException extends ProcessingException {
+public class IllegalPropertyException extends IntrospectionException {
private static final long serialVersionUID = -2836849110706758494L;
public IllegalPropertyException(String message) {
Copied: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IntrospectionException.java (from r527378, incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/ProcessingException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IntrospectionException.java?view=diff&rev=527405&p1=incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/ProcessingException.java&r1=527378&p2=incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IntrospectionException.java&r2=527405
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/ProcessingException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/IntrospectionException.java Wed Apr 11 00:44:29 2007
@@ -25,27 +25,27 @@
*
* @version $Rev$ $Date$
*/
-public class ProcessingException extends Exception {
+public class IntrospectionException extends Exception {
private static final long serialVersionUID = -361025119035104470L;
private Member member;
- public ProcessingException() {
+ public IntrospectionException() {
}
- public ProcessingException(String message) {
+ public IntrospectionException(String message) {
super(message);
}
- public ProcessingException(String message, Member member) {
+ public IntrospectionException(String message, Member member) {
super(message);
this.member = member;
}
- public ProcessingException(String message, Throwable cause) {
+ public IntrospectionException(String message, Throwable cause) {
super(message, cause);
}
- public ProcessingException(Throwable cause) {
+ public IntrospectionException(Throwable cause) {
super(cause);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospector.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/JavaClassIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospector.java Wed Apr 11 00:44:29 2007
@@ -34,9 +34,9 @@
* @param clazz the component implementation class
* @param type the component type associated with the implementation class
* @return the updated component type
- * @throws ProcessingException if an error is encountered evaluating the
+ * @throws IntrospectionException if an error is encountered evaluating the
* implementation class
*/
- JavaImplementationDefinition introspect(Class<?> clazz, JavaImplementationDefinition type) throws ProcessingException;
+ JavaImplementationDefinition introspect(Class<?> clazz, JavaImplementationDefinition type) throws IntrospectionException;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtension.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/JavaClassIntrospectorExtension.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/JavaClassIntrospectorExtension.java Wed Apr 11 00:44:29 2007
@@ -45,10 +45,10 @@
* @param clazz the component implementation class
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException;
+ <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException;
/**
* A callback received as the component implementation class hierarchy is
@@ -58,10 +58,10 @@
* hierarchy
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- <T> void visitSuperClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException;
+ <T> void visitSuperClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException;
/**
* A callback received as the component implementation's public and
@@ -70,10 +70,10 @@
* @param method the current public or protected method being evaluated
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException;
+ void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException;
/**
* A callback received as the component implementation's constructor used
@@ -86,17 +86,17 @@
* implementation instances
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type) throws ProcessingException;
+ <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type) throws IntrospectionException;
/**
* @param parameter
* @param type
- * @throws ProcessingException
+ * @throws IntrospectionException
*/
- void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type) throws ProcessingException;
+ void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type) throws IntrospectionException;
/**
* A callback received as the component implementation's public and
@@ -105,10 +105,10 @@
* @param field the current public or protected field being evaluated
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException;
+ void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException;
/**
* The final callback received when all other callbacks during evaluation of
@@ -117,9 +117,9 @@
* @param clazz the component implementation class
* @param type the incomplete component type associated with the
* implementation class
- * @throws ProcessingException if an error is encountered while processing
+ * @throws IntrospectionException if an error is encountered while processing
* metadata
*/
- <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException;
+ <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException;
}
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -26,13 +26,13 @@
public interface JavaClassIntrospectorExtensionPoint extends JavaClassIntrospector {
/**
- * Registers the given processor and makes it available during assembly evaluation (i.e. build)
+ * Registers the given extension.
*/
- void addExtension(JavaClassIntrospectorExtension processor);
+ void addExtension(JavaClassIntrospectorExtension extension);
/**
- * Deregisters the given processor
+ * Deregisters the given extension.
*/
- void removeExtension(JavaClassIntrospectorExtension processor);
+ void removeExtension(JavaClassIntrospectorExtension extension);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractPropertyProcessor.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/AbstractPropertyProcessor.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/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AbstractPropertyProcessor.java Wed Apr 11 00:44:29 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
import org.apache.tuscany.implementation.java.introspect.DuplicatePropertyException;
import org.apache.tuscany.implementation.java.introspect.IllegalPropertyException;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
import org.apache.tuscany.interfacedef.util.JavaXMLMapper;
/**
@@ -42,12 +42,13 @@
*/
public abstract class AbstractPropertyProcessor<A extends Annotation> extends BaseJavaClassIntrospectorExtension {
private final Class<A> annotationClass;
-
+
+
protected AbstractPropertyProcessor(Class<A> annotationClass) {
this.annotationClass = annotationClass;
}
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
A annotation = method.getAnnotation(annotationClass);
if (annotation == null) {
return;
@@ -84,7 +85,7 @@
properties.put(name, element);
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
A annotation = field.getAnnotation(annotationClass);
if (annotation == null) {
@@ -112,7 +113,7 @@
}
public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
- throws ProcessingException {
+ throws IntrospectionException {
Map<String, JavaElement> properties = type.getPropertyMembers();
A annotation = parameter.getAnnotation(annotationClass);
@@ -145,10 +146,10 @@
protected abstract String getName(A annotation);
- protected abstract void initProperty(Property property, A annotation) throws ProcessingException;
+ protected abstract void initProperty(Property property, A annotation) throws IntrospectionException;
@SuppressWarnings("unchecked")
- protected Property createProperty(String name, JavaElement element) throws ProcessingException {
+ protected Property createProperty(String name, JavaElement element) throws IntrospectionException {
Property property = factory.createProperty();
property.setName(name);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.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/AllowsPassByReferenceProcessor.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/AllowsPassByReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java Wed Apr 11 00:44:29 2007
@@ -22,7 +22,7 @@
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.osoa.sca.annotations.AllowsPassByReference;
/**
@@ -31,13 +31,13 @@
* @version $Rev$ $Date$
*/
public class AllowsPassByReferenceProcessor extends BaseJavaClassIntrospectorExtension {
-
- public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
type.setAllowsPassByReference(clazz.isAnnotationPresent(AllowsPassByReference.class));
}
@Override
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
boolean pbr = method.isAnnotationPresent(AllowsPassByReference.class);
if (pbr) {
type.getAllowsPassByReferenceMethods().add(method);
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AmbiguousConstructorException.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/AmbiguousConstructorException.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/AmbiguousConstructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/AmbiguousConstructorException.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;
/**
* Thrown when constructor parameters cannot be unambiguously resolved to a property or reference
*
* @version $Rev$ $Date$
*/
-public class AmbiguousConstructorException extends ProcessingException {
+public class AmbiguousConstructorException extends IntrospectionException {
private static final long serialVersionUID = 3662860753837091880L;
public AmbiguousConstructorException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessor.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/ConstructorProcessor.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/ConstructorProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConstructorProcessor.java Wed Apr 11 00:44:29 2007
@@ -24,7 +24,7 @@
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;
/**
* Handles processing of a constructor decorated with
@@ -35,10 +35,7 @@
@SuppressWarnings("unchecked")
public class ConstructorProcessor extends BaseJavaClassIntrospectorExtension {
- public ConstructorProcessor() {
- }
-
- public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
Constructor[] ctors = clazz.getConstructors();
boolean found = false;
for (Constructor constructor : ctors) {
@@ -55,7 +52,7 @@
}
public <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type)
- throws ProcessingException {
+ throws IntrospectionException {
org.osoa.sca.annotations.Constructor annotation = constructor
.getAnnotation(org.osoa.sca.annotations.Constructor.class);
if (annotation == null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ContextProcessor.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/ContextProcessor.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/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ContextProcessor.java Wed Apr 11 00:44:29 2007
@@ -25,7 +25,7 @@
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
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;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Context;
@@ -38,8 +38,8 @@
* @version $Rev$ $Date$
*/
public class ContextProcessor extends BaseJavaClassIntrospectorExtension {
-
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
if (method.getAnnotation(Context.class) == null) {
return;
}
@@ -59,7 +59,7 @@
}
}
- public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
if (field.getAnnotation(Context.class) == null) {
return;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConversationProcessor.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/ConversationProcessor.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/ConversationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ConversationProcessor.java Wed Apr 11 00:44:29 2007
@@ -23,7 +23,7 @@
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.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Scope;
@@ -37,8 +37,8 @@
private static final String HOURS = " HOURS";
private static final String DAYS = " DAYS";
private static final String YEARS = " YEARS";
-
- public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
ConversationAttributes conversation = clazz.getAnnotation(ConversationAttributes.class);
if (conversation == null) {
@@ -81,7 +81,7 @@
}
public void visitMethod(Method method,
- JavaImplementationDefinition type) throws ProcessingException {
+ JavaImplementationDefinition type) throws IntrospectionException {
ConversationID conversationID = method.getAnnotation(ConversationID.class);
if (conversationID == null) {
return;
@@ -90,7 +90,7 @@
}
public void visitField(Field field,
- JavaImplementationDefinition type) throws ProcessingException {
+ JavaImplementationDefinition type) throws IntrospectionException {
ConversationID conversationID = field.getAnnotation(ConversationID.class);
if (conversationID == null) {
return;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DestroyProcessor.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/DestroyProcessor.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/DestroyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DestroyProcessor.java Wed Apr 11 00:44:29 2007
@@ -23,7 +23,7 @@
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.osoa.sca.annotations.Destroy;
/**
@@ -33,8 +33,8 @@
* @version $Rev$ $Date$
*/
public class DestroyProcessor extends BaseJavaClassIntrospectorExtension {
-
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
Destroy annotation = method.getAnnotation(Destroy.class);
if (annotation == null) {
return;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateConstructorException.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/DuplicateConstructorException.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/DuplicateConstructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateConstructorException.java Wed Apr 11 00:44:29 2007
@@ -20,7 +20,7 @@
import java.lang.reflect.Member;
-import org.apache.tuscany.implementation.java.introspect.ProcessingException;
+import org.apache.tuscany.implementation.java.introspect.IntrospectionException;
/**
* Thrown when more than one component implementation constructor is annotated with {@link
@@ -28,7 +28,7 @@
*
* @version $Rev$ $Date$
*/
-public class DuplicateConstructorException extends ProcessingException {
+public class DuplicateConstructorException extends IntrospectionException {
private static final long serialVersionUID = -5926763756570552986L;
public DuplicateConstructorException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateDestructorException.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/DuplicateDestructorException.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/DuplicateDestructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateDestructorException.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 an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy}
*
* @version $Rev$ $Date$
*/
-public class DuplicateDestructorException extends ProcessingException {
+public class DuplicateDestructorException extends IntrospectionException {
private static final long serialVersionUID = -7474912510114895203L;
public DuplicateDestructorException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateInitException.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/DuplicateInitException.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/DuplicateInitException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateInitException.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 an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init}
*
* @version $Rev$ $Date$
*/
-public class DuplicateInitException extends ProcessingException {
+public class DuplicateInitException extends IntrospectionException {
private static final long serialVersionUID = -6282935288115512057L;
public DuplicateInitException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateReferenceException.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/DuplicateReferenceException.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/DuplicateReferenceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateReferenceException.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 an implementation has more than one reference injection site with the same name
*
* @version $Rev$ $Date$
*/
-public class DuplicateReferenceException extends ProcessingException {
+public class DuplicateReferenceException extends IntrospectionException {
private static final long serialVersionUID = 907910648213477158L;
public DuplicateReferenceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateResourceException.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/DuplicateResourceException.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/DuplicateResourceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/DuplicateResourceException.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 an implementation has more than one resource injection site with the same name
*
* @version $Rev$ $Date$
*/
-public class DuplicateResourceException extends ProcessingException {
+public class DuplicateResourceException extends IntrospectionException {
private static final long serialVersionUID = 1619276459330463299L;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/EagerInitProcessor.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/EagerInitProcessor.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/EagerInitProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/EagerInitProcessor.java Wed Apr 11 00:44:29 2007
@@ -20,7 +20,7 @@
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.osoa.sca.annotations.EagerInit;
/**
@@ -29,9 +29,9 @@
* @version $Rev$ $Date$
*/
public class EagerInitProcessor extends BaseJavaClassIntrospectorExtension {
-
+
public <T> void visitClass(Class<T> clazz,
- JavaImplementationDefinition type) throws ProcessingException {
+ JavaImplementationDefinition type) throws IntrospectionException {
super.visitClass(clazz, type);
EagerInit annotation = clazz.getAnnotation(EagerInit.class);
if (annotation == null) {
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=527405&r1=527404&r2=527405
==============================================================================
--- 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 Wed Apr 11 00:44:29 2007
@@ -47,7 +47,7 @@
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.Interface;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.java.JavaFactory;
@@ -55,6 +55,7 @@
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceContractImpl;
+import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.interfacedef.util.JavaXMLMapper;
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Property;
@@ -76,12 +77,14 @@
*/
public class HeuristicPojoProcessor extends BaseJavaClassIntrospectorExtension {
private JavaFactory javaFactory;
+ private JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector;
- public HeuristicPojoProcessor() {
+ public HeuristicPojoProcessor(JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector) {
+ this.interfaceIntrospector = interfaceIntrospector;
this.javaFactory = new DefaultJavaFactory();
}
- public <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
+ public <T> void visitEnd(Class<T> clazz, JavaImplementationDefinition type) throws IntrospectionException {
List<org.apache.tuscany.assembly.Service> services = type.getServices();
if (services.isEmpty()) {
// heuristically determine the service
@@ -111,12 +114,12 @@
evaluateConstructor(type, clazz);
}
- private void addService(JavaImplementationDefinition type, Class<?> clazz) throws ProcessingException {
+ private void addService(JavaImplementationDefinition type, Class<?> clazz) throws IntrospectionException {
try {
org.apache.tuscany.assembly.Service service = createService(clazz);
type.getServices().add(service);
} catch (InvalidInterfaceException e) {
- throw new ProcessingException(e);
+ throw new IntrospectionException(e);
}
}
@@ -135,7 +138,7 @@
private <T> void calcPropRefs(Set<Method> methods,
List<org.apache.tuscany.assembly.Service> services,
JavaImplementationDefinition type,
- Class<T> clazz) throws ProcessingException {
+ Class<T> clazz) throws IntrospectionException {
// heuristically determine the properties references
// make a first pass through all public methods with one param
Set<String> setters = new HashSet<String>();
@@ -212,7 +215,7 @@
* cannot be unambiguously mapped to references and properties
*/
@SuppressWarnings("unchecked")
- private <T> void evaluateConstructor(JavaImplementationDefinition type, Class<T> clazz) throws ProcessingException {
+ private <T> void evaluateConstructor(JavaImplementationDefinition type, Class<T> clazz) throws IntrospectionException {
// determine constructor if one is not annotated
ConstructorDefinition<?> definition = type.getConstructorDefinition();
Constructor constructor;
@@ -308,7 +311,7 @@
}
private void heuristicParamNames(JavaImplementationDefinition type, Parameter[] parameters)
- throws ProcessingException {
+ throws IntrospectionException {
// heuristically determine refs and props from the parameter types
for (Parameter p : parameters) {
String name = p.getType().getSimpleName().toLowerCase();
@@ -496,7 +499,7 @@
* @param methods all methods in the class to examine
*/
private void calculateServiceInterface(Class<?> clazz, JavaImplementationDefinition type, Set<Method> methods)
- throws ProcessingException {
+ throws IntrospectionException {
List<Method> nonPropRefMethods = new ArrayList<Method>();
// Map<String, Service> services = type.getServices();
Map<String, JavaElement> references = type.getReferenceMembers();
@@ -520,7 +523,7 @@
try {
service = createService(interfaze);
} catch (InvalidInterfaceException e) {
- throw new ProcessingException(e);
+ throw new IntrospectionException(e);
}
type.getServices().add(service);
}
@@ -571,7 +574,7 @@
}
public org.apache.tuscany.assembly.Reference createReference(String name, Class<?> paramType)
- throws ProcessingException {
+ throws IntrospectionException {
org.apache.tuscany.assembly.Reference reference = factory.createReference();
reference.setName(name);
JavaInterfaceContract interfaceContract = new JavaInterfaceContractImpl();
@@ -585,12 +588,12 @@
}
reference.setMultiplicity(Multiplicity.ZERO_ONE);
} catch (InvalidInterfaceException e1) {
- throw new ProcessingException(e1);
+ throw new IntrospectionException(e1);
}
try {
processCallback(paramType, reference);
} catch (InvalidServiceType 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/IllegalCallbackReferenceException.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/IllegalCallbackReferenceException.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/IllegalCallbackReferenceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalCallbackReferenceException.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 illegcal use of {@link org.osoa.sca.annotations.Callback} on a reference
*
* @version $Rev$ $Date$
*/
-public class IllegalCallbackReferenceException extends ProcessingException {
+public class IllegalCallbackReferenceException extends IntrospectionException {
private static final long serialVersionUID = -8932525723147700591L;
public IllegalCallbackReferenceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalContextException.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/IllegalContextException.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/IllegalContextException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalContextException.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 illegal signature for a method decorated with {@link org.osoa.sca.annotations.Context}
*
* @version $Rev$ $Date$
*/
-public class IllegalContextException extends ProcessingException {
+public class IllegalContextException extends IntrospectionException {
private static final long serialVersionUID = -6946383136750117008L;
public IllegalContextException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalDestructorException.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/IllegalDestructorException.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/IllegalDestructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalDestructorException.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 illegal signature for a method decorated with {@link org.osoa.sca.annotations.Destroy}
*
* @version $Rev$ $Date$
*/
-public class IllegalDestructorException extends ProcessingException {
+public class IllegalDestructorException extends IntrospectionException {
private static final long serialVersionUID = 365719353107446326L;
public IllegalDestructorException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalInitException.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/IllegalInitException.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/IllegalInitException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalInitException.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 illegal signature for a method decorated with {@link @org.osoa.sca.annotations.Init}
*
* @version $Rev$ $Date$
*/
-public class IllegalInitException extends ProcessingException {
+public class IllegalInitException extends IntrospectionException {
private static final long serialVersionUID = -3690763271986854701L;
public IllegalInitException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalReferenceException.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/IllegalReferenceException.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/IllegalReferenceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalReferenceException.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 illegal reference definition in a component type
*
* @version $Rev$ $Date$
*/
-public class IllegalReferenceException extends ProcessingException {
+public class IllegalReferenceException extends IntrospectionException {
private static final long serialVersionUID = 4612984122225271395L;
public IllegalReferenceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalResourceException.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/IllegalResourceException.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/IllegalResourceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalResourceException.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 illegal resource definition in a component type
*
* @version $Rev$ $Date$
*/
-public class IllegalResourceException extends ProcessingException {
+public class IllegalResourceException extends IntrospectionException {
private static final long serialVersionUID = -1100936539412435579L;
public IllegalResourceException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalServiceDefinitionException.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/IllegalServiceDefinitionException.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/IllegalServiceDefinitionException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/IllegalServiceDefinitionException.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 illegal use of the {@link @org.osoa.sca.annotations.Service} annotation
*
* @version $Rev$ $Date$
*/
-public class IllegalServiceDefinitionException extends ProcessingException {
+public class IllegalServiceDefinitionException extends IntrospectionException {
private static final long serialVersionUID = -7151534258405092548L;
public IllegalServiceDefinitionException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InitProcessor.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/InitProcessor.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/InitProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InitProcessor.java Wed Apr 11 00:44:29 2007
@@ -23,7 +23,7 @@
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.osoa.sca.annotations.Init;
/**
@@ -33,8 +33,8 @@
* @version $Rev$ $Date$
*/
public class InitProcessor extends BaseJavaClassIntrospectorExtension {
-
- public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
+
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws IntrospectionException {
Init annotation = method.getAnnotation(Init.class);
if (annotation == null) {
return;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConstructorException.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/InvalidConstructorException.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/InvalidConstructorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConstructorException.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;
/**
* Denotes an invalid constructor definition, e.g. when the number of injection names specified in {@link
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public class InvalidConstructorException extends ProcessingException {
+public class InvalidConstructorException extends IntrospectionException {
private static final long serialVersionUID = 1411492435210741512L;
public InvalidConstructorException(String message) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConversationalImplementation.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/InvalidConversationalImplementation.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/InvalidConversationalImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/InvalidConversationalImplementation.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;
/**
* Raised when an implementation specifies improper conversational metadata
*
* @version $Rev$ $Date$
*/
-public class InvalidConversationalImplementation extends ProcessingException {
+public class InvalidConversationalImplementation extends IntrospectionException {
private static final long serialVersionUID = -5487291552769408149L;
public InvalidConversationalImplementation(String message) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org