Delete test branch created by the release plugin

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

9 files changed, 0 insertions, 1069 deletions

diff --git a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
deleted file mode 100644
index 5ee68899a9..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ /dev/null
@@ -1,54 +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.node.impl;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * Default implementation of an SCA node factory.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeFactoryImpl extends NodeFactory {
-    public NodeFactoryImpl() {
-    }
-    
-    @Override
-    public Node createNode(String configurationURI) {
-        return new NodeImpl(configurationURI);
-    }
-    
-    @Override
-    public Node createNode(String compositeURI, Contribution... contributions) {
-        return new NodeImpl(compositeURI, contributions);
-    }
-
-    @Override
-    public Node createNode(String compositeURI, String compositeContent, Contribution... contributions) {
-        return new NodeImpl(compositeURI, compositeContent, contributions);
-    }
-
-    @Override
-    public Node createNode() {
-        return new NodeImpl();
-    }
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
deleted file mode 100644
index f841f96e75..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ /dev/null
@@ -1,746 +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.node.impl;
-
-import static java.lang.System.currentTimeMillis;
-import static org.apache.tuscany.sca.node.impl.NodeUtil.contribution;
-import static org.apache.tuscany.sca.node.impl.NodeUtil.createURI;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-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.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.definitions.DefinitionsFactory;
-import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.provider.DefinitionsProvider;
-import org.apache.tuscany.sca.provider.DefinitionsProviderException;
-import org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.apache.tuscany.sca.work.WorkScheduler;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-
-/**
- * Represents an SCA runtime node.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImpl implements Node, Client {
-
-    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
-
-    private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
-
-    // The node configuration name, used for logging
-    private String configurationName;
-
-    // The composite loaded into this node
-    private Composite composite;
-
-    private ExtensionPointRegistry extensionPoints;
-    private Monitor monitor;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private ModelResolverExtensionPoint modelResolvers;
-    private FactoryExtensionPoint modelFactories;
-    private WorkspaceFactory workspaceFactory;
-    private ContributionFactory contributionFactory;
-    private AssemblyFactory assemblyFactory;
-    private XMLInputFactory inputFactory;
-    private ContributionBuilder contributionDependencyBuilder;
-    private CompositeBuilder compositeBuilder;
-    private CompositeBuilder endpointReferenceBuilder;
-    private StAXArtifactProcessorExtensionPoint xmlProcessors;
-    private StAXArtifactProcessor<Composite> compositeProcessor; 
-    private ProxyFactory proxyFactory;
-    private List<ModuleActivator> moduleActivators = new ArrayList<ModuleActivator>();
-    private CompositeActivator compositeActivator;
-    private WorkScheduler workScheduler;
-    private Contribution systemContribution;
-    private Definitions systemDefinitions;
-
-    /** 
-     * Constructs a new SCA node.
-     */
-    NodeImpl() {
-        configurationName = "default";
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        String root = ContributionLocationHelper.getContributionLocation("META-INF/sca-contribution.xml");
-        if (root == null) {
-            throw new ServiceRuntimeException("no META-INF/sca-contribution.xml found");
-        }
-
-        String compositeURI = null;
-        org.apache.tuscany.sca.node.Contribution[] contributions = new org.apache.tuscany.sca.node.Contribution[]{new org.apache.tuscany.sca.node.Contribution(root, root)};
-      
-        try {
-            // Initialize the runtime
-            init();
-
-            // Create a node configuration
-            NodeImplementationFactory nodeImplementationFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-            ConfiguredNodeImplementation configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-            if (compositeURI != null) {
-                Composite composite = assemblyFactory.createComposite();
-                composite.setURI(compositeURI);
-                composite.setUnresolved(true);
-                configuration.setComposite(composite);
-            }
-  
-                // Create contribution models
-            for (org.apache.tuscany.sca.node.Contribution c : contributions) {
-                Contribution contribution = contribution(contributionFactory, c);
-                configuration.getContributions().add(contribution);
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param configurationURI the URI of the node configuration information.
-     */
-    NodeImpl(String configurationURI) {
-        configurationName = configurationURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            init();
-
-            // Read the node configuration feed
-            StAXArtifactProcessor<ConfiguredNodeImplementation> configurationProcessor = xmlProcessors.getProcessor(ConfiguredNodeImplementation.class);
-            URL configurationURL = new URL(configurationURI);
-            InputStream is = configurationURL.openStream();
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            reader.nextTag();
-            ConfiguredNodeImplementation configuration = configurationProcessor.read(reader);
-            is.close();
-
-            // Resolve contribution URLs
-            for (Contribution contribution : configuration.getContributions()) {
-                URL contributionURL = new URL(configurationURL, contribution.getLocation());
-                contribution.setLocation(contributionURL.toString());
-            }
-
-            // Resolve composite URL
-            URL compositeURL = new URL(configurationURL, configuration.getComposite().getURI());
-            configuration.getComposite().setURI(compositeURL.toString());
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, org.apache.tuscany.sca.node.Contribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            init();
-
-            // Create a node configuration
-            NodeImplementationFactory nodeImplementationFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-            ConfiguredNodeImplementation configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-            if (compositeURI != null) {
-                Composite composite = assemblyFactory.createComposite();
-                composite.setURI(compositeURI);
-                composite.setUnresolved(true);
-                configuration.setComposite(composite);
-            }
-  
-                // Create contribution models
-            for (org.apache.tuscany.sca.node.Contribution c : contributions) {
-                Contribution contribution = contribution(contributionFactory, c);
-                configuration.getContributions().add(contribution);
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param compositeContent
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, String compositeContent, org.apache.tuscany.sca.node.Contribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            init();
-
-            // Create a node configuration
-            NodeImplementationFactory nodeImplementationFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-            ConfiguredNodeImplementation configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-            // Read the composite model
-            logger.log(Level.INFO, "Loading composite: " + compositeURI);
-
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(new ByteArrayInputStream(compositeContent.getBytes("UTF-8")));
-            reader.nextTag();
-            
-            // Read the composite model
-            composite = (Composite)compositeProcessor.read(reader);
-            if (composite != null && compositeURI != null) {
-                composite.setURI(compositeURI);
-            }
-            analyzeProblems();
-
-            configuration.setComposite(composite);
-
-            // Create contribution models
-            for (org.apache.tuscany.sca.node.Contribution c : contributions) {
-                Contribution contribution = contribution(contributionFactory, c);
-                configuration.getContributions().add(contribution);
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private void init() {
-        long start = currentTimeMillis();
-        
-        // Create extension point registry 
-        extensionPoints = new DefaultExtensionPointRegistry();
-
-        // Use the runtime-enabled assembly factory 
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        assemblyFactory = new RuntimeAssemblyFactory();
-        modelFactories.addFactory(assemblyFactory);
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor(); 
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint activators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator moduleActivator: activators.getModuleActivators()) {
-            try {
-                moduleActivator.start(extensionPoints);
-                moduleActivators.add(moduleActivator);
-            } catch (Throwable e) {
-                // Ignore the failing module for now
-                logger.log(Level.SEVERE, e.getMessage(), e);
-            }
-        }
-
-        // Get XML input/output factories
-        inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-
-        // Create XML artifact processors
-        xmlProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        compositeProcessor = xmlProcessors.getProcessor(Composite.class);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Get a contribution dependency builder
-        ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
-        contributionDependencyBuilder = contributionBuilders.getContributionBuilder("org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder");
-        
-        // Get composite builders
-        CompositeBuilderExtensionPoint compositeBuilders = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class);
-        compositeBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-        
-        // Get endpoint builders
-        // TODO - new extension point?
-        endpointReferenceBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl");
-        
-        // Initialize runtime
-
-        // Get proxy factory
-        ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories);
-
-        // Get the composite activator
-        compositeActivator = utilities.getUtility(CompositeActivator.class);
-
-        workScheduler = utilities.getUtility(WorkScheduler.class);
-        
-        // Load the system definitions.xml from all of the loaded extension points
-        DefinitionsProviderExtensionPoint definitionsProviders = extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
-        DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class);
-        systemDefinitions = definitionsFactory.createDefinitions();
-
-        // aggregate all the definitions into a single definitions model
-        try {
-            for (DefinitionsProvider definitionsProvider : definitionsProviders.getDefinitionsProviders()) {
-                DefinitionsUtil.aggregate(definitionsProvider.getDefinitions(), systemDefinitions);
-            }
-        } catch (DefinitionsProviderException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        // create a system contribution to hold the definitions. The contribution
-        // will be extended later with definitions from application contributions
-        systemContribution = contributionFactory.createContribution();
-        systemContribution.setURI("http://tuscany.apache.org/SystemContribution");
-        systemContribution.setLocation("http://tuscany.apache.org/SystemContribution");
-        ModelResolver modelResolver = new ExtensibleModelResolver(systemContribution, modelResolvers, modelFactories);
-        systemContribution.setModelResolver(modelResolver);
-        systemContribution.setUnresolved(true);
-        
-        // create an artifact to represent the system defintions and
-        // add it to the contribution
-        List<Artifact> artifacts = systemContribution.getArtifacts();
-        Artifact artifact = contributionFactory.createArtifact();
-        artifact.setURI("http://tuscany.apache.org/SystemContribution/Definitions");
-        artifact.setLocation("Derived");
-        artifact.setModel(systemDefinitions);
-        artifacts.add(artifact);
-
-        // don't resolve the system contribution until all the application 
-        // level definitions have been added 
-            
-        
-//
-//        // Configure a resolver for the system definitions
-//        ModelResolver definitionsResolver = new DefaultModelResolver();
-//        for (Intent intent : systemDefinitions.getPolicyIntents()) {
-//            definitionsResolver.addModel(intent);
-//        }
-//        for (PolicySet policySet : systemDefinitions.getPolicySets()) {
-//            definitionsResolver.addModel(policySet);
-//        }
-//        for (ExtensionType bindingType : systemDefinitions.getBindingTypes()) {
-//            definitionsResolver.addModel(bindingType);
-//        }
-//        for (ExtensionType implementationType : systemDefinitions.getImplementationTypes()) {
-//            definitionsResolver.addModel(implementationType);
-//        }
-//
-//        // Now that all system sca definitions have been read, let's resolve them
-//        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-//        URLArtifactProcessor<Definitions> definitionsProcessor = documentProcessors.getProcessor(Definitions.class);
-//        try {
-//            definitionsProcessor.resolve(systemDefinitions, definitionsResolver);
-//        } catch (ContributionResolveException e) {
-//            throw new IllegalStateException(e);
-//        }
-
-        if (logger.isLoggable(Level.FINE)) {
-            long end = currentTimeMillis();
-            logger.fine("The tuscany runtime started in " + (end - start) + " ms.");
-        }
-    }
-    
-    private void configureNode(ConfiguredNodeImplementation configuration) throws Exception {
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Load the specified contributions
-        for (Contribution c : configuration.getContributions()) {
-            URI contributionURI = URI.create(c.getURI());
-            
-            URI uri = createURI(c.getLocation());
-            if (uri.getScheme() == null) {
-                uri = new File(c.getLocation()).toURI();
-            }
-            URL contributionURL = uri.toURL();
-
-            // Load the contribution
-            logger.log(Level.INFO, "Loading contribution: " + contributionURL);
-            Contribution contribution = contributionProcessor.read(null, contributionURI, contributionURL);
-            workspace.getContributions().add(contribution);
-            analyzeProblems();
-        }
-        
-        // Build an aggregated SCA definitions model. Must be done before we try and
-        // resolve any contributions or composites as they may depend on the full
-        // definitions.xml picture
-        
-        // get all definitions.xml artifacts from contributions and aggregate 
-        // into the system contribution. In turn add a default import into
-        // each contribution so that for unresolved items the resolution 
-        // processing will look in the system contribution 
-        for (Contribution contribution: workspace.getContributions()) {
-            // aggregate definitions
-            for (Artifact artifact : contribution.getArtifacts()) {
-                Object model = artifact.getModel();
-                if (model instanceof Definitions) {
-                    DefinitionsUtil.aggregate((Definitions)model, systemDefinitions);
-                }
-            }
-            
-            // create a default import and wire it up to the system contribution
-            // model resolver. This is the trick that makes the resolution processing
-            // skip over to the system contribution if resolution is unsuccessful 
-            // in the current contribution
-            DefaultImport defaultImport = contributionFactory.createDefaultImport();
-            defaultImport.setModelResolver(systemContribution.getModelResolver());
-            contribution.getImports().add(defaultImport);
-        }
-        
-        // now resolve the system contribution and add the contribution 
-        // to the workspace
-        contributionProcessor.resolve(systemContribution, workspace.getModelResolver());
-        workspace.getContributions().add(systemContribution);
-        
-        // TODO - Now we can calculate applicable policy sets for each composite 
-
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            contributionDependencyBuilder.build(contribution, workspace, monitor);
-            
-            // Resolve contributions
-            for (Contribution dependency: contribution.getDependencies()) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());
-                }
-            }
-        }
-        
-        composite = configuration.getComposite();
-        
-        if (composite == null) {
-            setDefaultComposite(configuration, workspace);
-        }
-        
-        // Find the composite in the given contributions
-        boolean found = false;
-        Artifact compositeFile = contributionFactory.createArtifact();
-        compositeFile.setUnresolved(true);
-        compositeFile.setURI(composite.getURI());
-        for (Contribution contribution: workspace.getContributions()) {
-            ModelResolver resolver = contribution.getModelResolver();
-//            for (Artifact artifact : contribution.getArtifacts()){
-//                logger.log(Level.INFO,"artifact - " + artifact.getURI());
-//            }
-            Artifact resolvedArtifact = resolver.resolveModel(Artifact.class, compositeFile);
-//            if (!resolvedArtifact.isUnresolved() && resolvedArtifact.getModel() instanceof Composite) {
-                
-                if (!composite.isUnresolved()) {
-                    
-                    // The composite content was passed into the node and read into a composite model,
-                    // don't use the composite found in the contribution, use that composite, but just resolve
-                    // it within the context of the contribution
-                    compositeProcessor.resolve(composite, resolver);
-                    
-                } else {
-                    
-                    // Use the resolved composite we've found in the contribution
-                    composite = (Composite)resolvedArtifact.getModel();
-                }
-                found = true;
-    //            break;
-  //          }
-        }
-//        if (!found) {
-//            throw new IllegalArgumentException("Composite not found: " + composite.getURI());
-//        }
-
-        // Build the composite and wire the components included in it
-        compositeBuilder.build(composite, systemDefinitions, monitor);
-        analyzeProblems();
-        
-        // build the endpoint references 
-        endpointReferenceBuilder.build(composite, systemDefinitions, monitor);
-        analyzeProblems();
-        
-        // Create a top level composite to host our composite
-        // This is temporary to make the activator happy
-        Composite tempComposite = assemblyFactory.createComposite();
-        tempComposite.setName(new QName(SCA11_TUSCANY_NS, "_tempComposite"));
-        tempComposite.setURI(SCA11_TUSCANY_NS);
-
-        // Include the node composite in the top-level composite 
-        tempComposite.getIncludes().add(composite);
-
-        // Set the top level composite on the composite activator as 
-        // logic in callable reference resolution relies on this being 
-        // available
-        compositeActivator.setDomainComposite(tempComposite);
-        
-        /*
-        // The following line may return null, to be investigated
-        XPathFactory xPathFactory = modelFactories.getFactory(XPathFactory.class);
-        
-        for (PolicySet policySet : systemDefinitions.getPolicySets()) {
-            if (policySet.getAppliesTo() != null) {
-                XPath xpath = xPathFactory.newXPath();
-                // FIXME: We need to develop a xpath function resolver to
-                // deal with the SCA functions
-                // xpath.setXPathFunctionResolver(resolver);
-                XPathExpression exp = xpath.compile(policySet.getAppliesTo());
-                // exp.evaluate(item, XPathConstants.BOOLEAN);
-            }
-        }
-        */
-    }
-
-    public void start() {
-        logger.log(Level.INFO, "Starting node: " + configurationName);
-
-        try {
-            
-            // Activate the composite
-            compositeActivator.activate(composite);
-
-            // Start the composite
-            compositeActivator.start(composite);
-            
-        } catch (ActivationException e) {
-            throw new IllegalStateException(e);
-        }
-
-    }
-
-    public void stop() {
-        logger.log(Level.INFO, "Stopping node: " + configurationName);
-
-        try {
-            
-            // Stop the composite
-            compositeActivator.stop(composite);
-    
-            // Deactivate the composite
-            compositeActivator.deactivate(composite);
-
-        } catch (ActivationException e) {
-            throw new IllegalStateException(e);
-        }
-
-    }
-    
-    public void destroy() {
-        // Stop the runtime modules
-        for (ModuleActivator moduleActivator: moduleActivators) {
-            moduleActivator.stop(extensionPoints);
-        }
-
-        // Stop and destroy the work manager
-        workScheduler.destroy();
-    }
-
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)proxyFactory.cast(target);
-    }
-
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-
-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);
-        if (serviceReference == null) {
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        }
-        return serviceReference.getService();
-    }
-
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {
-
-        // Extract the component name
-        String componentName;
-        String serviceName;
-        int i = name.indexOf('/');
-        if (i != -1) {
-            componentName = name.substring(0, i);
-            serviceName = name.substring(i + 1);
-
-        } else {
-            componentName = name;
-            serviceName = null;
-        }
-
-        // Lookup the component 
-        Component component = null;
-
-        for (Component compositeComponent : composite.getComponents()) {
-            if (compositeComponent.getName().equals(componentName)) {
-                component = compositeComponent;
-            }
-        }
-
-        if (component == null) {
-            throw new ServiceRuntimeException("The service " + name + " has not been contributed to the domain");
-        }
-        RuntimeComponentContext componentContext = null;
-
-        // If the component is a composite, then we need to find the
-        // non-composite component that provides the requested service
-        if (component.getImplementation() instanceof Composite) {
-            for (ComponentService componentService : component.getServices()) {
-                if (serviceName == null || serviceName.equals(componentService.getName())) {
-                    CompositeService compositeService = (CompositeService)componentService.getService();
-                    if (compositeService != null) {
-                        // TODO - EPR - $promoted$ no longer used
-                        //if (serviceName != null) {
-                        //    serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName;
-                        //}
-                        componentContext =
-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
-                        return componentContext.createSelfReference(businessInterface, compositeService
-                            .getPromotedService());
-                    }
-                    break;
-                }
-            }
-            // No matching service found
-            throw new ServiceRuntimeException("Composite service not found: " + name);
-        } else {
-            componentContext = ((RuntimeComponent)component).getComponentContext();
-            if (serviceName != null) {
-                return componentContext.createSelfReference(businessInterface, serviceName);
-            } else {
-                return componentContext.createSelfReference(businessInterface);
-            }
-        }
-    }
-
-    /**
-     * Analyze problems reported by the artifact processors and builders.
-     * 
-     * @throws Exception
-     */
-    private void analyzeProblems() throws Exception {
-        for (Problem problem : monitor.getProblems()) {
-            if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) {
-                if (problem.getCause() != null) {
-                    throw problem.getCause();
-                } else {
-                    throw new ServiceRuntimeException(problem.toString());
-                }
-            }
-        }
-    }
-
-    /*
-     * Sets a default composite by using any deployable one.
-     */
-    private void setDefaultComposite(ConfiguredNodeImplementation configuration, Workspace workspace) {
-        // just use the first deployable composte
-        for (Contribution contribution : workspace.getContributions()) {
-            for (Composite c : contribution.getDeployables()) {
-                composite = assemblyFactory.createComposite();
-                composite.setURI(c.getURI());
-                composite.setUnresolved(true);
-                configuration.setComposite(composite);
-                return;
-            }
-        }
-        throw new ServiceRuntimeException("no deployable composite found");
-    }
-
-    public ExtensionPointRegistry getExtensionPoints() {
-        return extensionPoints;
-    }
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
deleted file mode 100644
index 396d77af66..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.node.impl;
-
-import java.net.URI;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-
-/**
- * NodeUtil
- *
- * @version $Rev: $ $Date: $
- */
-public class NodeUtil {
-    private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
-
-    static Contribution contribution(ContributionFactory contributionFactory, org.apache.tuscany.sca.node.Contribution c) {
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(c.getURI());
-        contribution.setLocation(c.getLocation());
-        contribution.setUnresolved(true);
-        return contribution;
-    }
-
-    /**
-     * Escape the space in URL string
-     * @param uri
-     * @return
-     */
-    static URI createURI(String uri) {
-        if (uri.indexOf(' ') != -1) {
-            uri = uri.replace(" ", "%20");
-        }
-        return URI.create(uri);
-    }
-
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/branches/2.0-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
deleted file mode 100644
index 800bdd84cc..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ /dev/null
@@ -1,17 +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.node.impl.NodeFactoryImpl
\ No newline at end of file
diff --git a/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java b/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java
deleted file mode 100644
index e3fcdfd25f..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package hello;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * HelloWorld interface
- */
-@Remotable
-public interface HelloWorld {
-    String hello(String name);
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
deleted file mode 100644
index c9a7560b12..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package hello;
-
-/**
- * HelloWorldImpl
- */
-public class HelloWorldImpl implements HelloWorld {
-    public String hello(String name) {
-        System.out.println("Hello: " + name);
-        return "Hello, " + name;
-    }
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/branches/2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
deleted file mode 100644
index dc0f37b987..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ /dev/null
@@ -1,82 +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.node.impl;
-
-import hello.HelloWorld;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test case for NodeImpl
- */
-public class NodeImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld2\">"
-            + " <component name=\"HelloWorld2\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        NodeFactory factory = new NodeFactoryImpl();
-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        Node node = factory.createNode(compositeURI, composite, contribution);
-        testNode2(node);
-    }
-    
-//    @Test
-//    public void testNodeWithRelativeCompositeURI() {
-//        NodeFactory factory = new NodeFactoryImpl();
-//        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());
-//        String compositeURI = "HelloWorld.composite";
-//        Node node = factory.createNode(compositeURI, contribution);
-//        testNode(node);
-//    }
-//
-//    @Test
-//    public void testDefaultNode() {
-//        testNode(new NodeFactoryImpl().createNode());
-//    }
-//    
-//    private void testNode(Node node) {
-//        node.start();
-//        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld");
-//        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-//        node.stop();
-//    }
-        
-    private void testNode2(Node node) {
-        node.start();
-        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld2");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-}
diff --git a/branches/2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite b/branches/2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite
deleted file mode 100644
index 27ddcb94a8..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-	targetNamespace="http://sample/composite"

-	xmlns:sc="http://sample/composite"

-	name="HelloWorld">

-

-    <component name="HelloWorld">

-        <implementation.java class="hello.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/branches/2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/branches/2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1149eb5cbf..0000000000
--- a/branches/2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-              xmlns:sc="http://sample/composite">
-    <deployable composite="sc:HelloWorld" />
-</contribution>