Moving 1.x branches

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

16 files changed, 0 insertions, 1098 deletions

diff --git a/branches/sca-java-0.99/modules/topology/DISCLAIMER b/branches/sca-java-0.99/modules/topology/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-0.99/modules/topology/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software

-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is

-required of all newly accepted projects until a further review indicates that

-the infrastructure, communications, and decision making process have stabilized

-in a manner consistent with other successful ASF projects. While incubation

-status is not necessarily a reflection of the completeness or stability of the

-code, it does indicate that the project has yet to be fully endorsed by the ASF.

-

diff --git a/branches/sca-java-0.99/modules/topology/LICENSE b/branches/sca-java-0.99/modules/topology/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-0.99/modules/topology/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/branches/sca-java-0.99/modules/topology/NOTICE b/branches/sca-java-0.99/modules/topology/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-0.99/modules/topology/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.99/modules/topology/pom.xml b/branches/sca-java-0.99/modules/topology/pom.xml
deleted file mode 100644
index 56ba0d72b4..0000000000
--- a/branches/sca-java-0.99/modules/topology/pom.xml
+++ /dev/null
@@ -1,44 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>0.99-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-topology</artifactId>
-    <name>Apache Tuscany Topology Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
deleted file mode 100644
index 512fa19645..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
+++ /dev/null
@@ -1,63 +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.topology;
-
-/**
- * Represents an SCA component and is used to represent which components
- * will run on a node
- *
- * @version $Rev$ $Date$
- */
-public interface Component {
-    
-    /**
-     * Get the compoent name
-     * 
-     * @return
-     */
-    public String getName();
-    
-    /**
-     * Set the compoent name
-     * 
-     * @param name
-     */
-    public void setName(String name);
-    
-    /**
-     * Get the name of the domain that this scheme belongs to
-     * Not sure in this case whether the domain name should
-     * be part of the component name but am keeping it 
-     * separate for now
-     * 
-     * @return
-     */
-    public String getDomainName();
-    
-    /**
-     * Set the name of the domain that this scheme belongs to
-     * Not sure in this case whether the domain name should
-     * be part of the component name but am keeping it 
-     * separate for now     
-     * 
-     * @param name
-     */
-    public void setDomainName(String domainName);    
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java
deleted file mode 100644
index ddeeac9a93..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java
+++ /dev/null
@@ -1,31 +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.topology;
-
-import org.apache.tuscany.sca.topology.impl.TopologyFactoryImpl;
-
-/**
- * A default factory for the topology model.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultTopologyFactory extends TopologyFactoryImpl implements TopologyFactory {
-
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
deleted file mode 100644
index a44e998e43..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.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 org.apache.tuscany.sca.topology;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Represents an SCA node implementation. An SCA node is a running instance
- * of a program able to run SCA assemblies. A distributes runtime contains
- * main nodes
- *
- * @version $Rev$ $Date$
- */
-public interface Node {
-    
-    /**
-     * Get the node name
-     * 
-     * @return
-     */
-    public String getName();
-    
-    /**
-     * Set the node name
-     * 
-     * @param name
-     */
-    public void setName(String name);
-    
-    /**
-     * Get domain names
-     * 
-     * @return
-     */
-    public Set<String> getDomainNames();    
-    
-    /**
-     * Return the Scheme/base URL pairs that this node uses for the 
-     * specified domain. 
-     * 
-     * @param domainName
-     * @return
-     */    
-    public List<Scheme> getSchemes(String domainName);
-
-    /**
-     * Return the list of components that this node will run for the
-     * specified domain
-     * 
-     * @param domainName
-     * @return
-     */
-    public List<Component> getComponents(String domainName);
-
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java
deleted file mode 100644
index 7775a3878f..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java
+++ /dev/null
@@ -1,48 +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.topology;
-
-import java.util.List;
-
-
-/**
- * Represents an SCA runtime.
- * 
- * TBD - just a place holder at the moment
- *
- * @version $Rev$ $Date$
- */
-public interface Runtime {
-
-    /**
-     * Returns the list of nodes that form this runtime
-     * 
-     * @return
-     */
-    public List<Node> getNodes();
-    
-    /**
-     * Get a node by node name
-     * 
-     * @param nodeName the name of the node to return
-     * @return the node
-     */
-    public Node getNode(String nodeName);
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java
deleted file mode 100644
index 794e43e8a6..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java
+++ /dev/null
@@ -1,72 +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.topology;
-
-
-/**
- * Represents an SCA scheme. This holds the base URL that a runtime node
- * will use by default to expose services
- *
- * @version $Rev$ $Date$
- */
-public interface Scheme {
-    
-    /**
-     * Get the scheme name
-     * 
-     * @return
-     */
-    public String getName();
-    
-    /**
-     * Set the scheme name
-     * 
-     * @param name
-     */
-    public void setName(String name);
-
-    /**
-     * Get the scheme base URL
-     * 
-     * @return
-     */
-    public String getBaseURL();
-    
-    /**
-     * Set the scheme base URL
-     * 
-     * @param name
-     */
-    public void setBaseURL(String urlString);
-    
-    /**
-     * Get the name of the domain that this scheme belongs to
-     * 
-     * @return
-     */
-    public String getDomainName();
-    
-    /**
-     * Set the name of the domain that this scheme belongs to
-     * 
-     * @param name
-     */
-    public void setDomainName(String domainName);
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
deleted file mode 100644
index 020b15ea17..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
+++ /dev/null
@@ -1,55 +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.topology;
-
-
-/**
- * A factory for the topology model.
- *
- * @version $Rev$ $Date$
- */
-public interface TopologyFactory {
-
-    
-    /**
-     * Creates a new runtime.
-     * @return
-     */
-    public Runtime createRuntime();    
-    
-    /**
-     * Creates a new node.
-     * @return
-     */
-    public Node createNode();   
-    
-    /**
-     * Creates a new scheme.
-     * @return
-     */
-     public Scheme createScheme();    
-    
-    /**
-     * Creates a new component.
-     * @return
-     */
-    public Component createComponent();      
-    
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
deleted file mode 100644
index 68364e3420..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
+++ /dev/null
@@ -1,72 +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.topology.impl;
-
-import org.apache.tuscany.sca.topology.Component;
-
-/**
- * Represents the scheme defintion for a domain.
- * 
- * TBD - just a place holder at the moment
- *
- * @version $Rev$ $Date$
- */
-public class ComponentImpl implements Component {
-    
-    private String name;
-    private String domainName;
-
-    /**
-     * Get the component name
-     * 
-     * @return
-     */
-    public String getName() {
-        return this.name;
-    }
-    
-    /**
-     * Set the component name
-     * 
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-   
-    /**
-     * Get the name of the domain that this component belongs to
-     * 
-     * @return
-     */
-    public String getDomainName() {
-        return domainName;
-    }
-    
-    /**
-     * Set the name of the domain that this component belongs to
-     * 
-     * @param name
-     */
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
deleted file mode 100644
index 0200376caa..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
+++ /dev/null
@@ -1,120 +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.topology.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.topology.Node;
-import org.apache.tuscany.sca.topology.Scheme;
-import org.apache.tuscany.sca.topology.Component;
-
-/**
- * Represents an SCA node implementation.
- *
- * @version $Rev$ $Date$
- */
-
-public class NodeImpl implements Node {
-    private HashMap<String, DomainContainer> nodeDomain = new HashMap<String, DomainContainer>();
-    private String name;
-    
-    public class DomainContainer {
-        private List<Scheme> schemes = new ArrayList<Scheme>();
-        private List<Component> components = new ArrayList<Component>();
-        
-        public List<Scheme> getSchemes() {
-            return schemes;
-        }
-        
-        public List<Component> getComponents() {
-            return components;
-        }        
-    }
-    
-    /**
-     * Constructs a new node.
-     */
-    protected NodeImpl() {
-    }
-    
-    /**
-     * Get the node name
-     * 
-     * @return
-     */    
-    public String getName() {
-        return name;
-    }
-    
-    /**
-     * Set the node name
-     * 
-     * @param name
-     */    
-    public void setName(String name) {
-        this.name = name;
-    }    
-    
-    /**
-     * Get domain names
-     * 
-     * @return
-     */
-    public Set<String> getDomainNames() {
-        return nodeDomain.keySet();
-    }
-    
-    /**
-     * Return the Scheme/base URL pairs that this node uses for the 
-     * specified domain. 
-     * 
-     * @param domainName
-     * @return
-     */    
-    public List<Scheme> getSchemes(String domainName) {
-        DomainContainer container = nodeDomain.get(domainName);
-        
-        if (container == null) {
-            container = new DomainContainer();
-            nodeDomain.put(domainName, container);
-        }
-        return container.getSchemes();
-    }
-
-    /**
-     * Return the list of components that this node will run for the
-     * specified domain
-     * 
-     * @param domainName
-     * @return
-     */
-    public List<Component> getComponents(String domainName) {
-        DomainContainer container = nodeDomain.get(domainName);
-        
-        if (container == null) {
-            container = new DomainContainer();
-            nodeDomain.put(domainName, container);
-        }
-        return container.getComponents();
-    }
-}
\ No newline at end of file
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java
deleted file mode 100644
index 9a4568deee..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java
+++ /dev/null
@@ -1,55 +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.topology.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.topology.Runtime;
-import org.apache.tuscany.sca.topology.Node;
-
-/**
- * Represents an SCA runtime.
- * 
- * TBD - just a place holder at the moment
- *
- * @version $Rev$ $Date$
- */
-public class RuntimeImpl implements Runtime {
-    private List<Node> nodes = new ArrayList<Node>();
-    
-    public List<Node> getNodes() {
-        return nodes;
-    }
-    
-    public Node getNode(String nodeName){
-        Node returnNode = null;
-        
-        for(Node node : getNodes()){
-            if ( node.getName().equals(nodeName)){
-                returnNode = node;
-                break;
-            }
-        }
-            
-        return returnNode;
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java
deleted file mode 100644
index ffd08cef92..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java
+++ /dev/null
@@ -1,91 +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.topology.impl;
-
-import org.apache.tuscany.sca.topology.Scheme;
-
-/**
- * Represents the scheme defintion for a domain.
- * 
- * TBD - just a place holder at the moment
- *
- * @version $Rev$ $Date$
- */
-public class SchemeImpl implements Scheme {
-    
-    private String name;
-    private String baseURL;
-    private String domainName;
-
-    /**
-     * Get the scheme name
-     * 
-     * @return
-     */
-    public String getName() {
-        return this.name;
-    }
-    
-    /**
-     * Set the scheme name
-     * 
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Get the scheme base URL
-     * 
-     * @return
-     */
-    public String getBaseURL() {
-        return baseURL;
-    }
-    
-    /**
-     * Set the scheme base URL
-     * 
-     * @param name
-     */
-    public void setBaseURL(String urlString) {
-        this.baseURL = urlString;
-    }
-    
-    /**
-     * Get the name of the domain that this scheme belongs to
-     * 
-     * @return
-     */
-    public String getDomainName() {
-        return domainName;
-    }
-    
-    /**
-     * Set the name of the domain that this scheme belongs to
-     * 
-     * @param name
-     */
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java b/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
deleted file mode 100644
index 793ed4a06d..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
+++ /dev/null
@@ -1,50 +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.topology.impl;
-
-import org.apache.tuscany.sca.topology.Component;
-import org.apache.tuscany.sca.topology.Node;
-import org.apache.tuscany.sca.topology.Runtime;
-import org.apache.tuscany.sca.topology.Scheme;
-import org.apache.tuscany.sca.topology.TopologyFactory;
-
-/**
- * A factory for the topology model.
- *
- * @version $Rev$ $Date$
- */
-public class TopologyFactoryImpl implements TopologyFactory {
-
-    public Runtime createRuntime() {
-        return new RuntimeImpl();
-    }
-
-    public Node createNode() {
-        return new NodeImpl();
-    }
-    
-    public Scheme createScheme() {
-        return new SchemeImpl();
-    }
-    
-    public Component createComponent() {       
-        return new ComponentImpl();
-    }
-}
diff --git a/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java b/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
deleted file mode 100644
index 0cf572ba57..0000000000
--- a/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
+++ /dev/null
@@ -1,105 +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.topology;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-
-/**
- * Test building of assembly model instances using the assembly factory.
- * 
- * @version $Rev$ $Date$
- */
-public class TopologyFactoryTestCase extends TestCase {
-
-    TopologyFactory topologyFactory;
-    
-    @Override
-    public void setUp() throws Exception {
-        topologyFactory = new DefaultTopologyFactory();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        topologyFactory = null;
-    }
-
-    public void testCreateRuntime() {
-        Runtime runtime = topologyFactory.createRuntime();
-        
-        List<Node> nodeList = runtime.getNodes();
-        assertNotNull(nodeList);
-    }
-
-    public void testCreateNode() {
-        Node node = topologyFactory.createNode();
-        
-        node.setName("nodeA");
-        assertEquals(node.getName(), "nodeA");
-        
-        List<Scheme> schemeList = node.getSchemes("domainA");
-        assertNotNull(schemeList);   
-        
-        List<Component> componentList = node.getComponents("domainA");
-        assertNotNull(componentList); 
-    }
-    
-    public void testCreateScheme() {
-        Scheme scheme = topologyFactory.createScheme();
-        
-        scheme.setName("http");
-        assertEquals(scheme.getName(), "http");
-        
-        scheme.setBaseURL("http://localhost:8080");
-        assertEquals(scheme.getBaseURL(), "http://localhost:8080");
-        
-        scheme.setDomainName("domainA");
-        assertEquals(scheme.getDomainName(), "domainA");
-        
-        Node node = topologyFactory.createNode();
-        List<Scheme> schemeList = node.getSchemes("domainA");
-        schemeList.add(scheme);
-        List<Scheme> schemeList1 = node.getSchemes("domainA");
-        Scheme scheme1 = schemeList1.get(0);
-        
-        assertEquals(scheme1.getName(), "http");
-        
-    }
-    
-    public void testCreateComponent() {
-        Component component = topologyFactory.createComponent();
-        
-        component.setName("componentA");
-        assertEquals(component.getName(), "componentA");
-               
-        component.setDomainName("domainA");
-        assertEquals(component.getDomainName(), "domainA");
-        
-        Node node = topologyFactory.createNode();
-        List<Component> componentList = node.getComponents("domainA");
-        componentList.add(component);
-        List<Component> componentList1 = node.getComponents("domainA");
-        Component component1 = componentList1.get(0);
-        
-        assertEquals(component1.getName(), "componentA");        
-    }    
-    
-}