summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca')
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java165
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java154
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java53
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java72
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java72
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java72
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java56
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java48
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java63
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java80
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java86
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java64
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java97
-rw-r--r--branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java74
14 files changed, 0 insertions, 1156 deletions
diff --git a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
deleted file mode 100644
index fbeaf70897..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
+++ /dev/null
@@ -1,165 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
deleted file mode 100644
index 878880b5df..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
+++ /dev/null
@@ -1,154 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
deleted file mode 100644
index b4bcf4c7f3..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
deleted file mode 100644
index 5cc416d4e5..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
deleted file mode 100644
index c4648255a9..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
deleted file mode 100644
index 441ff445d8..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
deleted file mode 100644
index 257dff2d3e..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
deleted file mode 100644
index 656fdf4bf8..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
deleted file mode 100644
index afe9c8f010..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
deleted file mode 100644
index 9178a8bad3..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
+++ /dev/null
@@ -1,80 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
deleted file mode 100644
index 857c5247e5..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
+++ /dev/null
@@ -1,86 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
deleted file mode 100644
index 684257d3c0..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
+++ /dev/null
@@ -1,64 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
deleted file mode 100644
index 13e8b0d9b0..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
+++ /dev/null
@@ -1,97 +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.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/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java b/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
deleted file mode 100644
index c96b197cef..0000000000
--- a/branches/sca-java-1.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
+++ /dev/null
@@ -1,74 +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.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);
-}