Author: antelder
Date: Fri May 1 16:27:54 2009
New Revision: 770744
URL: http://svn.apache.org/viewvc?rev=770744&view=rev
Log:
Compelete a bit more of the spring impl refactor - only 2 itests left failing
now!
Modified:
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
Modified:
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java?rev=770744&r1=770743&r2=770744&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
(original)
+++
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
Fri May 1 16:27:54 2009
@@ -30,6 +30,7 @@
import
org.apache.tuscany.sca.implementation.spring.processor.PropertyAnnotationProcessor;
import
org.apache.tuscany.sca.implementation.spring.processor.PropertyValueStub;
import
org.apache.tuscany.sca.implementation.spring.processor.ReferenceAnnotationProcessor;
+import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanPostProcessor;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -55,9 +56,9 @@
private SpringImplementationStub implementation;
public SpringContextTie(SpringImplementationStub implementation, URL
resource) {
+ this.implementation = implementation;
SCAParentApplicationContext scaParentContext = new
SCAParentApplicationContext(implementation);
springContext = createApplicationContext(scaParentContext, resource);
- this.implementation = implementation;
}
public void start() {
@@ -130,12 +131,9 @@
return appContext;
}
-// public Object getBean(String id) throws SpringInvocationException {
-// try {
-// return springContext.getBean(beanElement.getId());
-// } catch (BeansException e) {
-// throw new SpringInvocationException(e);
-// }
+ public Object getBean(String id) throws BeansException {
+ return springContext.getBean(id);
+ }
/**
* Include BeanPostProcessor to deal with SCA Annotations in Spring Bean
@@ -147,12 +145,12 @@
beanFactory.addBeanPostProcessor(initDestroyProcessor);
// Processor to deal with @Reference SCA Annotations
- ComponentStub component = new
ComponentStub(implementation.getComponentStub());
+ ComponentStub component = new
ComponentStub(implementation.getComponentTie());
BeanPostProcessor referenceProcessor = new
ReferenceAnnotationProcessor(component);
beanFactory.addBeanPostProcessor(referenceProcessor);
// Processor to deal with @Property SCA Annotations
- PropertyValueStub pvs = new
PropertyValueStub(implementation.getPropertyValueStub());
+ PropertyValueStub pvs = new
PropertyValueStub(implementation.getPropertyValueTie());
BeanPostProcessor propertyProcessor = new
PropertyAnnotationProcessor(pvs);
beanFactory.addBeanPostProcessor(propertyProcessor);
Modified:
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java?rev=770744&r1=770743&r2=770744&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
(original)
+++
tuscany/java/sca/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
Fri May 1 16:27:54 2009
@@ -37,8 +37,8 @@
Method getURI;
Method getBean;
Method getComponentName;
- Method getComponentStub;
- Method getPropertyValueStub;
+ Method getComponentTie;
+ Method getPropertyValueTie;
public SpringImplementationStub(Object tie) {
this.tie = tie;
@@ -47,8 +47,8 @@
getURI = tieClass.getMethod("getURI", new Class<?>[]{});
getBean = tieClass.getMethod("getBean", new
Class<?>[]{String.class, Class.class});
getComponentName = tieClass.getMethod("getComponentName");
- getComponentStub = tieClass.getMethod("getComponentStub");
- getPropertyValueStub = tieClass.getMethod("getPropertyValueStub");
+ getComponentTie = tieClass.getMethod("getComponentTie");
+ getPropertyValueTie = tieClass.getMethod("getPropertyValueTie");
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -95,20 +95,20 @@
}
}
- public Object getComponentStub() {
+ public Object getComponentTie() {
try {
- return (String)getComponentStub.invoke(tie);
+ return getComponentTie.invoke(tie);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
- public Object getPropertyValueStub() {
+ public Object getPropertyValueTie() {
try {
- return (String)getPropertyValueStub.invoke(tie);
+ return getPropertyValueTie.invoke(tie);
} catch (Exception e) {
throw new RuntimeException(e);
