Moving 1.x branches

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

11 files changed, 0 insertions, 1279 deletions

diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
deleted file mode 100644
index 5b04d9e363..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ /dev/null
@@ -1,135 +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.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.SCABinding;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.interfacedef.Operation;
-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 Operation createOperation() {
-		return defaultFactory.createOperation();
-	}
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
deleted file mode 100644
index 85c5e7ec43..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ /dev/null
@@ -1,211 +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.assembly.Visitor;
-import org.apache.tuscany.sca.policy.Intent;
-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 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;
-        }
-	
-	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
-		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
-		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 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 boolean accept(Visitor visitor) {
-                if (!visitor.visit(this)) {
-                    return false;
-                }
-                for (ComponentProperty property : properties) {
-                    if (!visitor.visit(property)) {
-                        return false;
-                    }
-                }
-                for (ComponentReference reference : references) {
-                    if (!visitor.visit(reference)) {
-                        return false;
-                    }
-                }
-                for (ComponentService service : services) {
-                    if (!visitor.visit(service)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
deleted file mode 100644
index bc139a3ef3..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ /dev/null
@@ -1,65 +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.ComponentService;
-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 wrappering an SCA assembly Reference
- *
- *  @version $Rev$ $Date$
- */
-public class BeanReferenceImpl extends RuntimeBeanReference {
-	private Reference reference;
-	
-	protected BeanReferenceImpl(Reference reference) {
-		super("temp");
-		this.reference = reference;
-	}
-	
-	public String getBeanName() {
-		//TODO handle multiplicity
-		ComponentService componentService = reference.getTargets().get(0);
-		if (!componentService.isUnresolved()) {
-			SCABinding binding = componentService.getBinding(SCABinding.class);
-                        return binding.getComponent().getURI();
-		} else {
-			return null;
-		}
-	}
-	
-	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;
-	}
-
-	public int hashCode() {
-		return getBeanName().hashCode() * 29 + (this.isToParent() ? 1 : 0);
-	}
-
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
deleted file mode 100644
index ba2d5045f2..0000000000
--- a/branches/sca-java-0.90/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 wrappering 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-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
deleted file mode 100644
index 24bc719e6a..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ /dev/null
@@ -1,195 +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.XMLOutputFactory;
-
-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.DefaultSCABindingFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
-import org.apache.tuscany.sca.assembly.builder.Problem;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
-import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
-import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-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.DefaultJavaClassIntrospectorExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.introspect.ExtensibleJavaClassIntrospector;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassIntrospector;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
-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.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.implementation.java.xml.JavaImplementationProcessor;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.introspect.ExtensibleJavaInterfaceIntrospector;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceIntrospector;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-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
-        AssemblyFactory assemblyFactory = new BeanAssemblyFactory(new DefaultAssemblyFactory(), beanFactory);
-        SCABindingFactory scaBindingFactory = new DefaultSCABindingFactory();
-        PolicyFactory policyFactory = new DefaultPolicyFactory();
-        InterfaceContractMapper interfaceContractMapper = new InterfaceContractMapperImpl();
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        JavaInterfaceIntrospectorExtensionPoint interfaceVisitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
-        JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
-        JavaClassIntrospectorExtensionPoint classVisitors = new DefaultJavaClassIntrospectorExtensionPoint();
-        
-        JavaInterfaceIntrospector interfaceIntrospector = new ExtensibleJavaInterfaceIntrospector(javaFactory, interfaceVisitors);
-        
-        BaseJavaClassVisitor[] extensions = new BaseJavaClassVisitor[] {
-            new ConstructorProcessor(assemblyFactory),
-            new AllowsPassByReferenceProcessor(assemblyFactory),
-            new ContextProcessor(assemblyFactory),
-            new ConversationProcessor(assemblyFactory),
-            new DestroyProcessor(assemblyFactory),
-            new EagerInitProcessor(assemblyFactory),
-            new InitProcessor(assemblyFactory),
-            new PropertyProcessor(assemblyFactory),
-            new ReferenceProcessor(assemblyFactory, javaFactory, interfaceIntrospector),
-            new ResourceProcessor(assemblyFactory),
-            new ScopeProcessor(assemblyFactory),
-            new ServiceProcessor(assemblyFactory, javaFactory, interfaceIntrospector),
-            new HeuristicPojoProcessor(assemblyFactory, javaFactory, interfaceIntrospector),
-            new PolicyProcessor(assemblyFactory, policyFactory)
-        };
-        for (JavaClassVisitor e : extensions) {
-            classVisitors.addClassVisitor(e);
-        }
-        JavaClassIntrospector classIntrospector = new ExtensibleJavaClassIntrospector(classVisitors);
-
-        // Populate ArtifactProcessor registry
-        DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
-        ExtensibleStAXArtifactProcessor staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
-        CompositeProcessor compositeProcessor = new CompositeProcessor(assemblyFactory, policyFactory,
-                                                                       interfaceContractMapper, staxProcessor);
-        staxProcessors.addArtifactProcessor(compositeProcessor);
-        staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
-        staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
-        staxProcessors.addArtifactProcessor(new JavaInterfaceProcessor(javaFactory, interfaceIntrospector));
-        staxProcessors.addArtifactProcessor(new JavaImplementationProcessor(assemblyFactory, policyFactory, javaImplementationFactory, classIntrospector));
-        
-        // Create a resolver
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        ModelResolverImpl resolver = new ModelResolverImpl(classLoader);
-
-        try {
-            
-            // Read the composite files
-            List<Composite> composites = new ArrayList<Composite>();
-            for (String compositeFile: compositeFiles) {
-                InputStream is = classLoader.getResourceAsStream(compositeFile);
-                Composite composite = staxProcessor.read(is, Composite.class);
-                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, interfaceContractMapper);
-            
-        } catch (ContributionException e) {
-            throw new RuntimeException(e);
-        } catch (CompositeBuilderException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    private void buildComposite(Composite composite, AssemblyFactory assemblyFactory,
-                                SCABindingFactory scaBindingFactory, InterfaceContractMapper interfaceContractMapper) throws CompositeBuilderException {
-
-        CompositeBuilderMonitor monitor = new CompositeBuilderMonitor() {
-
-            public void problem(Problem problem) {
-                // Uncommenting the following two lines can be useful to detect
-                // and troubleshoot SCA assembly XML composite configuration
-                // problems.
-
-                System.out.println("Composite assembly problem: " + problem.getMessage());
-            }
-        };
-
-        // Configure and wire the composite
-        CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, 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-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
deleted file mode 100644
index 8a88ba28d9..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ /dev/null
@@ -1,182 +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.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.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 List<Intent> requiredIntents = new ArrayList<Intent>();
-	private List<PolicySet> policySets = new ArrayList<PolicySet>();
-	private ConstrainingType constrainingType;
-	private List<Object> extensions = new ArrayList<Object>();
-	private boolean unresolved;
-	private BeanDefinitionRegistry beanRegistry;
-        private String uri;
-        
-	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
-		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
-		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<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
-
-	public List<PolicySet> getPolicySets() {
-		return policySets;
-	}
-
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
deleted file mode 100644
index c9cd0f8892..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.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 org.apache.tuscany.sca.core.spring.implementation.java.impl;
-
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-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;
-	
-	public BeanJavaImplementationFactory(BeanDefinitionRegistry beanRegistry) {
-		this.beanRegistry = beanRegistry;
-	}
-
-	public JavaImplementation createJavaImplementation() {
-		return new BeanJavaImplementationImpl(beanRegistry);
-	}
-
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
deleted file mode 100644
index 5d787d2fd2..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ /dev/null
@@ -1,164 +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.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.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, JavaElementImpl> callbackMembers = new HashMap<String, JavaElementImpl>();
-    private Member conversationIDMember;
-    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;
-
-    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 Member getConversationIDMember() {
-        return this.conversationIDMember;
-    }
-
-    public void setConversationIDMember(Member conversationIDMember) {
-        this.conversationIDMember = 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, 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;
-    }
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/branches/sca-java-0.90/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-0.90/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-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
deleted file mode 100644
index 6557d23f27..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ /dev/null
@@ -1,44 +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.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-/**
- * 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 {
-	
-	public BeanJavaInterfaceFactory() {
-	}
-
-	public JavaInterface createJavaInterface() {
-		return new BeanJavaInterfaceImpl();
-	}
-        
-        public JavaInterfaceContract createJavaInterfaceContract() {
-            return new BeanJavaInterfaceContractImpl();
-        }
-
-}
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
deleted file mode 100644
index 3d2c4b3e4d..0000000000
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ /dev/null
@@ -1,118 +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.policy.Intent;
-
-/**
- * An alternate implementation of the SCA Java assembly model JavaInterface
- * interface.
- * 
- * @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceImpl 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 setDefaultDataBinding(String dataBinding) {
-    }
-}