Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 61b707b1e1..bee0e462fc 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
@@ -44,7 +44,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
     // The location attribute which points to the Spring application-context XML file

     private String location;

     // The application-context file as a Spring Resource

-    private List<URL> resource;

+    private URL resource;

     private ComponentType componentType;

     // Mapping of Services to Beans

     private Hashtable<String, SpringBeanElement> serviceMap;

@@ -78,11 +78,11 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
         return;

     }

 

-    public void setResource(List<URL> resource) {

+    public void setResource(URL resource) {

         this.resource = resource;

     }

 

-    public List<URL> getResource() {

+    public URL getResource() {

         return resource;

     }