Moving 1.x branches

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

13 files changed, 0 insertions, 792 deletions

diff --git a/branches/sca-java-0.99/modules/distributed/DISCLAIMER b/branches/sca-java-0.99/modules/distributed/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-0.99/modules/distributed/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/distributed/LICENSE b/branches/sca-java-0.99/modules/distributed/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-0.99/modules/distributed/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/distributed/NOTICE b/branches/sca-java-0.99/modules/distributed/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-0.99/modules/distributed/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/distributed/pom.xml b/branches/sca-java-0.99/modules/distributed/pom.xml
deleted file mode 100644
index a01403778e..0000000000
--- a/branches/sca-java-0.99/modules/distributed/pom.xml
+++ /dev/null
@@ -1,55 +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-distributed</artifactId>
-    <name>Apache Tuscany Distributed Domain Base Support</name>
-
-    <dependencies>   
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sca-api</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>      
-                    
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java
deleted file mode 100644
index 8ebaac82e1..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.distributed.domain;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;

-

-

-/**

- * A local representation of the sca domain distributed across a number

- * of separate nodes. This provides access to various information relating

- * to the distributed domain

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public abstract interface DistributedSCADomain {

-    

-    /**

-     * Returns the name of the node that this part of the

-     * distributed domain is running on

-     * 

-     * @return the node name

-     */

-    public abstract String getNodeName();

-    public abstract void setNodeName(String nodeName);    

-    

-    /**

-     * Returns the name of the distributed domain that this node

-     * is part of.

-     * 

-     * @return the domain name

-     */

-    public abstract String getDomainName();

-    public abstract void setDomainName(String domainName);

-    

-    /**

-     * Associates this distributed domain representation to all of the 

-     * sca binding objects within a composite. The sca binding uses this

-     * distributed domain representation for domain level operations like

-     * find the enpoints of remote services. 

-     * 

-     * @param composite the composite that this object will be added to 

-     */    

-    public void addDistributedDomainToBindings(Composite composite);

-    

-    /**

-     * Return an interface for registering and looking up remote services

-     * 

-     * @return The service discovery interface

-     */

-    public abstract ServiceDiscovery getServiceDiscovery();

-    

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
deleted file mode 100644
index 01d81df6d4..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
+++ /dev/null
@@ -1,51 +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.distributed.management;

-

-

-/**

- * Represents the mapping between protocols and baseuris for a given domain 

- * on a node

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface BaseUriMap {

-

-    /**

-     * Sets the name of the node that is responsible for running

-     * the named component

-     * 

-     * @param domainUri the string uri for the parent domain

-     * @param nodeUri the string uri for the node where the component will run

-     * @Param protocol the protocol that the uri represent, e.g. http or https

-     */

-    public void setBaseUri(String domainUri, String nodeUri, String protocol, String uri);

- 

-    /**

-     * Sets the name of the node that is responsible for running

-     * the named component

-     * 

-     * @param domainUri the string uri for the parent domain

-     * @param nodeUri the string uri for the node where the component will run

-     * @Param protocol the protocol that the uri represent, e.g. http or https

-     */

-    public String getBaseUri(String domainUri, String nodeUri, String protocol);

-    

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
deleted file mode 100644
index e86f20badf..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
+++ /dev/null
@@ -1,53 +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.distributed.management;

-

-

-/**

- * A management interface for components in the distributed domain

- * 

- * TODO - a minimum interface and closely related to 

- *        o.a.t.s.host.embedded.management.ComponentManager

- *        so we need to see how this works out

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface ComponentManager {

-       

-    /**

-     * Starts a named component

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the node

-     * @param componentName the name of the component to be started

-     */

-    public void startComponent(String domainUri, String nodeUri, String componentName);

-    

-    

-    /**

-     * Stops a named component

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the node

-     * @param componentName the name of the component to be started

-     */

-    public void stopComponent(String domainUri, String nodeUri, String componentName);

-     

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java
deleted file mode 100644
index a7b6b72b42..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java
+++ /dev/null
@@ -1,60 +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.distributed.management;

-

-import java.util.List;

-

-

-/**

- * Represents the mapping between components and runtime nodes.

- * 

- *

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface ComponentMap {

-    

-    /**

-     * Sets the name of the node that is responsible for running

-     * the named component

-     * 

-     * @param domainUri the string uri for the parent domain

-     * @param nodeUri the string uri for the node where the component will run

-     * @param componentName the string name for the component of interest

-     */

-    public void addComponent(String domainUri, String nodeUri, String componentName );

-    

-    /**

-     * Removes the named component from the map

-     *  

-     * @param domainUri the string uri for the parent domain

-     * @param nodeUri the string uri for the node where the component will run 

-     * @param componentName the string name for the component of interest 

-     */

-    public void removeComponent(String domainUri, String nodeUri, String componentName);

-    

-    /**

-     * Return the names of all components that will run on the specified node

-     * 

-     * @param domainUri the string uri for the parent domain

-     * @param nodeUri the string uri for the node where the component will run

-     * @return

-     */

-    public List<String> getComponentsForNode(String domainUri, String nodeUri);    

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
deleted file mode 100644
index 374f8a046b..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
+++ /dev/null
@@ -1,51 +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.distributed.management;

-

-

-/**

- * A management interface for contributions in the distributed domain

- * 

- * TODO - it's not clear what the level of granularity of contribution updates

- *        will be finaly in Tuscany as this aspect is still being implemented

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface ContributionManager {

-       

-    /**

-     * Accepts a new contribution and passes it onto the domain implementation

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the node

-     * @param contributionUri the string uri for the contribution to be added

-     */

-    public void addContribution(String domainUri, String nodeUri, String contributionUri);

-    

-    /**

-     * Removes the specified contribution from the domain

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the node

-     * @param contributionUri the string uri for the contribution to be removed

-     */

-    public void removeContribution(String domainUri, String nodeUri, String contributionUri);  

- 

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
deleted file mode 100644
index aa3c472c9e..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
+++ /dev/null
@@ -1,60 +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.distributed.management;

-

-import org.osoa.sca.annotations.Remotable;

-

-

-/**

- * The management interface for distributed domain. This is resposible for 

- * creating appropriate configuration on all the nodes that are running 

- * domain nodes for the distributed domain. 

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-@Remotable

-public interface DistributedDomainManager {

-

-    /**

-     * A node registers with the distributed domain manager. The mechanism whereby this

-     * registration interface is discovered is not defined. For example, JMS, JINI

-     * or a hard coded configuration could all be candidates in the java world. 

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node

-     * @param nodeManagementUrl the endpoint for the nodes management service

-     */

-    public void registerNode(String domainUri, String nodeUri, String nodeManagementUrl);

-    

-    /**

-     * Retrieve the configuration for the specified node. The return type is interesting

-     * here. There are many ways in which all of the information that comprises a 

-     * configuration can be provisioned onto a node, for example, shared file system,

-     * ftp, http. The return value is the url of where to look for the configuration 

-     * information. From a management point of view it is convenient to maintain all 

-     * current and previous node configurations. This can easily be achieved by providing

-     * a different URL each time the configuration is changed. 

-     *  

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node

-     * @return the URL from where the configuration can be retrieved

-     */

-    public String getDomainNodeConfiguration(String domainUri, String nodeUri);  

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
deleted file mode 100644
index 9654ba7914..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.distributed.management;

-

-

-/**

- * The management interface for the part of the distributed domain that

- * runs on a node

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface DomainNodeManager {

-

-    /**

-     * Creates the internal structures to represent the distributed domain on this 

-     * node

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node

-     */

-    public void createDomainNode(String domainUri, String nodeUri);

-    

-    /**

-     * Starts the domain running on the current node

-     *  

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node

-     */

-    public void startDomainNode(String domainUri, String nodeUri);

-    

-    /**

-     * Stops the running domain on the current node

-     *  

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node 

-     */

-    public void stopDomainNode(String domainUri, String nodeUri);    

- 

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
deleted file mode 100644
index 44abb3ad21..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
+++ /dev/null
@@ -1,61 +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.distributed.management;

-

-

-/**

- * The management interface for a node

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-public interface NodeManager {

-

-    /**

-     * Starts the node and assigns a uri to the node. For covenience this 

-     * uri should be the URL of the service that provides this interface

-     * 

-     * @param nodeUri the string uri for the current node

-     */

-    public void start(String nodeUri);

-    

-    /**

-     * Starts the node running 

-     *  

-     */

-    public void stop();

-    

-    /**

-     * The node joins the distributed domain specified by the 

-     * domainUri. 

-     *  

-     * @param domainUri the string uri for the distributed domain

-     */

-    public void joinDomain(String domainUri);    

-    

-    /**

-     * The configuration of a domain running on this node has changed.

-     * It is the responsibility of the node to respond to this and retrieve

-     * any relevent configuration changes 

-     *  

-     * @param domainUri the string uri for the distributed domain

-     */

-    public void domainNodeConfigurationChange(String domainUri);   

- 

-}

diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java b/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
deleted file mode 100644
index b2a9e6fa57..0000000000
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.distributed.management;

-

-import org.osoa.sca.annotations.Remotable;

-

-

-/**

- * Provides a mechanism whereby service enoints can be shared amongst the 

- * nodes of a distributed domain.

- * 

- * @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $

- */

-@Remotable

-public interface ServiceDiscovery {

-   

-    /**

-     * Accepts information about a service endpoint and holds onto it

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param nodeUri the string uri for the current node

-     * @param serviceName the name of the service that is exposed and the provided endpoint

-     * @param bindingName the remote binding that is providing the endpoint

-     * @param url the enpoint url

-     * @return TBD - information about the registration

-     */

-    public String registerServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL);

-    

-    /**

-     * Locates information about a service endpoint 

-     * 

-     * @param domainUri the string uri for the distributed domain

-     * @param serviceName the name of the service that is exposed and the provided endpoint

-     * @param bindingName the remote binding that we want to find an endpoint for

-     * @return url the endpoint url

-     */

-    public String findServiceEndpoint(String domainUri, String serviceName, String bindingName);  

- 

-}