17 files changed, 0 insertions, 1253 deletions
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
deleted file mode 100644
index e963848c7f..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
+++ /dev/null
@@ -1,442 +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.endpoint.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.oasisopen.sca.SCARuntimeException;
-
-/**
- * An builder that takes endpoint references and resolves them. It either finds local
- * service endpoints if they are available or asks the domain. The main function here
- * is to perform binding and policy matching.
- * This is a separate builder in case it is required by undresolved endpoints
- * once the runtime has started.
- *
- * @version $Rev$ $Date$
- */
-public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointReferenceBuilder {
-
-    protected ExtensionPointRegistry extensionPoints;
-    protected AssemblyFactory assemblyFactory;
-    protected InterfaceContractMapper interfaceContractMapper;
-    protected EndpointRegistry endpointRegistry;
-
-
-    public EndpointReferenceBuilderImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-
-        FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
-
-        UtilityExtensionPoint utils = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        this.interfaceContractMapper = utils.getUtility(InterfaceContractMapper.class);
-
-        this.endpointRegistry = utils.getUtility(EndpointRegistry.class);
-    }
-
-    public String getID() {
-        return "org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder";
-    }
-
-    /**
-     * Report a warning.
-     *
-     * @param monitor
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void warning(Monitor monitor, String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Report a error.
-     *
-     * @param monitor
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void error(Monitor monitor, String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Report a exception.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void error(Monitor monitor, String message, Object model, Exception ex) {
-        if (monitor != null) {
-            Problem problem = null;
-            problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Build all the endpoint references
-     *
-     * @param composite
-     */
-    public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException
-    {
-        // Not used now
-    }
-
-    /*
-    private void populateEndpointRegistry(Composite composite, Monitor monitor) {
-
-        // register endpoints (and endpoint references) for each component
-        for (Component component : composite.getComponents()) {
-            // recurse for composite implementations
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                populateEndpointRegistry((Composite)implementation, monitor);
-            }
-
-            // register endpoints
-            for (ComponentService service : component.getServices()) {
-                for (Endpoint2 endpoint : service.getEndpoints()){
-                    endpointRegistry.addEndpoint(endpoint);
-                }
-            }
-
-            // register endpoint references
-            for (ComponentReference reference : component.getReferences()) {
-                for (EndpointReference2 endpointReference : reference.getEndpointReferences()){
-                    endpointRegistry.addEndpointReference(endpointReference);
-                }
-            }
-        }
-    }
-    */
-
-    /**
-     * Build a single endpoint reference
-     *
-     * @param endpoint
-     * @param monitor
-     */
-    public void build(EndpointReference endpointReference, Monitor monitor) {
-        Endpoint endpoint = endpointReference.getTargetEndpoint();
-
-        if (endpoint == null){
-            // an error?
-        } else {
-            if (endpoint.isUnresolved() == false){
-                // Wired - service resolved - binding matched
-                // The service is in the same composite
-                return;
-            }
-
-            if (endpointReference.isUnresolved() == false ){
-                // Wired - service resolved - binding not matched
-                // The service is in the same composite
-                // TODO - How do we get to here?
-                matchForwardBinding(endpointReference,
-                                    true,
-                                    monitor);
-
-                matchCallbackBinding(endpointReference,
-                                     monitor);
-            } else {
-                // Wired - service specified but unresolved
-                // The service is in a remote composite somewhere else in the domain
-
-                // find the service in the endpoint registry
-                List<Endpoint> endpoints = endpointRegistry.findEndpoint(endpointReference);
-
-                // TODO - do we exepect to find more than one endpoint in
-                //        anything other than the autowire case?
-                if (endpoints.size() == 0) {
-                    throw new SCARuntimeException("No endpoints found for EndpointReference " + endpointReference.toString());
-                }
-
-                if (endpoints.size() > 1) {
-                    throw new SCARuntimeException("More than one endpoint found for EndpointReference" + endpointReference.toString());
-                }
-
-                endpointReference.setTargetEndpoint(endpoints.get(0));
-
-                matchForwardBinding(endpointReference, false, monitor);
-
-                matchCallbackBinding(endpointReference, monitor);
-            }
-        }
-
-        if (endpointReference.isUnresolved()){
-            throw new SCARuntimeException("Can't resolve " + endpointReference.toString());
-        }
-    }
-
-    // TODO - EPR - In OASIS case there are no bindings to match with on the
-    //        reference side.
-    private void matchForwardBinding(EndpointReference endpointReference,
-                                     boolean local,
-                                     Monitor monitor) {
-
-        Endpoint endpoint = endpointReference.getTargetEndpoint();
-
-        List<Binding> matchedReferenceBinding = new ArrayList<Binding>();
-        List<Endpoint> matchedServiceEndpoint = new ArrayList<Endpoint>();
-
-        // Find the corresponding bindings from the service side
-        if ((endpointReference.getReference().getBindings().size() == 0) ||
-             ((endpointReference.getReference().getBindings().size() == 1) &&
-              (endpointReference.getReference().getBindings().get(0) instanceof SCABinding))){
-            // OAISIS - choose a binding from the service side 
-            //          (could have been specified as part of the target string)
-            //           last part of this test that is looking for binding SCA is
-            //          bogus. Just a temporary fix until we get rid of the OSOA
-            //          style reference side bindings. 
-            
-            // retrieve the user specified binding name. 
-            // TODO - EPR - we don't support this yet
-            
-            // otherwise pick the first binding from the service
-            endpointReference.setTargetEndpoint(endpoint.getService().getEndpoints().get(0));
-            endpointReference.setBinding(endpointReference.getTargetEndpoint().getBinding());
-            endpointReference.setUnresolved(false);
-            return;
-   
-        } else {
-            // OAISIS - this is an error 
-            //          (for now let it match bindings while we rewrite OSOA tests)
-            for (Binding referenceBinding : endpointReference.getReference().getBindings()) {
-                if (local) {
-                    for (Endpoint serviceEndpoint : endpoint.getService().getEndpoints()) {
-    
-                        if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding,
-                                                                                                                              serviceEndpoint
-                                                                                                                                  .getBinding())) {
-    
-                            matchedReferenceBinding.add(referenceBinding);
-                            matchedServiceEndpoint.add(serviceEndpoint);
-                        }
-                    }
-                } else {
-                    Endpoint serviceEndpoint = endpoint;
-                    if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding,
-                                                                                                                          serviceEndpoint
-                                                                                                                              .getBinding())) {
-    
-                        matchedReferenceBinding.add(referenceBinding);
-                        matchedServiceEndpoint.add(serviceEndpoint);
-    
-                    }
-                }
-            }
-        }
-
-        if (matchedReferenceBinding.isEmpty()) {
-            // No matching binding
-            endpointReference.setBinding(null);
-            endpointReference.setUnresolved(true);
-            warning(monitor,
-                    "NoMatchingBinding",
-                    endpointReference.getReference(),
-                    endpointReference.getReference().getName(),
-                    endpoint.getService().getName());
-            return;
-        } else {
-            // default to using the first matched binding
-            int selectedBinding = 0;
-
-            for (int i = 0; i < matchedReferenceBinding.size(); i++) {
-                // If binding.sca is present, use it
-                if (SCABinding.class.isInstance(matchedReferenceBinding.get(i))) {
-                    selectedBinding = i;
-                }
-            }
-
-            Binding referenceBinding = matchedReferenceBinding.get(selectedBinding);
-            Endpoint serviceEndpoint = matchedServiceEndpoint.get(selectedBinding);
-
-            // populate the endpoint reference
-            try {
-
-                Binding clonedBinding = (Binding) referenceBinding.clone();
-
-                // Set the binding URI to the URI of the target service
-                // that has been matched
-                if (referenceBinding.getURI() == null) {
-                    clonedBinding.setURI(serviceEndpoint.getBinding().getURI());
-                }
-
-                // TODO - EPR can we remove this?
-                if (clonedBinding instanceof OptimizableBinding) {
-                    OptimizableBinding optimizableBinding = (OptimizableBinding)clonedBinding;
-                    optimizableBinding.setTargetComponent(serviceEndpoint.getComponent());
-                    optimizableBinding.setTargetComponentService(serviceEndpoint.getService());
-                    optimizableBinding.setTargetBinding(serviceEndpoint.getBinding());
-                }
-
-                endpointReference.setBinding(clonedBinding);
-
-                Endpoint clonedEndpoint = (Endpoint)serviceEndpoint.clone();
-
-                endpointReference.setTargetEndpoint(clonedEndpoint);
-                endpointReference.setUnresolved(false);
-
-            } catch (Exception ex) {
-                // do nothing
-            }
-        }
-    }
-
-    // TODO - EPR
-    // Find the callback endpoint for the endpoint reference by matching
-    // callback bindings between reference and service
-    private void matchCallbackBinding(EndpointReference endpointReference,
-                                     Monitor monitor) {
-
-        // if no callback on the interface or we are creating a self reference do nothing
-        if (endpointReference.getReference().getInterfaceContract() == null ||
-            endpointReference.getReference().getInterfaceContract().getCallbackInterface() == null ||
-            endpointReference.getReference().getName().startsWith("$self$.")){
-                return;
-        }
-
-        Endpoint endpoint = endpointReference.getTargetEndpoint();
-
-        List<Endpoint> callbackEndpoints = endpointReference.getReference().getCallbackService().getEndpoints();
-        List<EndpointReference> callbackEndpointReferences = endpoint.getCallbackEndpointReferences();
-
-        List<Endpoint> matchedEndpoint = new ArrayList<Endpoint>();
-        
-        // Find the corresponding bindings from callback service side
-        if ((callbackEndpointReferences.get(0).getReference().getBindings().size() == 0) ||
-             ((callbackEndpointReferences.get(0).getReference().getBindings().size() == 1) &&
-              (callbackEndpointReferences.get(0).getReference().getBindings().get(0) instanceof SCABinding))){
-            // OAISIS - choose a binding from the service side 
-            //          (could have been specified as part of the target string)
-            //           last part of this test that is looking for binding SCA is
-            //          bogus. Just a temporary fix until we get rid of the OSOA
-            //          style reference side bindings. 
-            
-            // retrieve the user specified binding name. 
-            // TODO - EPR - we don't support this yet
-            
-            // otherwise pick the first binding from the service
-            //endpointReference.setTargetEndpoint(endpoint.getService().getEndpoints().get(0));
-            //endpointReference.setBinding(endpointReference.getTargetEndpoint().getBinding());
-            endpointReference.setCallbackEndpoint(callbackEndpoints.get(0));
-            endpointReference.setUnresolved(false);
-            return;
-   
-        } else {
-            // OAISIS - this is an error 
-            //          (for now let it match bindings while we rewrite OSOA tests)
-
-            if ((callbackEndpoints != null) &&  (callbackEndpointReferences != null)){
-                // Find the corresponding bindings from the service side
-                for (EndpointReference epr : callbackEndpointReferences) {
-                    for (Endpoint ep : callbackEndpoints) {
-    
-                        if (epr.getBinding().getClass() == ep.getBinding().getClass() &&
-                            hasCompatiblePolicySets(epr.getBinding(), ep.getBinding())) {
-    
-                            matchedEndpoint.add(ep);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (matchedEndpoint.isEmpty()) {
-            // No matching binding
-            endpointReference.setCallbackEndpoint(null);
-            endpointReference.setUnresolved(true);
-            warning(monitor,
-                    "NoMatchingCallbackBinding",
-                    endpointReference.getReference(),
-                    endpointReference.getReference().getName(),
-                    endpoint.getService().getName());
-            return;
-        } else {
-            // default to using the first matched binding
-            int selectedEndpoint = 0;
-
-            for (int i = 0; i < matchedEndpoint.size(); i++){
-                // If binding.sca is present, use it
-                if (SCABinding.class.isInstance(matchedEndpoint.get(i).getBinding())) {
-                    selectedEndpoint = i;
-                }
-            }
-
-            endpointReference.setCallbackEndpoint(matchedEndpoint.get(selectedEndpoint));
-            endpointReference.setUnresolved(false);
-        }
-    }
-
-    private boolean hasCompatiblePolicySets(Binding refBinding, Binding svcBinding) {
-        boolean isCompatible = true;
-        if ( refBinding instanceof PolicySubject && svcBinding instanceof PolicySubject ) {
-            //TODO : need to add more compatibility checks at the policy attachment levels
-            for ( PolicySet svcPolicySet : ((PolicySubject)svcBinding).getPolicySets() ) {
-                isCompatible = false;
-                for ( PolicySet refPolicySet : ((PolicySubject)refBinding).getPolicySets() ) {
-                    if ( svcPolicySet.equals(refPolicySet) ) {
-                        isCompatible = true;
-                        break;
-                    }
-                }
-                //if there exists no matching policy set in the reference binding
-                if ( !isCompatible ) {
-                    return isCompatible;
-                }
-            }
-        }
-        return isCompatible;
-    }
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java
deleted file mode 100644
index b291b0e44e..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java
+++ /dev/null
@@ -1,188 +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.endpoint.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.runtime.EndpointListener;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-
-public class EndpointRegistryImpl implements EndpointRegistry {
-    private final Logger logger = Logger.getLogger(EndpointRegistryImpl.class.getName());
-
-    static List<Endpoint> endpoints = new ArrayList<Endpoint>();
-    static List<EndpointReference> endpointreferences = new ArrayList<EndpointReference>();
-
-    private List<EndpointListener> listeners = new CopyOnWriteArrayList<EndpointListener>();
-
-    public EndpointRegistryImpl(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public void addEndpoint(Endpoint endpoint) {
-        endpoints.add(endpoint);
-        for (EndpointListener listener : listeners) {
-            listener.endpointAdded(endpoint);
-        }
-        logger.info("EndpointRegistry: Add endpoint - " + endpoint.toString());
-    }
-
-    public void addEndpointReference(EndpointReference endpointReference) {
-        endpointreferences.add(endpointReference);
-        logger.info("EndpointRegistry: Add endpoint reference - " + endpointReference.toString());
-    }
-
-    /**
-     * Parse the component/service/binding URI into an array of parts (componentURI, serviceName, bindingName)
-     * @param uri
-     * @return
-     */
-    private String[] parse(String uri) {
-        String[] names = new String[3];
-        int index = uri.lastIndexOf('#');
-        if (index == -1) {
-            names[0] = uri;
-        } else {
-            names[0] = uri.substring(0, index);
-            String str = uri.substring(index + 1);
-            if (str.startsWith("service-binding(") && str.endsWith(")")) {
-                str = str.substring("service-binding(".length(), str.length() - 1);
-                String[] parts = str.split("/");
-                if (parts.length != 2) {
-                    throw new IllegalArgumentException("Invalid service-binding URI: " + uri);
-                }
-                names[1] = parts[0];
-                names[2] = parts[1];
-            } else if (str.startsWith("service(") && str.endsWith(")")) {
-                str = str.substring("service(".length(), str.length() - 1);
-                names[1] = str;
-            } else {
-                throw new IllegalArgumentException("Invalid component/service/binding URI: " + uri);
-            }
-        }
-        return names;
-    }
-
-    private boolean matches(String target, String uri) {
-        String[] parts1 = parse(target);
-        String[] parts2 = parse(uri);
-        for (int i = 0; i < parts1.length; i++) {
-            if (parts1[i] == null || parts1[i].equals(parts2[i])) {
-                continue;
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public List<Endpoint> findEndpoint(EndpointReference endpointReference) {
-        List<Endpoint> foundEndpoints = new ArrayList<Endpoint>();
-
-        logger.info("EndpointRegistry: Find endpoint for reference - " + endpointReference.toString());
-
-        if (endpointReference.getReference() != null) {
-            Endpoint targetEndpoint = endpointReference.getTargetEndpoint();
-            for (Endpoint endpoint : endpoints) {
-                // TODO: implement more complete matching
-                if (matches(targetEndpoint.getURI(), endpoint.getURI())) {
-                    foundEndpoints.add(endpoint);
-                    logger.info("EndpointRegistry: Found endpoint with matching service  - " + endpoint);
-                }
-                // else the service name doesn't match
-            }
-        }
-
-        return foundEndpoints;
-    }
-
-    public List<EndpointReference> findEndpointReference(Endpoint endpoint) {
-        return null;
-    }
-
-    public void removeEndpoint(Endpoint endpoint) {
-        endpoints.remove(endpoint);
-        for (EndpointListener listener : listeners) {
-            listener.endpointRemoved(endpoint);
-        }
-        logger.info("EndpointRegistry: Remove endpoint - " + endpoint.toString());
-    }
-
-    public void removeEndpointReference(EndpointReference endpointReference) {
-        endpointreferences.remove(endpointReference);
-        logger.info("EndpointRegistry: Remove endpoint reference - " + endpointReference.toString());
-    }
-
-    public List<EndpointReference> getEndpointRefereneces() {
-        return endpointreferences;
-    }
-
-    public List<Endpoint> getEndpoints() {
-        return endpoints;
-    }
-
-    public void addListener(EndpointListener listener) {
-        listeners.add(listener);
-    }
-
-    public List<EndpointListener> getListeners() {
-        return listeners;
-    }
-
-    public void removeListener(EndpointListener listener) {
-        listeners.remove(listener);
-    }
-
-    public Endpoint getEndpoint(String uri) {
-        for (Endpoint ep : endpoints) {
-            String epURI =
-                ep.getComponent().getURI() + "#" + ep.getService().getName() + "/" + ep.getBinding().getName();
-            if (epURI.equals(uri)) {
-                return ep;
-            }
-            if (ep.getBinding().getName() == null || ep.getBinding().getName().equals(ep.getService().getName())) {
-                epURI = ep.getComponent().getURI() + "#" + ep.getService().getName();
-                if (epURI.equals(uri)) {
-                    return ep;
-                }
-            }
-        }
-        return null;
-
-    }
-
-    public void updateEndpoint(String uri, Endpoint endpoint) {
-        Endpoint oldEndpoint = getEndpoint(uri);
-        if (oldEndpoint == null) {
-            throw new IllegalArgumentException("Endpoint is not found: " + uri);
-        }
-        endpoints.remove(oldEndpoint);
-        addEndpoint(endpoint);
-        for (EndpointListener listener : listeners) {
-            listener.endpointUpdated(oldEndpoint, endpoint);
-        }
-    }
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
deleted file mode 100644
index 541941c3d3..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ /dev/null
@@ -1,18 +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. 
-
-org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl;id=org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder
deleted file mode 100644
index 37f34b9aba..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder
+++ /dev/null
@@ -1,18 +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. 
-
-org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl
-\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
deleted file mode 100644
index 75a909199e..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ /dev/null
@@ -1,18 +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.
-
-org.apache.tuscany.sca.endpoint.impl.EndpointRegistryImpl;ranking=100
-\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddService.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/AddServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorService.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorService.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;
-
-
-/**
- * The Calculator service interface.
- */
-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/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-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/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/DivideService.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/MultiplyService.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/SubtractService.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
deleted file mode 100644
index 1e44da4661..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ /dev/null
@@ -1,160 +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.apace.tuscany.sca.binding.sca;
-
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * EndpointTestCase
- *
- * @version $Rev$ $Date$
- */
-public class EndpointTestCase {
-
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static FactoryExtensionPoint modelFactories;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor;
-    private static CompositeBuilder compositeBuilder;
-    private static ModelResolver modelResolver;
-    private static CompositeActivator compositeActivator;
-    private static ExtensionPointRegistry extensionPoints;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void init() {
-
-        // Create extension point registry
-        extensionPoints = new DefaultExtensionPointRegistry();
-
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-
-        // Get contribution workspace and assembly model factories
-        assemblyFactory = new RuntimeAssemblyFactory(extensionPoints);
-        modelFactories.addFactory(assemblyFactory);
-
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        modelResolver = new ExtensibleModelResolver(null, modelResolvers, modelFactories);
-
-        // Create a composite builder
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-
-
-
-    }
-
-    @Ignore
-    @Test
-    public void testProvider(){
-        try {
-            URI calculatorURI = URI.create("calcualtor");
-            URL calculatorURL = new File("./target/test-classes").toURI().toURL();
-            Contribution contribution = contributionProcessor.read(null, calculatorURI, calculatorURL);
-
-            contributionProcessor.resolve(contribution, modelResolver);
-
-            Composite composite = contribution.getDeployables().get(0);
-
-            compositeBuilder.build(composite, null, monitor);
-
-            ComponentReference ref = (composite.getComponents().get(0).getReferences().get(0));
-/* TODO - EPR - convert to new endpoint reference
-            Assert.assertEquals(1, ref.getEndpoints().size());
-
-            Endpoint endpoint = ref.getEndpoints().get(0);
-
-            EndpointResolverFactory<Endpoint> factory = new EndpointResolverFactoryImpl(extensionPoints);
-
-            EndpointResolver endpointResolver = factory.createEndpointResolver(endpoint, null);
-
-            Assert.assertNotNull(endpointResolver);
-*/
-
-
-        } catch(Exception ex) {
-            ex.printStackTrace();
-            System.out.println(ex.toString());
-            Assert.fail();
-        }
-    }
-
-
-}
diff --git a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/resources/Calculator.composite b/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/resources/Calculator.composite
deleted file mode 100644
index cd17d6b0fb..0000000000
--- a/tags/java/sca/2.0-M3-RC2/modules/endpoint/src/test/resources/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://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:calc="http://calc"
-    targetNamespace="http://calc"
-    name="Calculator">
-    
-    <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="AddServiceComponentOff">
-        <implementation.java class="calculator.AddServiceImpl"/>
-        <service name="AddServiceImpl">
-            <interface.java interface="calculator.AddService"/>
-        </service>        
-    </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>
-\ No newline at end of file