Moving 1.x branches

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

18 files changed, 1448 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2/modules/domain/DISCLAIMER
new file mode 100644
index 0000000000..d68a410903
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/DISCLAIMER
@@ -0,0 +1,8 @@
+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/sca-java-1.x/branches/sca-java-1.2/modules/domain/LICENSE b/sca-java-1.x/branches/sca-java-1.2/modules/domain/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/LICENSE
@@ -0,0 +1,205 @@
+
+                                 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/sca-java-1.x/branches/sca-java-1.2/modules/domain/NOTICE b/sca-java-1.x/branches/sca-java-1.2/modules/domain/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2/modules/domain/pom.xml
new file mode 100644
index 0000000000..73e7973e86
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/pom.xml
@@ -0,0 +1,73 @@
+<?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>1.2-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-domain</artifactId>
+    <name>Apache Tuscany SCA Domain</name>
+
+    <dependencies>   
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+        </dependency>   
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+        </dependency> 
+        
+         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+        </dependency>  
+                    
+         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-api</artifactId>
+            <version>1.2-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/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
new file mode 100644
index 0000000000..82d7d78b67
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
@@ -0,0 +1,165 @@
+/*
+ * 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.domain;
+
+import org.apache.tuscany.sca.domain.DomainException;
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * Represents an SCA domain API to be accessed remotely
+ * 
+ * @version $Rev: 580520 $ $Date: 2007-09-29 00:50:25 +0100 (Sat, 29 Sep 2007) $
+ */
+@Remotable
+public interface SCADomainAPIService {
+    
+    /**
+     * Start all of the services in the domain.
+     */
+    public void start() 
+      throws DomainException;  
+
+    /**
+     * Stop all of the services in the domain.
+     */
+    public void stop()
+      throws DomainException; 
+
+    /**
+     * Destroy the SCA domain.
+     */
+    public void destroyDomain()
+      throws DomainException;
+
+    /**
+     * Returns the URI of the SCA Domain. That URI is the endpoint of the
+     * SCA domain administration service.
+     * 
+     * @return the URI of the SCA Domain
+     */
+    public String getURI();
+    
+    /**
+     * Add an SCA contribution to the domain.
+     *  
+     * @param contributionURI the URI of the contribution
+     * @param contributionURL the URL of the contribution
+     * @throws DomainException
+     */  
+    public void addContribution(String contributionURI, String contributionURL)
+      throws DomainException;
+    
+    /**
+     * Update an SCA contribution that has previousle been added to the domain.
+     *  
+     * @param contributionURI the URI of the contribution
+     * @param contributionURL the URL of the contribution
+     * @throws DomainException
+     */  
+    public void updateContribution(String contributionURI, String contributionURL)
+      throws DomainException;    
+    
+    /**
+     * Remove a contribution from the domain.
+     * 
+     * @param contributionURI the URI of the contribution
+     * @throws DomainException
+     */
+    public void removeContribution(String contributionURI)
+      throws DomainException; 
+    
+    /**
+     * Add the supplied composite XML to the identified contribution
+     * 
+     * @param contributionURI the URI of the contribution
+     * @param compositeXML the XML string of the composite 
+     * @throws DomainException
+     */
+    public void addDeploymentComposite(String contributionURI, String compositeXML)
+      throws DomainException;
+    
+    /**
+     * Use the supplied composite XML to update the identified contribution
+     * 
+     * @param contributionURI the URI of the contribution
+     * @param compositeXML the XML string of the composite 
+     * @throws DomainException
+     */
+    public void updateDeploymentComposite(String contributionURI, String compositeXML)
+      throws DomainException;    
+
+    /**
+     * Add a deployable composite to the domain.
+     * 
+     * @param compositeQName the QName of the composite
+     * @throws DomainException     
+     */
+    public void addToDomainLevelComposite(String compositeQName)
+      throws DomainException;
+    
+    /**
+     * Remove a deployable composite from the domain.
+     * 
+     * @param compositeQName the QName of the composite
+     * @throws DomainException     
+     */
+    public void removeFromDomainLevelComposite(String compositeQName)
+      throws DomainException; 
+    
+    /**
+     * Returns an XML string representation of the domain level composite
+     * 
+     * @return xml representing the domain level composite
+     */
+    public String getDomainLevelComposite()
+      throws DomainException;
+    
+    /**
+     * Returns an XML String representation of a artifact from within the 
+     * domain namespace formed by the domain level composite
+     * 
+     * @return xml representing the specified artifact
+     */
+    public String getQNameDefinition(String artifact)
+      throws DomainException;
+    
+    /**
+     * Start a composite. The domain is responsible for starting all the
+     * components in the composite. It may decompose the composite into
+     * one or more smaller composites and load these composites into
+     * an appropriate SCA node for execution.
+     * 
+     * @param compositeQName The QName of the composite
+     * @throws DomainException
+     */
+    public void startComposite(String compositeQName)
+      throws DomainException;
+    
+    /**
+     * Stop a composite. The domain will stop all the components from the
+     * specified composite.
+     * 
+     * @param compositeQName The QName of the composite
+     * @throws DomainException
+     */
+    public void stopComposite(String compositeQName)
+      throws DomainException;
+}
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
new file mode 100644
index 0000000000..fd50ba348a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
@@ -0,0 +1,154 @@
+/*
+ * 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.domain;
+
+import java.io.Externalizable;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.apache.tuscany.sca.domain.model.NodeModel;
+import org.apache.tuscany.sca.domain.model.NodeModel.LifecyleState;
+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-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+@Remotable
+public interface SCADomainEventService {
+    
+    // constants
+    public static final String SERVICE_NOT_KNOWN = "SERVICE_NOT_KNOWN";
+    public static final String SERVICE_NOT_REGISTERED = "SERVICE_NOT_REGISTERED";
+
+    /**
+     * Add information about a node in the domain
+     * 
+     * @param nodeURI
+     * @param nodeURL
+     * @return
+     */
+    public void registerNode(String nodeURI, String nodeURL, Externalizable nodeManageReference) throws DomainException;
+        
+    /**
+     * Remove information about a node in a domain
+     * 
+     * @param nodeURI
+     * @param nodeURL
+     * @return
+     */
+    public void unregisterNode(String nodeURI) throws DomainException;
+    
+    /**
+     * Tell the domain that a node has been started through the local API
+     * 
+     * @param nodeURI the URI of the node being started
+     * @throws DomainException
+     */
+    public void registerNodeStart(String nodeURI) throws DomainException;
+    
+    /**
+     * Tell the domain that a node has been stopped through the local API
+     * 
+     * @param nodeURI
+     * @throws DomainException
+     */
+    public void registerNodeStop(String nodeURI) throws DomainException;
+
+    /**
+     * In the case where a contribution is added at a node this method is used to 
+     * record the relationship directly. This is different from adding a contribution
+     * to a domain as the contribution has already been allocated to a node
+     * 
+     * @param nodeURI the string uri for the node
+     * @param contributionURI the string uri for the contribution
+     * @param nodeURL the location of the contribution
+     * @return
+     */
+    public void registerContribution(String nodeURI, String contributionURI, String contributionURL) throws DomainException;
+    
+
+    /** 
+     * In the case where a contribution is removed from a node locally this method is
+     * used to remove the contribution from the domain
+     * 
+     * @param nodeURI the string uri for the node
+     * @param contributionURI the string uri for the contribution
+     * @return
+     */
+    public void unregisterContribution(String nodeURI, String contributionURI) throws DomainException;     
+
+    /**
+     * In the case where a composite is added to the domain level composite at a node this 
+     * method is used to record the event with the domain. 
+     * 
+     * @param nodeURI the string uri for the node
+     * @param compositeQNameString the string QName of the composite
+     * @throws DomainException
+     */
+    public void registerDomainLevelComposite(String nodeURI, String compositeQNameString) throws DomainException;
+    
+    /**
+     * 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 endpoint url
+     * @return TBD - information about the registration
+     */
+    public void registerServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL) throws DomainException;
+    
+    /**
+     * Removes information about a service endpoint
+     * 
+     * @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
+     */    
+    public void unregisterServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName) throws DomainException;
+     
+    /**
+     * Locates information about a service endpoint 
+     * 
+     * @param domainUri the string uri for the distributed domain
+     * @param serviceName the name of the service to be found
+     * @param bindingName the remote binding that we want to find an endpoint for
+     * @return url the endpoint url or SERVICE_NOT_REGISTERED
+     */
+    public String findServiceEndpoint(String domainUri, String serviceName, String bindingName) throws DomainException;
+    
+    /**
+     * Determines node that a service is avaialable on
+     * @param domainURI the string uri for the distributed domain
+     * @param serviceName the name of the service to be found
+     * @param bindingName the remote binding that we want to find an endpoint for
+     * @return name of node running service or SERVICE_NOT_KNOWN (it's not been contributed) or SERVICE_NOT_REGISTERED (it's been contributed but isn;t running)
+     * @throws DomainException
+     */
+    public String findServiceNode(String domainURI, String serviceName, String bindingName) throws DomainException;
+     
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
new file mode 100644
index 0000000000..c637b54189
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
@@ -0,0 +1,53 @@
+/*
+ * 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.domain;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.domain.DomainException;
+import org.apache.tuscany.sca.domain.SCADomain;
+import org.apache.tuscany.sca.domain.model.DomainModel;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Represents an SCA domain SPI.
+ * 
+ * @version $Rev: 580520 $ $Date: 2007-09-29 00:50:25 +0100 (Sat, 29 Sep 2007) $
+ */
+public interface SCADomainSPI {
+
+    
+    /** 
+     * Returns the model of the domain
+     * @return
+     */
+    public DomainModel getDomainModel();
+    
+    /**
+     * Registers all of the services in the composite with the domain
+     * 
+     * @param composite
+     */
+ //   public void registerRemoteServices(String nodeURI, Composite composite);
+  
+    
+}
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
new file mode 100644
index 0000000000..5db991edd1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
@@ -0,0 +1,72 @@
+/*
+ * 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.domain.management;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.domain.model.CompositeModel;
+import org.apache.tuscany.sca.domain.model.ContributionModel;
+import org.apache.tuscany.sca.domain.model.ServiceModel;
+
+
+/**
+ * A collection of info for a contribution
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface ContributionInfo {
+    
+    
+    /**
+     * Retrieve the contribution uri
+     * 
+     * @return contribution uri
+     */
+    public String getContributionURI();
+    
+    /**
+     * Set the contribution uri
+     * 
+     * @param contributionURI
+     */    
+    public void setContributionURI(String contributionURI);    
+    
+    /**
+     * Retrieve the contribution url
+     * 
+     * @return contribution url
+     */    
+    public URL getContributionURL();
+   
+    /**
+     * Set the contribution url
+     * 
+     * @param contributionURL
+     */    
+    public void setContributionURL(URL contributionURL);
+    
+    public List<QName> getComposites();       
+    public List<QName> getDeployableComposites();
+ 
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
new file mode 100644
index 0000000000..b8c756b89f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
@@ -0,0 +1,72 @@
+/*
+ * 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.domain.management;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.domain.model.CompositeModel;
+import org.apache.tuscany.sca.domain.model.ContributionModel;
+import org.apache.tuscany.sca.domain.model.NodeModel;
+
+
+/**
+ * A data transport object for the management interface
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface DomainInfo {
+    
+    /**
+     * Retrieve the domain uri
+     * 
+     * @return domain uri
+     */
+    public String getDomainURI();
+    
+    /**
+     * Set the domain uri
+     * 
+     * @param domainURI
+     */    
+    public void setDomainURI(String domainURI);    
+    
+    /**
+     * Retrieve the domain url
+     * 
+     * @return domain url
+     */    
+    public String  getDomainURL();
+   
+    /**
+     * Set the domain url
+     * 
+     * @param domainURL
+     */    
+    public void setDomainURL(String domainURL);    
+    
+    public List<String> getNodes();
+    public List<String> getContributions();
+    public List<QName> getDeployedComposites();
+ 
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
new file mode 100644
index 0000000000..0590cb6c30
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
@@ -0,0 +1,72 @@
+/*
+ * 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.domain.management;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.domain.model.CompositeModel;
+import org.apache.tuscany.sca.domain.model.ContributionModel;
+import org.apache.tuscany.sca.domain.model.ServiceModel;
+
+
+/**
+ * A collection of info for a registered node
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface NodeInfo {
+    
+    /**
+     * Retrieve the node uri
+     * 
+     * @return node uri
+     */
+    public String getNodeURI();
+    
+    /**
+     * Set the node uri
+     * 
+     * @param nodeURI
+     */    
+    public void setNodeURI(String nodeURI);    
+    
+    /**
+     * Retrieve the node url
+     *
+     * @return node url
+     */    
+    public String getNodeURL();
+   
+    /**
+     * Set the node url
+     * 
+     * @param nodeURL
+     */    
+    public void setNodeURL(String nodeURL);
+   
+    public List<String> getContributions();
+    public List<QName> getDeployedComposites();
+    public List<String> getServices();
+ 
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
new file mode 100644
index 0000000000..c0ae892329
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
@@ -0,0 +1,56 @@
+/*
+ * 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.domain.management;
+
+import org.apache.tuscany.sca.domain.SCADomain;
+import org.apache.tuscany.sca.domain.SCADomainEventService;
+import org.apache.tuscany.sca.domain.SCADomainSPI;
+
+
+
+/**
+ * Connects the domain to the domain manager service
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-11 18:45:36 +0100 (Tue, 11 Sep 2007) $
+ */
+public interface SCADomainManagerInitService {
+    
+    /**
+     * Set the domain  object
+     * 
+     * @param domain
+     */
+    public void setDomain(SCADomain domain);
+     
+    /**
+     * Set the domain SPI object
+     * 
+     * @param domain
+     */
+    public void setDomainSPI(SCADomainSPI domainSPI);
+    
+    /**
+     * Set the domain event object
+     * 
+     * @param domain
+     */
+    public void setDomainEventService(SCADomainEventService domainEventService);    
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
new file mode 100644
index 0000000000..c908515aaf
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
@@ -0,0 +1,48 @@
+/*
+ * 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.domain.management;
+
+import org.apache.tuscany.sca.domain.model.DomainModel;
+import org.osoa.sca.annotations.Remotable;
+
+
+
+/**
+ * Connects the domain management operations
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-11 18:45:36 +0100 (Tue, 11 Sep 2007) $
+ */
+@Remotable
+public interface SCADomainManagerService {
+     
+    /**
+     * Return description of the domain
+     * 
+     */
+    public DomainInfo getDomainDescription();
+    
+    /**
+     * Return description of the node
+     * 
+     * @param nodeURI
+     */
+    public NodeInfo getNodeDescription(String nodeURI); 
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
new file mode 100644
index 0000000000..5a634da69f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
@@ -0,0 +1,63 @@
+/*
+ * 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.domain.model;
+
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Composite;
+
+
+/**
+ * A composite. 
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface CompositeModel {
+    
+    /**
+     * Retrieve the composite qname
+     * 
+     * @return composite qname
+     */
+    public QName getCompositeQName();
+    
+    /**
+     * Set the composite qname
+     * 
+     * @param compositeQName
+     */    
+    public void setCompositeQName(QName compositeQName);  
+    
+    /**
+     * Retrieve the assembly composite object
+     * 
+     * @return composite
+     */
+    public Composite getComposite();
+    
+    /** 
+     * Set the assembly composite object
+     * 
+     * @param composite
+     */
+    public void setComposite(Composite composite);
+ 
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
new file mode 100644
index 0000000000..dc3b031483
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
@@ -0,0 +1,80 @@
+/*
+ * 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.domain.model;
+
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+
+/**
+ * A contribution.
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface ContributionModel {
+    
+    /**
+     * Retrieve the contribution object
+     * 
+     * @return contribution 
+     */
+    public Contribution getContribution();
+    
+    /**
+     * Set the contribution object
+     * 
+     * @param contribution
+     */    
+    public void setContribution(Contribution contribution);        
+    
+    /**
+     * Retrieve the contribution uri
+     * 
+     * @return contribution uri
+     */
+    public String getContributionURI();
+    
+    /**
+     * Set the contribution uri
+     * 
+     * @param contributionURI
+     */    
+    public void setContributionURI(String contributionURI);    
+    
+    /**
+     * Retrieve the contribution url
+     * 
+     * @return contribution url
+     */    
+    public String getContributionURL();
+   
+    /**
+     * Set the contribution url
+     * 
+     * @param contributionURL
+     */    
+    public void setContributionURL(String contributionURL);
+    
+    public Map<QName, CompositeModel> getComposites();       
+    public Map<QName, CompositeModel> getDeployableComposites(); 
+    public Map<QName, CompositeModel> getDeployedComposites(); 
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
new file mode 100644
index 0000000000..3befc322b4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
@@ -0,0 +1,86 @@
+/*
+ * 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.domain.model;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Composite;
+
+
+/**
+ * A domain. Manages nodes
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface DomainModel {
+
+    
+    /**
+     * Retrieve the domain uri
+     * 
+     * @return domain uri
+     */
+    public String getDomainURI();
+    
+    /**
+     * Set the domain uri
+     * 
+     * @param domainURI
+     */    
+    public void setDomainURI(String domainURI);    
+    
+    /**
+     * Retrieve the domain url
+     * 
+     * @return domain url
+     */    
+    public String  getDomainURL();
+   
+    /**
+     * Set the domain url
+     * 
+     * @param domainURL
+     */    
+    public void setDomainURL(String domainURL);
+    
+    
+    /**
+     * Set the domain level composite
+     * 
+     * @param domainLevelComposite
+     */    
+    public void setDomainLeveComposite(Composite domainLevelComposite);
+    
+    /**
+     * Retrieve the domain level composite
+     * 
+     * @return domainLevelComposite 
+     */    
+    public Composite getDomainLevelComposite();   
+   
+    public Map<String, NodeModel> getNodes();
+    public Map<String, ContributionModel> getContributions();
+    public Map<QName, CompositeModel> getDeployedComposites();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
new file mode 100644
index 0000000000..c6dd269f8b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
@@ -0,0 +1,64 @@
+/*
+ * 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.domain.model;
+
+/**
+ * A node. Runs SCA composites
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface DomainModelFactory {
+    
+    /**
+     * Create a new domain model
+     * 
+     * @return new domain model
+     */
+    public DomainModel createDomain();
+   
+    /**
+     * Create a new node model
+     * 
+     * @return new node model
+     */
+    public NodeModel createNode();  
+    
+    /**
+     * Create a new contribution model
+     * 
+     * @return new contribution model
+     */
+    public ContributionModel createContribution();    
+    
+    /**
+     * Create a new composite model
+     * 
+     * @return new composite model
+     */
+    public CompositeModel createComposite();   
+    
+    /**
+     * Create a new service model
+     * 
+     * @return new service model
+     */
+    public ServiceModel createService();     
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
new file mode 100644
index 0000000000..ad18bc9e40
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
@@ -0,0 +1,97 @@
+/*
+ * 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.domain.model;
+
+import java.io.Externalizable;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+
+/**
+ * A node. Runs SCA composites
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface NodeModel {
+    public enum LifecyleState {AVAILABLE, DEPLOYED, RUNNING, UNAVAILABLE }; 
+    
+    /**
+     * Retrieve the node uri
+     * 
+     * @return node uri
+     */
+    public String getNodeURI();
+    
+    /**
+     * Set the node uri
+     * 
+     * @param nodeURI
+     */    
+    public void setNodeURI(String nodeURI);    
+    
+    /**
+     * Retrieve the node url
+     *
+     * @return node url
+     */    
+    public String getNodeURL();
+   
+    /**
+     * Set the node url
+     * 
+     * @param nodeURL
+     */    
+    public void setNodeURL(String nodeURL);
+    
+    /**
+     * Returns the state of the node
+     *
+     * @return state
+     */    
+    public LifecyleState getLifecycleState();
+   
+    /**
+     * Set the state of the node
+     * 
+     * @param state
+     */    
+    public void setLifecycleState(LifecyleState state);    
+    
+    /**
+     * Retrieve the node manager reference
+     *
+     * @return node manager reference
+     */    
+    public Externalizable getNodeManagerReference();
+   
+    /**
+     * Set the node url
+     * 
+     * @param nodeURL
+     */    
+    public void setNodeManagerReference(Externalizable nodeManagerReference);    
+   
+    public Map<String, ContributionModel> getContributions();
+    public Map<QName, CompositeModel> getDeployedComposites();
+    public Map<String, ServiceModel> getServices();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
new file mode 100644
index 0000000000..cc097f835c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
@@ -0,0 +1,74 @@
+/*
+ * 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.domain.model;
+
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * A service
+ * 
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public interface ServiceModel {
+    
+    /**
+     * Retrieve the service uri
+     * 
+     * @return service uri
+     */
+    public String getServiceURI();
+    
+    /**
+     * Set the service uri
+     * 
+     * @param serviceURI
+     */    
+    public void setServiceURI(String serviceURI);    
+    
+    /**
+     * Retrieve the service url
+     * 
+     * @return service url
+     */    
+    public String getServiceURL();
+   
+    /**
+     * Set the service url
+     * 
+     * @param serviceURL
+     */    
+    public void setServiceURL(String serviceURL);
+    
+   
+    /**
+     * Retrieve the service binding
+     * 
+     * @return service binding
+     */    
+    public String getServiceBinding();
+   
+    /**
+     * Set the service binding
+     * 
+     * @param serviceBinding
+     */    
+    public void setServiceBinding(String serviceBinding);    
+}