Moving 2.x contribs

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

18 files changed, 0 insertions, 1667 deletions

diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
deleted file mode 100644
index 28eede693d..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ /dev/null
@@ -1,328 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-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.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Sample RunComponents task
- *
- * Under construction... This sample is similar to the DistributeComponents sample,
- * with extra steps to configure SCA runtime nodes with the models, start and stop
- * them.
- *
- * @version $Rev$ $Date$
- */
-public class DistributeAndRunComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-    private static CompositeBuilder nodeCompositeBuilder;
-    private static NodeImplementationFactory nodeFactory;
-    private static AtomBindingFactory atomBindingFactory;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();        
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // 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);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory,
-                                                            documentBuilderFactory, transformerFactory, contractMapper, null, monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Map<Contribution, List<Contribution>> contributionDependencies = new HashMap<Contribution, List<Contribution>>();
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());
-                }
-            }
-            
-            contributionDependencies.put(contribution, dependencies);
-        }
-        
-        // Create a set of nodes, and assign the sample deployables to them
-        Map<Component, List<Contribution>> nodeDependencies = new HashMap<Component, List<Contribution>>();
-        Composite cloudComposite = assemblyFactory.createComposite();
-        cloudComposite.setName(new QName("http://sample", "cloud"));
-        int nodeID = 8100;
-        for (Contribution contribution: workspace.getContributions()) {
-            for (Composite deployable: contribution.getDeployables()) {
-                
-                // Create a node
-                Component node = assemblyFactory.createComponent();
-                node.setName("Node" + nodeID);
-                cloudComposite.getComponents().add(node);
-                
-                // Add default binding configuration to the node, our samples use
-                // Atom bindings so here we're just creating default Atom binding
-                // configurations, but all the other binding types can be configured
-                // like that too
-                ComponentService nodeService = assemblyFactory.createComponentService();
-                Binding binding = atomBindingFactory.createAtomBinding();
-                binding.setURI("http://localhost:" + (8100 + nodeID));
-                nodeService.getBindings().add(binding);
-                node.getServices().add(nodeService);
-
-                // Assign a deployable to the node
-                NodeImplementation nodeImplementation = nodeFactory.createNodeImplementation();
-                nodeImplementation.setComposite(deployable);
-                node.setImplementation(nodeImplementation);
-                
-                // Keep track of what contributions will be needed by the node
-                nodeDependencies.put(node, contributionDependencies.get(contribution));
-                
-                nodeID++;
-            }
-        }
-        
-        // Print the model describing the nodes that we just built
-        System.out.println("cloud.composite");
-        System.out.println(print(cloudComposite));
-        
-        // Build the nodes, this will apply their default binding configuration to the
-        // composites assigned to them
-        nodeCompositeBuilder.build(cloudComposite);
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        System.out.println("domain.composite");
-        System.out.println(print(domainComposite));
-        
-        // Now start our SCA nodes
-        List<SCANode> runtimeNodes = new ArrayList<SCANode>();
-        NodeLauncher launcher = NodeLauncher.newInstance();
-        for (Component node: cloudComposite.getComponents()) {
-            
-            // Create a composite containing the components that we want to run
-            // on the node
-            Composite runnable = assemblyFactory.createComposite();
-            runnable.setName(new QName("http://sample", node.getName()));
-            NodeImplementation nodeImplementation = (NodeImplementation)node.getImplementation();
-            for (Component component: nodeImplementation.getComposite().getComponents()) {
-                for (Component configured: domainComposite.getComponents()) {
-                    if (configured.getName().equals(component.getName())) {
-                        runnable.getComponents().add(configured);
-                        break;
-                    }
-                }
-            }
-
-            // Create the SCA node, give it the composite and the list of contributions
-            // to use
-            List<Contribution> dependencies = nodeDependencies.get(node);
-            org.apache.tuscany.sca.node.launcher.Contribution[] contributions = new org.apache.tuscany.sca.node.launcher.Contribution[dependencies.size()];
-            for (int c =0, n = dependencies.size(); c < n; c++) {
-                Contribution dependency = dependencies.get(c);
-                contributions[c] = new org.apache.tuscany.sca.node.launcher.Contribution(dependency.getURI(), dependency.getLocation());
-            }
-            SCANode runtimeNode = launcher.createNode("http://sample/" + node.getName(), print(runnable), contributions);
-            
-            // Start the node
-            runtimeNode.start();
-            runtimeNodes.add(runtimeNode);
-        }
-        
-        System.out.println("Nodes are running, press enter to stop...");
-        System.in.read();
-        
-        for (SCANode runtimeNode: runtimeNodes) {
-            runtimeNode.stop();
-        }
-    }
-
-    private static String print(Composite composite) throws XMLStreamException, ContributionWriteException, ParserConfigurationException, SAXException, IOException {
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(composite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        XMLSerializer serializer = new XMLSerializer(out, format);
-        serializer.serialize(document);
-        return out.toString();
-    }
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
deleted file mode 100644
index def0a1894f..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ /dev/null
@@ -1,288 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-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.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Sample DistributeComponents task
- *
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites, componentTypes etc.) and assembe and wire the
- * deployable composites together in a composite model representing an SCA
- * domain composite.
- * 
- * The difference between this sample and the WireComponents sample is an
- * extra step to allocate deployable composites to SCA nodes. SCA nodes allow
- * you to provide default configuration for the deploayable composites allocated
- * to them, for example default binding configuration. 
- * 
- * The sample first reads the SCA metadata for three sample contributions,
- * reads and resolve the artifacts contained in the contributions, includes all their
- * deployable composites in a composite model representing an SCA domain, then
- * uses several composite builder utilities to configure them as specified in the
- * SCA nodes hosting them and assemble and wire them together.
- * Finally it prints the resulting domain composite model, showing service bindings
- * configured with the URIs from the nodes hosting them.
- *
- * @version $Rev$ $Date$
- */
-public class DistributeComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-    private static CompositeBuilder nodeCompositeBuilder;
-    private static NodeImplementationFactory nodeFactory;
-    private static AtomBindingFactory atomBindingFactory;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // 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);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory,
-                                                            documentBuilderFactory, transformerFactory, contractMapper, null, monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());
-                }
-            }
-        }
-        
-        // Create a set of nodes, and assign the sample deployables to them
-        Composite cloudComposite = assemblyFactory.createComposite();
-        cloudComposite.setName(new QName("http://sample", "cloud"));
-        for (int i = 0, n = workspace.getDeployables().size(); i < n; i++) {
-            
-            // Create a node
-            Component node = assemblyFactory.createComponent();
-            node.setName("Node" + i);
-            cloudComposite.getComponents().add(node);
-            
-            // Add default binding configuration to the node, our samples use
-            // Atom bindings so here we're just creating default Atom binding
-            // configurations, but all the other binding types can be configured
-            // like that too
-            ComponentService nodeService = assemblyFactory.createComponentService();
-            Binding binding = atomBindingFactory.createAtomBinding();
-            binding.setURI("http://localhost:" + (8100 + i));
-            nodeService.getBindings().add(binding);
-            node.getServices().add(nodeService);
-
-            // Assign a deployable to the node
-            NodeImplementation nodeImplementation = nodeFactory.createNodeImplementation();
-            Composite deployable = workspace.getDeployables().get(i);
-            nodeImplementation.setComposite(deployable);
-            node.setImplementation(nodeImplementation);
-        }
-        
-        // Print the model describing the nodes that we just built
-        System.out.println("cloud.composite");
-        print(cloudComposite);
-        System.out.println();
-        
-        // Build the nodes, this will apply their default binding configuration to the
-        // composites assigned to them
-        nodeCompositeBuilder.build(cloudComposite);
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        System.out.println("domain.composite");
-        print(domainComposite);
-    }
-
-    private static void print(Composite composite) throws XMLStreamException, ContributionWriteException, ParserConfigurationException, SAXException, IOException {
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(composite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(System.out, format);
-        serializer.serialize(document);
-    }
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java
deleted file mode 100644
index 27cb31d57f..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java
+++ /dev/null
@@ -1,158 +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 manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-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.Implementation;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-/**
- * Sample ListComponents task.
- *
- * This sample shows how to use subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites and componentTypes).
- * 
- * The sample first reads the SCA metadata for two sample contributions, then displays
- * their dependencies, reads and resolve the artifacts contained in the contributions,
- * and finally prints the deployables composites and the components they declare as
- * well as their main characteristics (showing that their interfaces and implementations
- * for example are actually resolved).
- *
- * @version $Rev$ $Date$
- */
-public class ListComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get workspace contribution factory
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.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);
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Build the store contribution dependencies
-        List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(storeContribution, workspace);
-        
-        // Resolve the contributions
-        for (Contribution contribution: dependencies) {
-            contributionProcessor.resolve(contribution, workspace.getModelResolver());
-        }
-        
-        // List the components declared in the deployables found in the
-        // contribution, their services, bindings, interfaces, and implementations
-        for (Composite deployable: storeContribution.getDeployables()) {
-            System.out.println("Deployable: " + deployable.getName());
-            for (Component component: deployable.getComponents()) {
-                System.out.println("  component: " + component.getName());
-                for (ComponentService componentService: component.getServices()) {
-                    System.out.println("    componentService: " + componentService.getName());
-                    for (Binding binding: componentService.getBindings()) {
-                        System.out.println("      binding: " + binding.getClass() + " - " + binding.getURI());
-                    }
-                }
-                Implementation implementation = component.getImplementation();
-                System.out.println("    implementation: " + implementation);
-                for (Service service: implementation.getServices()) {
-                    System.out.println("      service: " + service.getName());
-                    InterfaceContract contract = service.getInterfaceContract();
-                    System.out.println("        interface: " + contract.getInterface());
-                }
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
deleted file mode 100644
index 1bf8124682..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ /dev/null
@@ -1,108 +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 manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-/**
- * Sample ListDependencies task.
- * 
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies given a set of
- * available contributions.
- * 
- * The sample reads the SCA metadata for two sample contributions then
- * prints their dependencies.
- *
- * @version $Rev$ $Date$
- */
-public class ListDependencies {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static WorkspaceFactory workspaceFactory;
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-
-    private static void init() throws Exception {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Get contribution, workspace and assembly model factories
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        
-        // Create contribution info processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-
-        // Create a monitor
-        UtilityExtensionPoint services = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = services.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-        
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-
-        // Read the contribution info for the sample contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = (Contribution)contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-        
-        // Read the contribution info for the assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-        
-        // List the contribution dependencies of each contribution
-        for (Contribution contribution: workspace.getContributions()) {
-            System.out.println("Contribution: " + contribution.getURI());
-            for (Contribution dependency: contributionDependencyBuilder.buildContributionDependencies(contribution, workspace)) {
-                System.out.println("  dependency: " + dependency.getURI());
-            }
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
deleted file mode 100644
index f5f0b9c655..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-/**
- * Sample ListDeployables task.
- *
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata.
- * 
- * The sample reads the SCA metadata for two sample contributions then
- * prints the names of their deployable composites.
- *
- * @version $Rev$ $Date$
- */
-public class ListDeployables {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create contribution info processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-    }
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Read the contribution info for the sample contribution
-        URI uri = URI.create("store");
-        URL url = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution contribution = contributionProcessor.read(null, uri, url);
-        
-        // List the deployables in the contribution
-        for (Composite deployable: contribution.getDeployables()) {
-            System.out.println("Deployable: " + deployable.getName());
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java
deleted file mode 100644
index d24d5c67c9..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java
+++ /dev/null
@@ -1,218 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-
-/**
- * Sample WireComponents task.
- * 
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites, componentTypes etc.) and assembe and wire the
- * deployable composites together in a composite model representing an SCA
- * domain composite.
- * 
- * The sample first reads the SCA metadata for three sample contributions,
- * reads and resolve the artifacts contained in the contributions, includes all their
- * deployable composites in a composite model representing an SCA domain, then
- * uses a composite builder utility to assemble and wire the composites together.
- * Finally it prints the resulting domain composite model.
- *
- * @version $Rev$ $Date$
- */
-public class WireComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();        
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        
-        // 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);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(contribution, workspace.getModelResolver());
-                }
-            }
-        }
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(domainComposite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(System.out, format);
-        serializer.serialize(document);
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java b/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java b/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java
+++ /dev/null
@@ -1,66 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    private String origin;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price, String origin) {
-        this.name = name;
-        this.price = price;
-        this.origin = origin;
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
deleted file mode 100644
index f053ec9f48..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ /dev/null
@@ -1,57 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartClientImpl implements Cart {
-    
-    @Reference
-    public Cart cart;
-    
-    public Entry<String, Item>[] getAll() {
-        return cart.getAll();
-    }
-
-    public Item get(String key) throws NotFoundException {
-        return cart.get(key);
-    }
-
-    public String post(String key, Item item) {
-        return cart.post(key, item);
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        cart.delete(key);
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        return cart.query(queryString);
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
deleted file mode 100644
index 9ef59df7a8..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ /dev/null
@@ -1,100 +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 services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    public void init() {
-        cart = new HashMap<String, Item>();
-    }
-
-    public Entry<String, Item>[] getAll() {
-        Entry<String, Item>[] entries = new Entry[cart.size()];
-        int i = 0;
-        for (Map.Entry<String, Item> e: cart.entrySet()) {
-            entries[i++] = new Entry<String, Item>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-
-    public Item get(String key) throws NotFoundException {
-        Item item = cart.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key ="cart-" + UUID.randomUUID().toString();
-        }
-        cart.put(key, item);
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        if (!cart.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            cart.clear();
-        } else {
-            Item item = cart.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, Item> e: cart.entrySet()) {
-                Item item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, Item>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml
deleted file mode 100644
index 10693a89e6..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <id>assets</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/assets</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/test-classes/services</directory>
-            <outputDirectory>/services</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml
deleted file mode 100644
index 5b34693bee..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<assembly>
-    <id>client</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/client</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml
deleted file mode 100644
index d19b7eb161..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<assembly>
-    <id>store</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/store</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index 33fe814c3a..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="services"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
deleted file mode 100644
index 14e1cdb672..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/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://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <deployable composite="s:client"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite b/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite
deleted file mode 100644
index 1279b319c4..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="client">
-		
-	<component name="ShoppingCartClient">

-		<implementation.java class="services.ShoppingCartClientImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCartClient/Cart"/>
-		</service>    	
-		<reference name="cart" target="ShoppingCart">
-			<t:binding.atom/>
-		</reference>		

-	</component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 52348106f2..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/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://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <deployable composite="s:store"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite b/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite
deleted file mode 100644
index d4f18771d8..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store">
-		
-	<component name="ShoppingCart">

-		<implementation.java class="services.ShoppingCartImpl"/>

-		<service name="Cart">

-			<t:binding.atom uri="/ShoppingCart/Cart"/>

-		</service>    	

-	</component>

-    

-</composite>