tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r718181 - in /tuscany/branches/sca-equinox/modules: implementation-spring-runtime/META-INF/ implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ implementation-spring-runtime/src/main/java/org/apach...
Date Mon, 17 Nov 2008 07:07:28 GMT
Author: lresende
Date: Sun Nov 16 23:07:27 2008
New Revision: 718181

URL: http://svn.apache.org/viewvc?rev=718181&view=rev
Log:
Initial work to split implementation spring to follow the same pattern used in other modules (model/xml and runtime).

Added:
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory   (contents, props changed)
      - copied, changed from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/   (props changed)
      - copied from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/java/org/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/   (props changed)
      - copied from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/META-INF/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml   (props changed)
      - copied unchanged from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/   (props changed)
      - copied from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/org/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/   (props changed)
      - copied from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/spring/
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml   (props changed)
      - copied unchanged from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/test.xml
Removed:
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/java/org/
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/META-INF/
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/org/
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/spring/
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/resources/test.xml
Modified:
    tuscany/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java

Modified: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF?rev=718181&r1=718180&r2=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF Sun Nov 16 23:07:27 2008
@@ -1,21 +1,4 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.implementation.spring;uses:="or
- g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runtime,org.a
- pache.tuscany.sca.provider,org.springframework.context.support,org.sp
- ringframework.beans,org.apache.tuscany.sca.assembly.impl,org.springfr
- amework.beans.factory.config,org.apache.tuscany.sca.core,org.apache.t
- uscany.sca.policy,javax.xml.namespace,javax.xml.stream,org.apache.tus
- cany.sca.interfacedef.java.impl,org.apache.tuscany.sca.assembly.xml,o
- rg.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca.co
- re.factory,org.apache.tuscany.sca.core.invocation,org.springframework
- .beans.factory,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca
- .databinding.impl,org.springframework.core.io,org.springframework.bea
- ns.factory.xml,org.springframework.context,org.apache.tuscany.sca.imp
- lementation.java,org.apache.tuscany.sca.interfacedef.java,org.apache.
- tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.w3c.dom,o
- rg.apache.tuscany.sca.implementation.java.injection,org.apache.tuscan
- y.sca.invocation,org.apache.tuscany.sca.contribution.processor";versi
- on="1.4"
 Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
  ion="1.4",org.springframework.sca.xml;version="1.4"
 Tool: Bnd-0.0.255
@@ -44,7 +27,8 @@
  org.apache.tuscany.sca.databinding.impl;version="1.4",
  org.apache.tuscany.sca.implementation.java;version="1.4",
  org.apache.tuscany.sca.implementation.java.injection;version="1.4",
- org.apache.tuscany.sca.implementation.spring;version="1.4",
+ org.apache.tuscany.sca.implementation.spring,
+ org.apache.tuscany.sca.implementation.spring.xml,
  org.apache.tuscany.sca.interfacedef;version="1.4",
  org.apache.tuscany.sca.interfacedef.java;version="1.4",
  org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java Sun Nov 16 23:07:27 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java Sun Nov 16 23:07:27 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
 import org.springframework.beans.factory.xml.NamespaceHandler;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java Sun Nov 16 23:07:27 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import java.io.IOException;
 import java.util.List;
@@ -29,6 +29,7 @@
 import org.apache.tuscany.sca.core.factory.ObjectFactory;
 import org.apache.tuscany.sca.core.invocation.ProxyFactory;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.springframework.beans.BeansException;
@@ -54,7 +55,7 @@
  *
  * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
  */
-class SCAParentApplicationContext implements ApplicationContext {
+public class SCAParentApplicationContext implements ApplicationContext {
 
     // The Spring implementation for which this is the parent application context
     private SpringImplementation implementation;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java Sun Nov 16 23:07:27 2008
@@ -1,20 +1,22 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java Sun Nov 16 23:07:27 2008
@@ -1,20 +1,22 @@
 /*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java Sun Nov 16 23:07:27 2008
@@ -1,20 +1,22 @@
 /*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java Sun Nov 16 23:07:27 2008
@@ -1,20 +1,22 @@
 /*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.impl;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java Sun Nov 16 23:07:27 2008
@@ -17,10 +17,13 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.provider;
 
 import org.apache.tuscany.sca.core.invocation.ProxyFactory;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
+import org.apache.tuscany.sca.implementation.spring.impl.SCAApplicationContext;
+import org.apache.tuscany.sca.implementation.spring.impl.SCAParentApplicationContext;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.provider.ImplementationProvider;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java Sun Nov 16 23:07:27 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.provider;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
@@ -26,6 +26,7 @@
 import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java Sun Nov 16 23:07:27 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.provider;
 
 /**
  * @version $Rev$ $Date$

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java Sun Nov 16 23:07:27 2008
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.implementation.spring;
+package org.apache.tuscany.sca.implementation.spring.provider;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
 import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java:694855

Copied: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (from r713614, tuscany/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory?p2=tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory&p1=tuscany/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory&r1=713614&r2=718181&rev=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory Sun Nov 16 23:07:27 2008
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the implementation extension
-org.apache.tuscany.sca.implementation.spring.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation
+org.apache.tuscany.sca.implementation.spring.provider.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory:671193
+/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/java/org:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/java/org:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/resources/META-INF:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/resources/META-INF:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/resources/SpringHelloWorld-Imported-context.xml:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/resources/org:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/resources/org:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/resources/spring:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/resources/spring:694855

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: tuscany/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 23:07:27 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-spring/src/test/resources/test.xml:671193
+/tuscany/java/sca/modules/implementation-spring/src/test/resources/test.xml:694855

Modified: tuscany/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF?rev=718181&r1=718180&r2=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF Sun Nov 16 23:07:27 2008
@@ -1,21 +1,36 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.implementation.spring;uses:="or
- g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runtime,org.a
- pache.tuscany.sca.provider,org.springframework.context.support,org.sp
- ringframework.beans,org.apache.tuscany.sca.assembly.impl,org.springfr
- amework.beans.factory.config,org.apache.tuscany.sca.core,org.apache.t
- uscany.sca.policy,javax.xml.namespace,javax.xml.stream,org.apache.tus
- cany.sca.interfacedef.java.impl,org.apache.tuscany.sca.assembly.xml,o
- rg.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca.co
- re.factory,org.apache.tuscany.sca.core.invocation,org.springframework
- .beans.factory,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca
- .databinding.impl,org.springframework.core.io,org.springframework.bea
- ns.factory.xml,org.springframework.context,org.apache.tuscany.sca.imp
- lementation.java,org.apache.tuscany.sca.interfacedef.java,org.apache.
- tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.w3c.dom,o
- rg.apache.tuscany.sca.implementation.java.injection,org.apache.tuscan
- y.sca.invocation,org.apache.tuscany.sca.contribution.processor";versi
- on="1.4"
+Export-Package: org.apache.tuscany.sca.implementation.spring;version="1.4";
+  uses:="org.apache.tuscany.sca.databinding,
+   org.apache.tuscany.sca.runtime,
+   org.apache.tuscany.sca.provider,
+   org.springframework.context.support,
+   org.springframework.beans,
+   org.apache.tuscany.sca.assembly.impl,
+   org.springframework.beans.factory.config,
+   org.apache.tuscany.sca.core,
+   org.apache.tuscany.sca.policy,
+   javax.xml.namespace,
+   javax.xml.stream,
+   org.apache.tuscany.sca.interfacedef.java.impl,
+   org.apache.tuscany.sca.assembly.xml,
+   org.apache.tuscany.sca.contribution.resolver,
+   org.apache.tuscany.sca.core.factory,
+   org.apache.tuscany.sca.core.invocation,
+   org.springframework.beans.factory,
+   org.apache.tuscany.sca.assembly,
+   org.apache.tuscany.sca.databinding.impl,
+   org.springframework.core.io,
+   org.springframework.beans.factory.xml,
+   org.springframework.context,
+   org.apache.tuscany.sca.implementation.java,
+   org.apache.tuscany.sca.interfacedef.java,
+   org.apache.tuscany.sca.monitor,
+   org.apache.tuscany.sca.interfacedef,
+   org.w3c.dom,
+   org.apache.tuscany.sca.implementation.java.injection,
+   org.apache.tuscany.sca.invocation,
+   org.apache.tuscany.sca.contribution.processor",
+ org.apache.tuscany.sca.implementation.spring.xml
 Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers
  ion="1.4",org.springframework.sca.xml;version="1.4"
 Tool: Bnd-0.0.255

Modified: tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java?rev=718181&r1=718180&r2=718181&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java Sun Nov 16 23:07:27 2008
@@ -38,75 +38,75 @@
  */
 public class SpringImplementation extends ImplementationImpl implements Implementation, Extensible {
 
-    // The location attribute which points to the Spring application-context XML file
+    /** The location attribute which points to the Spring application-context XML file **/
     private String location;
-    // The application-context file as a Spring Resource
+    /** The application-context file as a Spring Resource **/
     private Resource resource;
+    /** **/
     private ComponentType componentType;
-    // Mapping of Services to Beans
+    /** Mapping of Services to Beans **/
     private Hashtable<String, SpringBeanElement> serviceMap;
-    // Mapping of property names to Java class
+    /** Mapping of property names to Java class **/
     private Hashtable<String, Class> propertyMap;
 
-    protected SpringImplementation() {
+    public SpringImplementation() {
         this.location = null;
         this.resource = null;
         setUnresolved(true);
         serviceMap = new Hashtable<String, SpringBeanElement>();
         propertyMap = new Hashtable<String, Class>();
-    } // end method SpringImplementation
+    }
+
 
-    /* Returns the location attribute for this Spring implementation */
+    /**
+     * Returns the location attribute for this Spring implementation
+     * @return URI for the location of the Spring implementation
+     */
     public String getLocation() {
         return location;
     }
 
     /**
      * Sets the location attribute for this Spring implementation
-     * location - a URI to the Spring application-context file
+     * @param location a URI to the Spring application-context file
      */
     public void setLocation(String location) {
         this.location = location;
         return;
     }
 
+    /**
+     * 
+     * @param resource
+     */
     public void setResource(Resource resource) {
         this.resource = resource;
     }
 
+    /**
+     * 
+     * @return
+     */
     public Resource getResource() {
         return resource;
     }
 
-    /* 
-     * Returns the componentType for this Spring implementation 
+    /**
+     * Returns the componentType for this Spring implementation
+     * @return
      */
     public ComponentType getComponentType() {
         return componentType;
     }
 
-    /*
+    /**
      * Sets the componentType for this Spring implementation
+     * @param componentType
      */
     public void setComponentType(ComponentType componentType) {
         this.componentType = componentType;
     }
 
-    @Override
-    public List<Service> getServices() {
-        return componentType.getServices();
-    }
-
-    @Override
-    public List<Reference> getReferences() {
-        return componentType.getReferences();
-    }
-
-    @Override
-    public List<Property> getProperties() {
-        return componentType.getProperties();
-    }
-
     /**
      * Returns the Spring Bean which implements a particular service
      * @param service the service
@@ -136,7 +136,7 @@
             return;
         propertyMap.put(propertyName, propertyClass);
         return;
-    } // end method setPropertyClass
+    }
 
     /**
      * Gets the Java Class for an SCA property 
@@ -145,5 +145,20 @@
      */
     public Class getPropertyClass(String propertyName) {
         return propertyMap.get(propertyName);
-    } // end method getPropertyClass
+    }
+
+    @Override
+    public List<Service> getServices() {
+        return componentType.getServices();
+    }
+
+    @Override
+    public List<Reference> getReferences() {
+        return componentType.getReferences();
+    }
+
+    @Override
+    public List<Property> getProperties() {
+        return componentType.getProperties();
+    }
 }



Mime
View raw message