Author: ramkumar
Date: Wed May 6 12:00:40 2009
New Revision: 772162
URL: http://svn.apache.org/viewvc?rev=772162&view=rev
Log:
Refactoring Spring module
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java?rev=772162&r1=772161&r2=772162&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
Wed May 6 12:00:40 2009
@@ -22,12 +22,12 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
-import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import
org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
import org.apache.tuscany.sca.implementation.java.IntrospectionException;
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import
org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
+import
org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
import
org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;
import
org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java?rev=772162&r1=772161&r2=772162&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
Wed May 6 12:00:40 2009
@@ -18,11 +18,11 @@
*/
package org.apache.tuscany.sca.implementation.spring.introspect;
-import static
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllInterfaces;
-import static
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllPublicAndProtectedFields;
-import static
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
-import static
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getPrivateFields;
-import static
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.toPropertyName;
+import static
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllInterfaces;
+import static
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllPublicAndProtectedFields;
+import static
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
+import static
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getPrivateFields;
+import static
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.toPropertyName;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
@@ -44,14 +44,14 @@
import org.apache.tuscany.sca.assembly.Contract;
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaParameterImpl;
-import
org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
-import
org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
+import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
+import
org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
+import
org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
import
org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException;
-import
org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidServiceTypeException;
+import
org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidServiceType;
import
org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException;
import org.apache.tuscany.sca.implementation.java.introspect.impl.Resource;
import
org.apache.tuscany.sca.implementation.spring.SpringConstructorArgElement;
@@ -61,11 +61,11 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Remotable;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Remotable;
/**
* Heuristically evaluates an un-annotated Java implementation type to
determine
@@ -106,7 +106,7 @@
* interfaces is remotable, then by default the implementation
offers a single service whose type
* is the implementation class.
*/
- Set<Class<?>> interfaces = getAllInterfaces(clazz);
+ Set<Class> interfaces = getAllInterfaces(clazz);
for (Class<?> i : interfaces) {
if (i.isAnnotationPresent(Remotable.class) ||
i.isAnnotationPresent(WebService.class)) {
addService(type, i);
@@ -287,7 +287,7 @@
Constructor constructor;
boolean explict = false;
if (definition != null && definition.getConstructor()
-
.isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) {
+ .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) {
// the constructor was already defined explicitly
return;
} else if (definition != null) {
@@ -599,7 +599,7 @@
// FIXME: This part seems to have already been taken care above!!
try {
processCallback(paramType, reference);
- } catch (InvalidServiceTypeException e) {
+ } catch (InvalidServiceType e) {
throw new IntrospectionException(e);
}
return reference;
@@ -625,7 +625,7 @@
return service;
}
- public void processCallback(Class<?> interfaze, Contract contract) throws
InvalidServiceTypeException {
+ public void processCallback(Class<?> interfaze, Contract contract) throws
InvalidServiceType {
Callback callback = interfaze.getAnnotation(Callback.class);
if (callback != null && !Void.class.equals(callback.value())) {
Class<?> callbackClass = callback.value();
@@ -634,10 +634,10 @@
javaInterface = javaFactory.createJavaInterface(callbackClass);
contract.getInterfaceContract().setCallbackInterface(javaInterface);
} catch (InvalidInterfaceException e) {
- throw new InvalidServiceTypeException("Invalid callback
interface "+callbackClass, interfaze);
+ throw new InvalidServiceType("Invalid callback interface
"+callbackClass, interfaze);
}
} else if (callback != null && Void.class.equals(callback.value())) {
- throw new InvalidServiceTypeException("No callback interface
specified on annotation", interfaze);
+ throw new InvalidServiceType("No callback interface specified on
annotation", interfaze);
}
}
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java?rev=772162&r1=772161&r2=772162&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
Wed May 6 12:00:40 2009
@@ -46,12 +46,12 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaParameterImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
import org.apache.tuscany.sca.implementation.spring.SpringBeanElement;
import
org.apache.tuscany.sca.implementation.spring.SpringConstructorArgElement;
import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java?rev=772162&r1=772161&r2=772162&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
Wed May 6 12:00:40 2009
@@ -28,14 +28,15 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
import
org.apache.tuscany.sca.implementation.spring.introspect.SpringXMLComponentTypeLoader;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
@@ -54,20 +55,20 @@
private static final String LOCATION = "location";
private static final String IMPLEMENTATION_SPRING =
"implementation.spring";
- private static final QName IMPLEMENTATION_SPRING_QNAME = new
QName(Constants.SCA11_NS, IMPLEMENTATION_SPRING);
+ private static final QName IMPLEMENTATION_SPRING_QNAME = new
QName(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
private static final String MSG_LOCATION_MISSING = "Reading
implementation.spring - location attribute missing";
private AssemblyFactory assemblyFactory;
private JavaInterfaceFactory javaFactory;
private PolicyFactory policyFactory;
- private PolicySubjectProcessor policyProcessor;
+ private PolicyAttachPointProcessor policyProcessor;
private Monitor monitor;
- public SpringImplementationProcessor(FactoryExtensionPoint modelFactories,
Monitor monitor) {
+ public SpringImplementationProcessor(ModelFactoryExtensionPoint
modelFactories, Monitor monitor) {
this.assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
this.javaFactory =
modelFactories.getFactory(JavaInterfaceFactory.class);
this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
- this.policyProcessor = new PolicySubjectProcessor(policyFactory);
+ this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.monitor = monitor;
}
@@ -80,7 +81,7 @@
*/
private void error(String message, Object model, Exception ex) {
if (monitor != null) {
- Problem problem =
monitor.createProblem(this.getClass().getName(),
"impl-spring-validation-messages", Severity.ERROR, model, message, ex);
+ Problem problem = new ProblemImpl(this.getClass().getName(),
"impl-spring-validation-messages", Severity.ERROR, model, message, ex);
monitor.problem(problem);
}
}
@@ -94,7 +95,7 @@
*/
private void error(String message, Object model, Object...
messageParameters) {
if (monitor != null) {
- Problem problem =
monitor.createProblem(this.getClass().getName(),
"impl-spring-validation-messages", Severity.ERROR, model, message,
(Object[])messageParameters);
+ Problem problem = new ProblemImpl(this.getClass().getName(),
"impl-spring-validation-messages", Severity.ERROR, model, message,
(Object[])messageParameters);
monitor.problem(problem);
}
}
@@ -170,7 +171,7 @@
// Write <implementation.spring>
policyProcessor.writePolicyPrefixes(springImplementation, writer);
- writer.writeStartElement(Constants.SCA11_NS, IMPLEMENTATION_SPRING);
+ writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
policyProcessor.writePolicyAttributes(springImplementation, writer);
if (springImplementation.getLocation() != null) {
