Moving 1.x branches

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

29 files changed, 0 insertions, 2167 deletions

diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
deleted file mode 100644
index 94bd5c8cf2..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.core.spring.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.AbstractService;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.Wire;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An alternate implementation of the SCA assembly model factory that creates SCA
- * assembly model objects backed by Spring bean definitions.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanAssemblyFactory implements AssemblyFactory {
-    private AssemblyFactory defaultFactory;
-    private BeanDefinitionRegistry beanRegistry;
-
-    public BeanAssemblyFactory(AssemblyFactory defaultFactory, BeanDefinitionRegistry beanRegistry) {
-        this.defaultFactory = defaultFactory;
-        this.beanRegistry = beanRegistry;
-    }
-
-    public BeanAssemblyFactory(BeanDefinitionRegistry beanRegistry) {
-        this(new DefaultAssemblyFactory(), beanRegistry);
-    }
-
-    public AbstractProperty createAbstractProperty() {
-        return defaultFactory.createAbstractProperty();
-    }
-
-    public AbstractReference createAbstractReference() {
-        return defaultFactory.createAbstractReference();
-    }
-
-    public AbstractService createAbstractService() {
-        return defaultFactory.createAbstractService();
-    }
-
-    public Callback createCallback() {
-        return defaultFactory.createCallback();
-    }
-
-    public Component createComponent() {
-        return new BeanComponentImpl(beanRegistry);
-    }
-
-    public ComponentProperty createComponentProperty() {
-        return defaultFactory.createComponentProperty();
-    }
-
-    public ComponentReference createComponentReference() {
-        return defaultFactory.createComponentReference();
-    }
-
-    public ComponentService createComponentService() {
-        return defaultFactory.createComponentService();
-    }
-
-    public ComponentType createComponentType() {
-        return defaultFactory.createComponentType();
-    }
-
-    public Composite createComposite() {
-        return defaultFactory.createComposite();
-    }
-
-    public CompositeReference createCompositeReference() {
-        return defaultFactory.createCompositeReference();
-    }
-
-    public CompositeService createCompositeService() {
-        return defaultFactory.createCompositeService();
-    }
-
-    public ConstrainingType createConstrainingType() {
-        return defaultFactory.createConstrainingType();
-    }
-
-    public Property createProperty() {
-        return defaultFactory.createProperty();
-    }
-
-    public Reference createReference() {
-        return defaultFactory.createReference();
-    }
-
-    public Service createService() {
-        return defaultFactory.createService();
-    }
-
-    public Wire createWire() {
-        return defaultFactory.createWire();
-    }
-
-    public ConfiguredOperation createConfiguredOperation() {
-        return defaultFactory.createConfiguredOperation();
-    }
-    
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
deleted file mode 100644
index 2c27a5c6d5..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * 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.core.spring.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.policy.Intent;
-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;
-
-/**
- * An implementation of the SCA assembly Component interface backed by a Spring
- * Bean definition.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanComponentImpl extends ChildBeanDefinition implements Component, Cloneable {
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    public IntentAttachPointType getType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        // TODO Auto-generated method stub
-
-    }
-
-    private static final long serialVersionUID = 1L;
-
-    private ConstrainingType constrainingType;
-    private Implementation implementation;
-    private String name;
-    private String uri;
-    private List<ComponentService> services = new ArrayList<ComponentService>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Object> extensions = new ArrayList<Object>();
-    private boolean unresolved = false;
-    private BeanDefinitionRegistry beanRegistry;
-
-    protected BeanComponentImpl(BeanDefinitionRegistry beanRegistry) {
-        super((String)"");
-        this.beanRegistry = beanRegistry;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        BeanComponentImpl clone = (BeanComponentImpl)super.clone();
-
-        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());
-        }
-        return clone;
-    }
-
-    @Override
-    public String getParentName() {
-        //TODO find a better name for bean definitions representing component types
-        return String.valueOf(System.identityHashCode(implementation));
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    public Implementation getImplementation() {
-        return implementation;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-
-        // Register this bean definition in the bean registry
-        this.beanRegistry.registerBeanDefinition(uri, this);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    //TODO use a better list implementation
-    private List<ComponentProperty> properties = new ArrayList<ComponentProperty>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a property
-        @Override
-        public boolean add(ComponentProperty property) {
-
-            // Add corresponding bean property value
-            getPropertyValues().addPropertyValue(property.getName(), property.getValue());
-
-            return super.add(property);
-        }
-    };
-
-    public List<ComponentProperty> getProperties() {
-        return properties;
-    }
-
-    //TODO use a better list implementation
-    private List<ComponentReference> references = new ArrayList<ComponentReference>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a reference
-        @Override
-        public boolean add(ComponentReference reference) {
-
-            // Add corresponding bean property value
-            if (!reference.getName().startsWith("$self$.")) {
-                BeanReferenceImpl beanReference = new BeanReferenceImpl(reference);
-                getPropertyValues().addPropertyValue(reference.getName(), beanReference);
-            }
-            return super.add(reference);
-        }
-    };
-
-    public List<ComponentReference> getReferences() {
-        return references;
-    }
-
-    public List<ComponentService> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public void setImplementation(Implementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public boolean isAutowire() {
-        return super.getAutowireMode() == AUTOWIRE_BY_TYPE;
-    }
-
-    public Boolean getAutowire() {
-        int autowire = super.getAutowireMode();
-        if (autowire == AUTOWIRE_BY_TYPE) {
-            return Boolean.TRUE;
-        } else if (autowire == AUTOWIRE_NO) {
-            return Boolean.FALSE;
-        } else {
-            return null;
-        }
-    }
-
-    public void setAutowire(Boolean autowire) {
-        super.setAutowireMode(autowire ? AUTOWIRE_BY_TYPE : AUTOWIRE_NO);
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
deleted file mode 100644
index 7b747372b4..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.core.spring.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-
-/**
- * An implementation of RuntimeBeanReference wrapping an SCA assembly
- * Reference
- * 
- * @version $Rev$ $Date$
- */
-public class BeanReferenceImpl extends RuntimeBeanReference {
-    private Reference reference;
-
-    protected BeanReferenceImpl(Reference reference) {
-        super("temp");
-        this.reference = reference;
-    }
-
-    @Override
-    public String getBeanName() {
-        SCABinding binding = reference.getBinding(SCABinding.class);
-        String name = binding.getURI();
-        if (name.startsWith("/")) {
-            name = name.substring(1);
-        }
-        int s = name.lastIndexOf('/');
-        if (s != -1) {
-            name = name.substring(0, s);
-        }
-        return name;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this != other) {
-            if (other instanceof RuntimeBeanReference) {
-                RuntimeBeanReference br = (RuntimeBeanReference)other;
-                return (getBeanName().equals(br.getBeanName()) && this.isToParent() == br.isToParent());
-            } else
-                return false;
-        } else
-            return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return getBeanName().hashCode() * 29 + (this.isToParent() ? 1 : 0);
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
deleted file mode 100644
index b275bfa9a7..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.core.spring.context;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * A default implementation of an artifact resolver, based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class ModelResolverImpl implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    private WeakReference<ClassLoader> classLoader;
-    
-    public ModelResolverImpl(ClassLoader classLoader) {
-        this.classLoader = new WeakReference<ClassLoader>(classLoader);
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else if (unresolved instanceof ClassReference) {
-            
-            // Load a class on demand
-            ClassReference classReference = (ClassReference)unresolved;
-            Class clazz;
-            try {
-                clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
-            } catch (ClassNotFoundException e) {
-                
-                // Return the unresolved object
-                return unresolved;
-            }
-            
-            // Store a new ClassReference wrapping the loaded class
-            resolved = new ClassReference(clazz);
-            map.put(resolved, resolved);
-            
-            // Return the resolved ClassReference
-            return modelClass.cast(resolved);
-                
-        } else {
-            
-            // Return the unresolved object
-            return unresolved;
-        }
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
deleted file mode 100644
index 7855818904..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.core.spring.context;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.spring.assembly.impl.BeanAssemblyFactory;
-import org.apache.tuscany.sca.core.spring.implementation.java.impl.BeanJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ConversationProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ScopeProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-
-/**
- * A mini test runtime that uses the SCA assembly model variant implementation 
- * backed by Spring bean definitions.
- * 
- * @version $Rev$ $Date$
- */
-public class SCADomainContext {
-
-    private DefaultListableBeanFactory beanFactory;
-    
-    public SCADomainContext(String... compositeFiles) {
-
-        // Create Spring bean factory
-        beanFactory = new DefaultListableBeanFactory();
-
-        // Create SCA assembly and SCA Java factories
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = new BeanAssemblyFactory(new DefaultAssemblyFactory(), beanFactory);
-        modelFactories.addFactory(assemblyFactory);
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        modelFactories.addFactory(javaFactory);
-        JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
-        modelFactories.addFactory(javaImplementationFactory);
-        
-        BaseJavaClassVisitor[] extensions = new BaseJavaClassVisitor[] {
-            new ConstructorProcessor(assemblyFactory),
-            new AllowsPassByReferenceProcessor(assemblyFactory),
-            new ComponentNameProcessor(assemblyFactory),
-            new ContextProcessor(assemblyFactory),
-            new ConversationProcessor(assemblyFactory),
-            new DestroyProcessor(assemblyFactory),
-            new EagerInitProcessor(assemblyFactory),
-            new InitProcessor(assemblyFactory),
-            new PropertyProcessor(assemblyFactory),
-            new ReferenceProcessor(assemblyFactory, javaFactory),
-            new ResourceProcessor(assemblyFactory),
-            new ScopeProcessor(assemblyFactory),
-            new ServiceProcessor(assemblyFactory, javaFactory),
-            new HeuristicPojoProcessor(assemblyFactory, javaFactory),
-            new PolicyProcessor(assemblyFactory, policyFactory)
-        };
-        for (JavaClassVisitor e : extensions) {
-            javaImplementationFactory.addClassVisitor(e);
-        }
-
-        // Populate ArtifactProcessor registry
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        StAXArtifactProcessor<Composite> compositeProcessor = staxProcessors.getProcessor(Composite.class);
-        
-        // Create a resolver
-        //FIXME The ClassLoader should be passed in 
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        ModelResolverImpl resolver = new ModelResolverImpl(classLoader);
-
-        try {
-            XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-            
-            // Read the composite files
-            List<Composite> composites = new ArrayList<Composite>();
-            for (String compositeFile: compositeFiles) {
-                InputStream is = classLoader.getResourceAsStream(compositeFile);
-                XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-                Composite composite = compositeProcessor.read(reader);
-                resolver.addModel(composite);
-                composites.add(composite);
-            }
-            
-            for (Composite composite: composites) {
-                
-                // Resolve the composite
-                compositeProcessor.resolve(composite, resolver);
-            }
-            
-            // Wire the top level component's composite
-            buildComposite(composites.get(0), assemblyFactory, scaBindingFactory, mapper);
-            
-        } catch (ContributionException e) {
-            throw new RuntimeException(e);
-        } catch (CompositeBuilderException e) {
-            throw new RuntimeException(e);
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        } 
-    }
-    
-    private void buildComposite(Composite composite, AssemblyFactory assemblyFactory,
-                                SCABindingFactory scaBindingFactory, InterfaceContractMapper interfaceContractMapper) throws CompositeBuilderException {
-
-        Monitor monitor = new Monitor() {
-
-            public void problem(Problem problem) {
-                System.out.println("Composite assembly problem: " + problem.toString());
-            }
-            public List<Problem> getProblems() {
-                return null;
-            }
-        };
-
-        // Configure and wire the composite
-        CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), interfaceContractMapper, monitor);
-        compositeUtil.build(composite);
-
-    }
-
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        Object bean = beanFactory.getBean(serviceName);
-        return businessInterface.cast(bean);
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
deleted file mode 100644
index 9587a2b0ae..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.java.BaseJavaImplementation;
-import org.apache.tuscany.sca.policy.Intent;
-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;
-
-/**
- * An implementation of the SCA assembly JavaImplementation interface backed by a Spring
- * Bean definition.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanBaseJavaImplementationImpl extends RootBeanDefinition implements BaseJavaImplementation, Cloneable {
-    private static final long serialVersionUID = 1L;
-
-    private List<Service> services = new ArrayList<Service>();
-    private ConstrainingType constrainingType;
-    private List<Object> extensions = new ArrayList<Object>();
-    private boolean unresolved;
-    private BeanDefinitionRegistry beanRegistry;
-    private String uri;
-
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private List<ConfiguredOperation> configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private IntentAttachPointType type = null;
-
-    protected BeanBaseJavaImplementationImpl(BeanDefinitionRegistry beanRegistry) {
-        this.beanRegistry = beanRegistry;
-
-        // Register this bean definition in the bean registry
-        //TODO find a better name for bean definitions representing component types
-        String name = String.valueOf(System.identityHashCode(this));
-        this.beanRegistry.registerBeanDefinition(name, this);
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        BeanBaseJavaImplementationImpl clone = (BeanBaseJavaImplementationImpl)super.clone();
-
-        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());
-        }
-        return clone;
-    }
-
-    public Class<?> getJavaClass() {
-        return super.getBeanClass();
-    }
-
-    public String getName() {
-        return super.getBeanClassName();
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        super.setBeanClass(javaClass);
-    }
-
-    public void setName(String className) {
-        super.setBeanClassName(className);
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    //TODO use a better list implementation
-    private List<Property> properties = new ArrayList<Property>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a property
-        @Override
-        public boolean add(Property property) {
-
-            // Add corresponding bean property value
-            getPropertyValues().addPropertyValue(property.getName(), property.getValue());
-
-            return super.add(property);
-        }
-    };
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    //TODO use a better list implementation
-    private List<Reference> references = new ArrayList<Reference>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a reference
-        @Override
-        public boolean add(Reference reference) {
-
-            // Add corresponding bean property value
-            String target;
-            if (!reference.getTargets().isEmpty()) {
-                //TODO handle multiplicity
-                target = reference.getTargets().get(0).getName();
-                int i = target.indexOf('/');
-                if (i != -1)
-                    target = target.substring(0, i);
-            } else {
-                target = null;
-            }
-            getPropertyValues().addPropertyValue(reference.getName(), target);
-
-            return super.add(reference);
-        }
-    };
-
-
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
deleted file mode 100644
index 6b19bac413..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.impl.JavaClassIntrospectorImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An alternate implementation of the SCA Java assembly model factory that
- * creates SCA Java assembly model objects backed by Spring bean definitions.
- * 
- * @version $Rev$ $Date$
- */
-public class BeanJavaImplementationFactory implements JavaImplementationFactory {
-
-    private BeanDefinitionRegistry beanRegistry;
-    private List<JavaClassVisitor> visitors = new ArrayList<JavaClassVisitor>();
-    private JavaClassIntrospectorImpl introspector;
-
-    public BeanJavaImplementationFactory(BeanDefinitionRegistry beanRegistry) {
-        this.beanRegistry = beanRegistry;
-        introspector = new JavaClassIntrospectorImpl(visitors);
-    }
-
-    public JavaImplementation createJavaImplementation() {
-        return new BeanJavaImplementationImpl(beanRegistry);
-    }
-
-    public void createJavaImplementation(JavaImplementation javaImplementation, Class<?> implementationClass)
-        throws IntrospectionException {
-        introspector.introspectClass(javaImplementation, implementationClass);
-    }
-
-    public JavaImplementation createJavaImplementation(Class<?> implementationClass) throws IntrospectionException {
-        JavaImplementation javaImplementation = createJavaImplementation();
-        introspector.introspectClass(javaImplementation, implementationClass);
-        return javaImplementation;
-    }
-
-    public void addClassVisitor(JavaClassVisitor visitor) {
-        visitors.add(visitor);
-    }
-
-    public void removeClassVisitor(JavaClassVisitor visitor) {
-        visitors.remove(visitor);
-    }
-    
-    public List<JavaClassVisitor> getClassVisitors() {
-        return visitors;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
deleted file mode 100644
index 27dc7ec6c7..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An implementation of the SCA assembly JavaImplementation interface backed by a Spring
- * Bean definition.
- *
- * @version $Rev$ $Date$
- */
-public class BeanJavaImplementationImpl extends BeanBaseJavaImplementationImpl implements JavaImplementation {
-    private static final long serialVersionUID = 6792198458193774178L;
-    
-    private JavaConstructorImpl<?> constructorDefinition;
-    private Map<Constructor, JavaConstructorImpl> constructors = new HashMap<Constructor, JavaConstructorImpl>();
-    private Method initMethod;
-    private Method destroyMethod;
-    private final Map<String, JavaResourceImpl> resources = new HashMap<String, JavaResourceImpl>();
-    private final Map<String, JavaElementImpl> propertyMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, JavaElementImpl> referenceMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, Collection<JavaElementImpl>> callbackMembers = new HashMap<String, Collection<JavaElementImpl>>();
-    private List<Member> conversationIDMember = new ArrayList<Member>();
-    private boolean eagerInit;
-    private boolean allowsPassByReference;
-    private List<Method> allowsPassByReferenceMethods = new ArrayList<Method>();
-    private long maxAge = -1;
-    private long maxIdleTime = -1;
-    private JavaScopeImpl scope = JavaScopeImpl.STATELESS;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
-    
-    protected BeanJavaImplementationImpl(BeanDefinitionRegistry beanRegistry) {
-        super(beanRegistry);
-    }    
-
-    public JavaConstructorImpl<?> getConstructor() {
-        return constructorDefinition;
-    }
-
-    public void setConstructor(JavaConstructorImpl<?> definition) {
-        this.constructorDefinition = definition;
-    }
-
-    public Method getInitMethod() {
-        return initMethod;
-    }
-
-    public void setInitMethod(Method initMethod) {
-        this.initMethod = initMethod;
-    }
-
-    public Method getDestroyMethod() {
-        return destroyMethod;
-    }
-
-    public void setDestroyMethod(Method destroyMethod) {
-        this.destroyMethod = destroyMethod;
-    }
-
-    public Map<String, JavaResourceImpl> getResources() {
-        return resources;
-    }
-
-    public List<Member> getConversationIDMembers() {
-        return this.conversationIDMember;
-    }
-
-    public void addConversationIDMember(Member conversationIDMember) {
-        this.conversationIDMember.add(conversationIDMember);
-    }
-
-    public boolean isAllowsPassByReference() {
-        return allowsPassByReference;
-    }
-
-    public void setAllowsPassByReference(boolean allowsPassByReference) {
-        this.allowsPassByReference = allowsPassByReference;
-    }
-
-    public List<Method> getAllowsPassByReferenceMethods() {
-        return allowsPassByReferenceMethods;
-    }
-    
-    public boolean isAllowsPassByReference(Method method) {
-        return allowsPassByReference || allowsPassByReferenceMethods.contains(method);
-    }
-
-    public Map<Constructor, JavaConstructorImpl> getConstructors() {
-        return constructors;
-    }
-
-    public boolean isEagerInit() {
-        return eagerInit;
-    }
-
-    public void setEagerInit(boolean eagerInit) {
-        this.eagerInit = eagerInit;
-    }
-
-    public Map<String, Collection<JavaElementImpl>> getCallbackMembers() {
-        return callbackMembers;
-    }
-
-    public Map<String, JavaElementImpl> getPropertyMembers() {
-        return propertyMembers;
-    }
-
-    public Map<String, JavaElementImpl> getReferenceMembers() {
-        return referenceMembers;
-    }
-
-    public JavaScopeImpl getJavaScope() {
-        return scope;
-    }
-
-    public void setJavaScope(JavaScopeImpl scope) {
-        this.scope = scope;
-    }
-
-    public long getMaxAge() {
-        return maxAge;
-    }
-
-    public void setMaxAge(long maxAge) {
-        this.maxAge = maxAge;
-    }
-
-    public long getMaxIdleTime() {
-        return maxIdleTime;
-    }
-
-    public void setMaxIdleTime(long maxIdleTime) {
-        this.maxIdleTime = maxIdleTime;
-    }
-    
-    public Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames() {
-        return policyHandlerClassNames;
-    }
-
-    public void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
deleted file mode 100644
index 17a7e9084c..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceContractImpl;
-
-/**
- * An implementation of a Java interface contract. 
- *
- * @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceContractImpl extends JavaInterfaceContractImpl {
-    
-    protected BeanJavaInterfaceContractImpl() {
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
deleted file mode 100644
index 492ab2732e..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceIntrospectorImpl;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-
-/**
- * An alternate implementation of the SCA Java assembly model factory that creates SCA
- * Java assembly model objects backed by Spring bean definitions.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceFactory implements JavaInterfaceFactory {
-	
-    private List<JavaInterfaceVisitor> visitors = new ArrayList<JavaInterfaceVisitor>();
-    private JavaInterfaceIntrospectorImpl introspector;
-    
-        public BeanJavaInterfaceFactory() {
-            introspector = new JavaInterfaceIntrospectorImpl(this);
-        }
-
-	public JavaInterface createJavaInterface() {
-		return new BeanJavaInterfaceImpl();
-	}
-        
-        public JavaInterface createJavaInterface(Class<?> interfaceClass) throws InvalidInterfaceException {
-            JavaInterface javaInterface = createJavaInterface();
-            introspector.introspectInterface(javaInterface, interfaceClass);
-            return javaInterface;
-        }
-        
-        public void createJavaInterface(JavaInterface javaInterface, Class<?> interfaceClass) throws InvalidInterfaceException {
-            introspector.introspectInterface(javaInterface, interfaceClass);
-        }
-        
-        public JavaInterfaceContract createJavaInterfaceContract() {
-            return new BeanJavaInterfaceContractImpl();
-        }
-
-        public void addInterfaceVisitor(JavaInterfaceVisitor extension) {
-            visitors.add(extension);
-        }
-
-        public void removeInterfaceVisitor(JavaInterfaceVisitor extension) {
-            visitors.remove(extension);
-        }
-
-        public List<JavaInterfaceVisitor> getInterfaceVisitors() {
-            return visitors;
-        }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
deleted file mode 100644
index f3c84e900b..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceImpl;
-import org.apache.tuscany.sca.policy.Intent;
-
-/**
- * An alternate implementation of the SCA Java assembly model JavaInterface
- * interface.
- * 
- * @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceImpl extends JavaInterfaceImpl implements JavaInterface {
-
-    private String className;
-    private Class<?> javaClass;
-    private Class<?> callbackClass;
-    private boolean conversational;
-    private boolean remotable;
-    List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Operation> operations = new ArrayList<Operation>();
-    private boolean unresolved = false;
-    
-    protected BeanJavaInterfaceImpl() {
-    }
-
-    public String getName() {
-        if (isUnresolved()) {
-            return className;
-        }    
-        else {
-            return javaClass.getName();
-        }    
-    }
-
-    public void setName(String className) {
-        if (!isUnresolved())
-            throw new IllegalStateException();
-        this.className = className;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-    }
-
-    public Class<?> getCallbackClass() {
-        return callbackClass;
-    }
-
-    public void setCallbackClass(Class<?> callbackClass) {
-        this.callbackClass = callbackClass;
-    }
-
-    public boolean isConversational() {
-        return conversational;
-    }
-
-    public boolean isRemotable() {
-        return remotable;
-    }
-
-    public void setConversational(boolean conversational) {
-        this.conversational = conversational;
-    }
-
-    public void setRemotable(boolean local) {
-        this.remotable = local;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public List<Operation> getOperations() {
-        return operations;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    public void resetDataBinding(String dataBinding) {
-    }
-    
-    @Deprecated
-    public void setDefaultDataBinding(String dataBinding) {
-    }    
-
-    public boolean isDynamic() {
-        return false;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddService.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddService.java
deleted file mode 100644
index f3a24ed6b2..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 calculator;
-
-/**
- * The Add Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 61654ea811..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 calculator;
-
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Add service
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@EagerInit
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        return n1 + n2;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorClient.java
deleted file mode 100644
index 73aa028084..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 calculator;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * Calculator service and invoke it.
- *
- * @version $Rev$ $Date$
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomainContext context = new SCADomainContext("org/apache/tuscany/core/spring/Calculator.composite");
-
-        CalculatorService calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorService.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index e0cf23dc17..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 calculator;
-
-/**
- * The Calculator service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c1fceb575d..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Calculator service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideService.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 7c69b10b25..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 calculator;
-
-/**
- * The Divide Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index e1f35f99b5..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Divide service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyService.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 686542c18e..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 calculator;
-
-/**
- * The Multiply Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index d621407908..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Multiply service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
deleted file mode 100644
index e8e4a6f71b..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 calculator;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * Calculator service and invoke it.
- *
- * @version $Rev$ $Date$
- */
-public class NestedCalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomainContext context = new SCADomainContext(
-                                            "org/apache/tuscany/core/spring/OuterCalculator.composite",
-                                            "org/apache/tuscany/core/spring/InnerCalculator.composite",
-                                            "org/apache/tuscany/core/spring/InnerOperations.composite");
-
-        CalculatorService calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractService.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index 30632688f9..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 calculator;
-
-/**
- * The Subtract Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 4fed0a8c6a..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the subtract service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
deleted file mode 100644
index 44b447cc64..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.core.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-import calculator.CalculatorService;
-
-/**
- * This shows how to test the Calculator service component.
- *
- * @version $Rev$ $Date$
- */
-public class CalculatorTestCase extends TestCase {
-
-    private SCADomainContext context;
-    private CalculatorService calculatorService;
-
-    @Override
-    protected void setUp() throws Exception {
-        context = new SCADomainContext("org/apache/tuscany/sca/core/spring/Calculator.composite");
-
-        calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
deleted file mode 100644
index baf73ac197..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.core.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-import calculator.CalculatorService;
-
-/**
- * This shows how to test the Calculator service component.
- *
- * @version $Rev$ $Date$
- */
-public class NestedCalculatorTestCaseFIXME extends TestCase {
-
-    private SCADomainContext context;
-    private CalculatorService calculatorService;
-
-    @Override
-    protected void setUp() throws Exception {
-        context = new SCADomainContext(
-                          "org/apache/tuscany/sca/core/spring/OuterCalculator.composite",
-                          "org/apache/tuscany/sca/core/spring/InnerCalculator.composite",
-                          "org/apache/tuscany/sca/core/spring/InnerOperations.composite");
-
-        calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent/InnerCalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-
-    }
-}
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
deleted file mode 100644
index 6d998ba035..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://sample.calculator"
-	name="calc:TestBeanCalculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
deleted file mode 100644
index 8b043f2b4f..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="InnerCalculator">
-
-    <service name="CalculatorService" promote="InnerCalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="InnerCalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService"/>
-        <reference name="subtractService"/>
-        <reference name="multiplyService"/>
-        <reference name="divideService"/>
-    </component>
-
-	<reference name="addService" promote="InnerCalculatorServiceComponent/addService"/>
-	<reference name="subtractService" promote="InnerCalculatorServiceComponent/subtractService"/>
-	<reference name="multiplyService" promote="InnerCalculatorServiceComponent/multiplyService"/>
-	<reference name="divideService" promote="InnerCalculatorServiceComponent/divideService"/>
-
-</composite>
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
deleted file mode 100644
index d7d1124050..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="InnerOperations">
-
-    <service name="AddService" promote="AddServiceComponent">
-        <interface.java interface="calculator.AddService"/>
-    </service>
-
-    <service name="SubtractService" promote="SubtractServiceComponent">
-        <interface.java interface="calculator.SubtractService"/>
-    </service>
-
-    <service name="MultiplyService" promote="MultiplyServiceComponent">
-        <interface.java interface="calculator.MultiplyService"/>
-    </service>
-
-    <service name="DivideService" promote="DivideServiceComponent">
-        <interface.java interface="calculator.DivideService"/>
-    </service>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
deleted file mode 100644
index c2b6cced36..0000000000
--- a/branches/sca-java-1.3.2/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="OuterCalculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.composite name="calc:InnerCalculator"/>
-        <reference name="addService" target="OperationsServiceComponent/AddService"/>
-        <reference name="subtractService" target="OperationsServiceComponent/SubtractService"/>
-        <reference name="multiplyService" target="OperationsServiceComponent/MultiplyService"/>
-        <reference name="divideService" target="OperationsServiceComponent/DivideService"/>
-    </component>
-
-    <component name="OperationsServiceComponent">
-		<implementation.composite name="calc:InnerOperations"/>
-    </component>
-
-</composite>