You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/19 00:19:06 UTC
svn commit: r432747 [2/2] - in
/incubator/tuscany/java/sca/containers/container.spring/src:
main/java/org/apache/tuscany/container/spring/config/
main/java/org/apache/tuscany/container/spring/impl/
main/java/org/apache/tuscany/container/spring/model/ m...
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/intercept/OneWayAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/intercept/OneWayAdvisor.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/intercept/OneWayAdvisor.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/intercept/OneWayAdvisor.java Fri Aug 18 15:19:01 2006
@@ -26,62 +26,58 @@
import org.springframework.sca.metadata.ServiceMetadata;
/**
- * An AOP Alliance MethodInterceptor, rather than AspectJ aspect,
- * as there's no value in typed pointcuts. Oh, if it were only
- * annotations...
- * @author Rod Johnson
+ * An AOP Alliance MethodInterceptor, rather than AspectJ aspect, as there's no value in typed pointcuts. Oh, if it were
+ * only annotations...
*
+ * @author Rod Johnson
*/
public class OneWayAdvisor extends DefaultPointcutAdvisor {
-
- private TaskExecutor taskExecutor;
-
- private final ServiceMetadata smd;
-
- public OneWayAdvisor(final ServiceMetadata aSmd, TaskExecutor taskExecutor) {
- this.smd = aSmd;
- setPointcut(new StaticMethodMatcherPointcut() {
- public boolean matches(Method method, Class targetClass) {
- for (Method m : smd.getOneWayMethods()) {
- if (m.getName().equals(method.getName())) {
- return true;
- }
- }
- return false;
- }
- });
- setAdvice(new OneWayInterceptor());
- this.taskExecutor = taskExecutor;
- }
-
-
- private class OneWayInterceptor implements MethodInterceptor {
- public Object invoke(MethodInvocation mi) throws Throwable {
- try {
- // TODO this is not right
- ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) mi;
- final MethodInvocation clone = rmi.invocableClone();
- System.out.println("EXECUTE DEFERRED");
- taskExecutor.execute(new Runnable() {
- public void run() {
- try {
- clone.proceed();
- }
- catch (Throwable ex) {
- // TODO
- throw new UnsupportedOperationException();
- }
- }
- });
- }
- catch (Throwable t) {
- t.printStackTrace();
- }
- finally {
- return null;
- }
- }
- }
+
+ private TaskExecutor taskExecutor;
+
+ private final ServiceMetadata smd;
+
+ public OneWayAdvisor(final ServiceMetadata aSmd, TaskExecutor taskExecutor) {
+ this.smd = aSmd;
+ setPointcut(new StaticMethodMatcherPointcut() {
+ public boolean matches(Method method, Class targetClass) {
+ for (Method m : smd.getOneWayMethods()) {
+ if (m.getName().equals(method.getName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+ setAdvice(new OneWayInterceptor());
+ this.taskExecutor = taskExecutor;
+ }
+
+
+ private class OneWayInterceptor implements MethodInterceptor {
+ public Object invoke(MethodInvocation mi) throws Throwable {
+ try {
+ // TODO this is not right
+ ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) mi;
+ final MethodInvocation clone = rmi.invocableClone();
+ System.out.println("EXECUTE DEFERRED");
+ taskExecutor.execute(new Runnable() {
+ public void run() {
+ try {
+ clone.proceed();
+ } catch (Throwable ex) {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
+ }
+ });
+ } catch (Throwable t) {
+ t.printStackTrace();
+ } finally {
+ return null;
+ }
+ }
+ }
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/AnnotationServiceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/AnnotationServiceMetadata.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/AnnotationServiceMetadata.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/AnnotationServiceMetadata.java Fri Aug 18 15:19:01 2006
@@ -24,72 +24,73 @@
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Service;
+
import org.springframework.util.ReflectionUtils;
/**
* TODO not the way to get this
- * @author Rod Johnson
*
+ * @author Rod Johnson
*/
public class AnnotationServiceMetadata implements ServiceMetadata {
-
- private final String name;
-
- private final Class<?> serviceClass;
-
- public AnnotationServiceMetadata(String name, Class<?> serviceClass) throws NoSuchServiceException {
- if (!serviceClass.isAnnotationPresent(Service.class)) {
- throw new NoSuchServiceException();
- }
- this.name = name;
- this.serviceClass = serviceClass;
- }
-
- public String getServiceName() {
- return name;
- }
-
- public Class<?>[] getServiceInterfaces() {
- Service service = serviceClass.getAnnotation(Service.class);
- return service.interfaces();
- }
-
- public List<Method> getOneWayMethods() {
- List<Method> oneWayMethods = new LinkedList<Method>();
- for (Method m : serviceClass.getMethods()) {
- if (m.isAnnotationPresent(OneWay.class)) {
- oneWayMethods.add(m);
- }
- }
-
- // TODO fields
-
- return oneWayMethods;
- }
-
- public List<Injection> getInjections() {
- final List<Injection> injections = new LinkedList<Injection>();
- for (Method m : serviceClass.getMethods()) {
- if (m.isAnnotationPresent(Property.class)) {
- injections.add(new MethodInjection(m));
- }
- }
-
- // TODO fields propertly
-
- ReflectionUtils.doWithFields(serviceClass, new ReflectionUtils.FieldCallback() {
- public void doWith(Field f) throws IllegalArgumentException, IllegalAccessException {
- if (f.isAnnotationPresent(ComponentName.class)) {
- Injection componentNameInjection = new FieldInjection(f);
- componentNameInjection.setLiteralValue(name);
- injections.add(componentNameInjection);
- }
- }
- });
-
- return injections;
- }
-
- // TODO reference
+
+ private final String name;
+
+ private final Class<?> serviceClass;
+
+ public AnnotationServiceMetadata(String name, Class<?> serviceClass) throws NoSuchServiceException {
+ if (!serviceClass.isAnnotationPresent(Service.class)) {
+ throw new NoSuchServiceException();
+ }
+ this.name = name;
+ this.serviceClass = serviceClass;
+ }
+
+ public String getServiceName() {
+ return name;
+ }
+
+ public Class<?>[] getServiceInterfaces() {
+ Service service = serviceClass.getAnnotation(Service.class);
+ return service.interfaces();
+ }
+
+ public List<Method> getOneWayMethods() {
+ List<Method> oneWayMethods = new LinkedList<Method>();
+ for (Method m : serviceClass.getMethods()) {
+ if (m.isAnnotationPresent(OneWay.class)) {
+ oneWayMethods.add(m);
+ }
+ }
+
+ // TODO fields
+
+ return oneWayMethods;
+ }
+
+ public List<Injection> getInjections() {
+ final List<Injection> injections = new LinkedList<Injection>();
+ for (Method m : serviceClass.getMethods()) {
+ if (m.isAnnotationPresent(Property.class)) {
+ injections.add(new MethodInjection(m));
+ }
+ }
+
+ // TODO fields propertly
+
+ ReflectionUtils.doWithFields(serviceClass, new ReflectionUtils.FieldCallback() {
+ public void doWith(Field f) throws IllegalArgumentException, IllegalAccessException {
+ if (f.isAnnotationPresent(ComponentName.class)) {
+ Injection componentNameInjection = new FieldInjection(f);
+ componentNameInjection.setLiteralValue(name);
+ injections.add(componentNameInjection);
+ }
+ }
+ });
+
+ return injections;
+ }
+
+ // TODO reference
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/BeanFactoryDeploymentMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/BeanFactoryDeploymentMetadata.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/BeanFactoryDeploymentMetadata.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/BeanFactoryDeploymentMetadata.java Fri Aug 18 15:19:01 2006
@@ -24,32 +24,32 @@
import org.springframework.beans.factory.BeanFactoryAware;
/**
- * DeploymentMetadata implementation backed by Spring BeanFactory
- * metadata
+ * DeploymentMetadata implementation backed by Spring BeanFactory metadata
+ *
* @author Rod Johnson
*/
public class BeanFactoryDeploymentMetadata implements BeanFactoryAware, DeploymentMetadata {
-
- private BeanFactory beanFactory;
-
- private Map<String, ServiceMetadata> serviceNameToMetadataMap = new HashMap<String, ServiceMetadata>();
-
- public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
- this.beanFactory = beanFactory;
- }
-
-
- /* (non-Javadoc)
- * @see org.springframework.sca.metadata.DeploymentMetadata#getServiceMetadata(java.lang.String)
- */
- public synchronized ServiceMetadata getServiceMetadata(String serviceName) throws NoSuchServiceException {
- ServiceMetadata sm = serviceNameToMetadataMap.get(serviceName);
- if (sm == null) {
- Class clazz = beanFactory.getType(serviceName);
- sm = new AnnotationServiceMetadata(serviceName, clazz);
- serviceNameToMetadataMap.put(serviceName, sm);
- }
- return sm;
- }
-
+
+ private BeanFactory beanFactory;
+
+ private Map<String, ServiceMetadata> serviceNameToMetadataMap = new HashMap<String, ServiceMetadata>();
+
+ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+ this.beanFactory = beanFactory;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.springframework.sca.metadata.DeploymentMetadata#getServiceMetadata(java.lang.String)
+ */
+ public synchronized ServiceMetadata getServiceMetadata(String serviceName) throws NoSuchServiceException {
+ ServiceMetadata sm = serviceNameToMetadataMap.get(serviceName);
+ if (sm == null) {
+ Class clazz = beanFactory.getType(serviceName);
+ sm = new AnnotationServiceMetadata(serviceName, clazz);
+ serviceNameToMetadataMap.put(serviceName, sm);
+ }
+ return sm;
+ }
+
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/DeploymentMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/DeploymentMetadata.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/DeploymentMetadata.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/DeploymentMetadata.java Fri Aug 18 15:19:01 2006
@@ -18,11 +18,11 @@
/**
* Source of ServiceMetadata by name
+ *
* @author Rod Johnson
*/
public interface DeploymentMetadata {
- public abstract ServiceMetadata getServiceMetadata(String serviceName)
- throws NoSuchServiceException;
+ ServiceMetadata getServiceMetadata(String serviceName) throws NoSuchServiceException;
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/FieldInjection.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/FieldInjection.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/FieldInjection.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/FieldInjection.java Fri Aug 18 15:19:01 2006
@@ -20,54 +20,49 @@
import org.osoa.sca.annotations.Reference;
/**
- *
* @author Rod Johnson
- *
*/
public class FieldInjection extends Injection {
-
- private final Field field;
-
- public FieldInjection(Field field, String lookupName) {
- super(lookupName);
- this.field = field;
- }
-
- public FieldInjection(Field field) {
- Reference annotation = field.getAnnotation(Reference.class);
-
- this.field = field;
-
- if (annotation == null) {
- //throw new IllegalArgumentException("Field " + field + " not annotated");
- return;
- }
-
- if ("".equals(annotation.name())) {
- setLookupName(field.getName());
- }
- else {
- setLookupName(annotation.name());
- }
- }
-
- @Override
- protected void injectValue(Object target, Object value) {
- try {
- if (!field.isAccessible()) {
- field.setAccessible(true);
- }
- field.set(target, value);
- }
- catch (IllegalArgumentException ex) {
- // TODO
- throw new UnsupportedOperationException();
- }
- catch (IllegalAccessException ex) {
- // TODO
- ex.printStackTrace();
- throw new UnsupportedOperationException();
- }
- }
+
+ private final Field field;
+
+ public FieldInjection(Field field, String lookupName) {
+ super(lookupName);
+ this.field = field;
+ }
+
+ public FieldInjection(Field field) {
+ Reference annotation = field.getAnnotation(Reference.class);
+
+ this.field = field;
+
+ if (annotation == null) {
+ //throw new IllegalArgumentException("Field " + field + " not annotated");
+ return;
+ }
+
+ if ("".equals(annotation.name())) {
+ setLookupName(field.getName());
+ } else {
+ setLookupName(annotation.name());
+ }
+ }
+
+ @Override
+ protected void injectValue(Object target, Object value) {
+ try {
+ if (!field.isAccessible()) {
+ field.setAccessible(true);
+ }
+ field.set(target, value);
+ } catch (IllegalArgumentException ex) {
+ // TODO
+ throw new UnsupportedOperationException();
+ } catch (IllegalAccessException ex) {
+ // TODO
+ ex.printStackTrace();
+ throw new UnsupportedOperationException();
+ }
+ }
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/Injection.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/Injection.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/Injection.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/Injection.java Fri Aug 18 15:19:01 2006
@@ -18,61 +18,59 @@
import org.springframework.beans.factory.BeanFactory;
/**
- *
* @author Rod Johnson
- *
*/
public abstract class Injection {
- private String lookupName;
-
- /**
- *Is it a literal value?
- */
- private boolean literal;
-
- /**
- * Literal value if it's a literal
- */
- private Object literalValue;
-
- public Object getLiteralValue() {
- return literalValue;
- }
-
- public void setLiteralValue(Object literalValue) {
- this.literal = true;
- this.literalValue = literalValue;
- }
-
- protected Injection(String lookupName) {
- this.lookupName = lookupName;
- }
-
- protected Injection() {
-
- }
-
- public boolean isLiteral() {
- return literal;
- }
-
- protected void setLookupName(String lookupName) {
- this.lookupName = lookupName;
- }
-
- public String getLookupName() {
- return lookupName;
- }
-
- public void apply(BeanFactory owner, Object target) {
- Object value = literalValue;
- if (!isLiteral()) {
- value = owner.getBean(lookupName);
- }
- injectValue(target, value);
- }
-
- protected abstract void injectValue(Object target, Object value);
-
+ private String lookupName;
+
+ /**
+ * Is it a literal value?
+ */
+ private boolean literal;
+
+ /**
+ * Literal value if it's a literal
+ */
+ private Object literalValue;
+
+ protected Injection() {
+
+ }
+
+ protected Injection(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
+ public Object getLiteralValue() {
+ return literalValue;
+ }
+
+ public void setLiteralValue(Object literalValue) {
+ this.literal = true;
+ this.literalValue = literalValue;
+ }
+
+ public boolean isLiteral() {
+ return literal;
+ }
+
+ protected void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void apply(BeanFactory owner, Object target) {
+ Object value = literalValue;
+ if (!isLiteral()) {
+ value = owner.getBean(lookupName);
+ }
+ injectValue(target, value);
+ }
+
+ protected abstract void injectValue(Object target, Object value);
+
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/MethodInjection.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/MethodInjection.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/MethodInjection.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/MethodInjection.java Fri Aug 18 15:19:01 2006
@@ -19,54 +19,47 @@
import java.lang.reflect.Method;
import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
/**
- *
* @author Rod Johnson
- *
*/
public class MethodInjection extends Injection {
-
- private final Method method;
-
- public MethodInjection(Method method, String lookupName) {
- super(lookupName);
- this.method = method;
- }
-
- public MethodInjection(Method method) {
- // TODO reference also
- Property annotation = method.getAnnotation(Property.class);
- if (annotation == null) {
- throw new IllegalArgumentException("Method " + method + " not annotated");
- }
- this.method = method;
- if ("".equals(annotation.name())) {
- setLookupName(method.getName());
- }
- else {
- setLookupName(annotation.name());
- }
- }
- @Override
- protected void injectValue(Object target, Object value) {
- try {
- method.invoke(target, value);
- }
- catch (IllegalArgumentException ex) {
- // TODO
- throw new UnsupportedOperationException();
- }
- catch (IllegalAccessException ex) {
- // TODO
- throw new UnsupportedOperationException();
- }
- catch (InvocationTargetException ex) {
- // TODO
- throw new UnsupportedOperationException();
- }
- }
+ private final Method method;
+
+ public MethodInjection(Method method, String lookupName) {
+ super(lookupName);
+ this.method = method;
+ }
+
+ public MethodInjection(Method method) {
+ // TODO reference also
+ Property annotation = method.getAnnotation(Property.class);
+ if (annotation == null) {
+ throw new IllegalArgumentException("Method " + method + " not annotated");
+ }
+ this.method = method;
+ if ("".equals(annotation.name())) {
+ setLookupName(method.getName());
+ } else {
+ setLookupName(annotation.name());
+ }
+ }
+
+ @Override
+ protected void injectValue(Object target, Object value) {
+ try {
+ method.invoke(target, value);
+ } catch (IllegalArgumentException ex) {
+ // TODO
+ throw new UnsupportedOperationException();
+ } catch (IllegalAccessException ex) {
+ // TODO
+ throw new UnsupportedOperationException();
+ } catch (InvocationTargetException ex) {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
+ }
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/NoSuchServiceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/NoSuchServiceException.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/NoSuchServiceException.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/NoSuchServiceException.java Fri Aug 18 15:19:01 2006
@@ -17,9 +17,7 @@
package org.springframework.sca.metadata;
/**
- *
* @author Rod Johnson
- *
*/
public class NoSuchServiceException extends Exception {
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/ServiceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/ServiceMetadata.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/ServiceMetadata.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/springframework/sca/metadata/ServiceMetadata.java Fri Aug 18 15:19:01 2006
@@ -21,32 +21,36 @@
/**
* Metadata for an SCA component.
+ *
* @author Rod Johnson
*/
public interface ServiceMetadata {
-
- /**
- * Return the service name
- * @return the service name of the component
- */
- String getServiceName();
-
- /**
- * Return the service interfaces implemented by the component
- * @return interfaces implemented by the component
- */
- Class<?>[] getServiceInterfaces();
-
- /**
- * Return a list of OneWay methods
- * @return never returns null
- */
- List<Method> getOneWayMethods();
-
- /**
- * Return a list of SCA injections
- * @return a list of SCA injections. Never returns null.
- */
- List<Injection> getInjections();
+
+ /**
+ * Return the service name
+ *
+ * @return the service name of the component
+ */
+ String getServiceName();
+
+ /**
+ * Return the service interfaces implemented by the component
+ *
+ * @return interfaces implemented by the component
+ */
+ Class<?>[] getServiceInterfaces();
+
+ /**
+ * Return a list of OneWay methods
+ *
+ * @return never returns null
+ */
+ List<Method> getOneWayMethods();
+
+ /**
+ * Return a list of SCA injections
+ * @return a list of SCA injections. Never returns null.
+ */
+ List<Injection> getInjections();
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringConfigSchemaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringConfigSchemaTestCase.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringConfigSchemaTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringConfigSchemaTestCase.java Fri Aug 18 15:19:01 2006
@@ -19,15 +19,12 @@
package org.apache.tuscany.container.spring;
import junit.framework.TestCase;
-import org.springframework.sca.ScaServiceProxyFactoryBean;
-import org.springframework.sca.ScaServiceExporter;
-import org.apache.tuscany.container.spring.mock.TestBean;
-import org.apache.tuscany.container.spring.mock.TestReference;
import org.apache.tuscany.container.spring.config.ScaApplicationContext;
+import org.apache.tuscany.container.spring.mock.TestReference;
import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.Resource;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.sca.ScaServiceExporter;
+import org.springframework.sca.ScaServiceProxyFactoryBean;
/**
* Tests the SCA extensible schema elements for Spring's XML configuration files
@@ -41,20 +38,21 @@
public void setUp() {
applicationContext =
- new ScaApplicationContext(null, new ClassPathResource("org/apache/tuscany/container/spring/SpringConfigSchemaTest.xml"), null);
+ new ScaApplicationContext(null,
+ new ClassPathResource("org/apache/tuscany/container/spring/SpringConfigSchemaTest.xml"), null);
}
public void testSCAService() {
ScaServiceExporter service = (ScaServiceExporter) applicationContext.getBean("fooService");
- // FIXME andyp -- this is not really right.
+ // FIXME andyp -- this is not really right.
// TestBean service = (TestBean) applicationContext.getBean("fooService");
// assertEquals("call me", service.echo("call me"));
}
public void testSCAReference() {
- ScaServiceProxyFactoryBean pf = (ScaServiceProxyFactoryBean) applicationContext.getBean("&fooReference");
- assertEquals("fooReference", pf.getReferenceName());
- TestReference ref = (TestReference) applicationContext.getBean("fooReference");
+ ScaServiceProxyFactoryBean pf = (ScaServiceProxyFactoryBean) applicationContext.getBean("&fooReference");
+ assertEquals("fooReference", pf.getReferenceName());
+ TestReference ref = (TestReference) applicationContext.getBean("fooReference");
// assertNotNull(ref);
}
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ReferenceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ReferenceInvocationTestCase.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ReferenceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ReferenceInvocationTestCase.java Fri Aug 18 15:19:01 2006
@@ -30,9 +30,8 @@
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.StaticApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.StaticApplicationContext;
/**
* Verifies wiring from a Spring bean to an SCA composite reference
Modified: incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java?rev=432747&r1=432746&r2=432747&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java Fri Aug 18 15:19:01 2006
@@ -31,9 +31,8 @@
import org.apache.tuscany.test.ArtifactFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.StaticApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.StaticApplicationContext;
/**
* Tests a simple invocation through a service to a Spring bean
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org