You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/10/13 04:31:49 UTC
svn commit: r703904 - in /tuscany/java/sca: itest/spring/
modules/core-spring/
modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/
modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/...
Author: lresende
Date: Sun Oct 12 19:31:48 2008
New Revision: 703904
URL: http://svn.apache.org/viewvc?rev=703904&view=rev
Log:
TUSCANY-2613 - Upgrading Spring version to 2.5.5. Thanks for the patch Ram.
Modified:
tuscany/java/sca/itest/spring/pom.xml
tuscany/java/sca/modules/core-spring/pom.xml
tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
tuscany/java/sca/modules/implementation-spring/pom.xml
tuscany/java/sca/samples/spring-bigbank-stockquote/pom.xml
Modified: tuscany/java/sca/itest/spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/spring/pom.xml?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/itest/spring/pom.xml (original)
+++ tuscany/java/sca/itest/spring/pom.xml Sun Oct 12 19:31:48 2008
@@ -55,26 +55,5 @@
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
- <!-- Spring dependencies... -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.8</version>
- </dependency>
-
-
</dependencies>
</project>
Modified: tuscany/java/sca/modules/core-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spring/pom.xml?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spring/pom.xml (original)
+++ tuscany/java/sca/modules/core-spring/pom.xml Sun Oct 12 19:31:48 2008
@@ -51,19 +51,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java (original)
+++ tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java Sun Oct 12 19:31:48 2008
@@ -31,7 +31,8 @@
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.ChildBeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
/**
* An implementation of the SCA assembly Component interface backed by a Spring
@@ -39,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class BeanComponentImpl extends ChildBeanDefinition implements Component, Cloneable {
+public class BeanComponentImpl extends GenericBeanDefinition implements Component, Cloneable {
private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
public IntentAttachPointType getType() {
@@ -66,25 +67,29 @@
private BeanDefinitionRegistry beanRegistry;
protected BeanComponentImpl(BeanDefinitionRegistry beanRegistry) {
- super((String)"");
+ //super((String)"");
this.beanRegistry = beanRegistry;
}
@Override
- public Object clone() throws CloneNotSupportedException {
- BeanComponentImpl clone = (BeanComponentImpl)super.clone();
-
+ public AbstractBeanDefinition cloneBeanDefinition() {
+ BeanComponentImpl clone = (BeanComponentImpl)super.cloneBeanDefinition();
clone.getProperties().clear();
- for (ComponentProperty property : getProperties()) {
- clone.getProperties().add((ComponentProperty)property.clone());
- }
- clone.getReferences().clear();
- for (ComponentReference reference : getReferences()) {
- clone.getReferences().add((ComponentReference)reference.clone());
- }
- clone.getServices().clear();
- for (ComponentService service : getServices()) {
- clone.getServices().add((ComponentService)service.clone());
+ try {
+ for (ComponentProperty property : getProperties()) {
+ clone.getProperties().add((ComponentProperty)property.clone());
+ }
+ clone.getReferences().clear();
+ for (ComponentReference reference : getReferences()) {
+ clone.getReferences().add((ComponentReference)reference.clone());
+ }
+ clone.getServices().clear();
+ for (ComponentService service : getServices()) {
+ clone.getServices().add((ComponentService)service.clone());
+ }
+ return clone;
+ } catch (CloneNotSupportedException e) {
+ //throw new CloneNotSupportedException(e.getMessage());
}
return clone;
}
Modified: tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java (original)
+++ tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java Sun Oct 12 19:31:48 2008
@@ -31,7 +31,8 @@
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
/**
* An implementation of the SCA assembly JavaImplementation interface backed by a Spring
@@ -39,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class BeanBaseJavaImplementationImpl extends RootBeanDefinition implements BaseJavaImplementation, Cloneable {
+public class BeanBaseJavaImplementationImpl extends GenericBeanDefinition implements BaseJavaImplementation, Cloneable {
private static final long serialVersionUID = 1L;
private List<Service> services = new ArrayList<Service>();
@@ -65,20 +66,24 @@
}
@Override
- public Object clone() throws CloneNotSupportedException {
- BeanBaseJavaImplementationImpl clone = (BeanBaseJavaImplementationImpl)super.clone();
-
+ public AbstractBeanDefinition cloneBeanDefinition() {
+ BeanBaseJavaImplementationImpl clone = (BeanBaseJavaImplementationImpl)super.cloneBeanDefinition();
clone.getServices().clear();
- for (Service service : getServices()) {
- clone.getServices().add((Service)service.clone());
- }
- clone.getReferences().clear();
- for (Reference reference : getReferences()) {
- clone.getReferences().add((Reference)reference.clone());
- }
- clone.getProperties().clear();
- for (Property property : getProperties()) {
- clone.getProperties().add((Property)property.clone());
+ try {
+ for (Service service : getServices()) {
+ clone.getServices().add((Service)service.clone());
+ }
+ clone.getReferences().clear();
+ for (Reference reference : getReferences()) {
+ clone.getReferences().add((Reference)reference.clone());
+ }
+ clone.getProperties().clear();
+ for (Property property : getProperties()) {
+ clone.getProperties().add((Property)property.clone());
+ }
+ return clone;
+ } catch (CloneNotSupportedException e) {
+ //throw new CloneNotSupportedException(e.getMessage());
}
return clone;
}
Modified: tuscany/java/sca/modules/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/pom.xml?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-spring/pom.xml Sun Oct 12 19:31:48 2008
@@ -87,19 +87,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.8</version>
+ <version>2.5.5</version>
</dependency>
</dependencies>
Modified: tuscany/java/sca/samples/spring-bigbank-stockquote/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/spring-bigbank-stockquote/pom.xml?rev=703904&r1=703903&r2=703904&view=diff
==============================================================================
--- tuscany/java/sca/samples/spring-bigbank-stockquote/pom.xml (original)
+++ tuscany/java/sca/samples/spring-bigbank-stockquote/pom.xml Sun Oct 12 19:31:48 2008
@@ -83,26 +83,6 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
-
- <!-- Spring dependencies... -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.8</version>
- </dependency>
-
</dependencies>
<build>