Create branch for 2.0 beta2 release

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

14 files changed, 942 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/LICENSE b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/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-2.x/branches/2.0-Beta2/modules/host-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..567c222abe
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0

+Export-Package: org.apache.tuscany.sca.host.rmi;version="2.0.0"

+SCA-Version: 1.1

+Bundle-Name: Apache Tuscany SCA RMI Host Extension Point

+Bundle-Vendor: The Apache Software Foundation

+Bundle-Version: 2.0.0

+Bundle-ManifestVersion: 2

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-Description: Apache Tuscany SCA RMI Host Extension Point

+Import-Package: javax.net,

+ org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.host.rmi;version="2.0.0"

+Bundle-SymbolicName: org.apache.tuscany.sca.host.rmi

+Bundle-DocURL: http://www.apache.org/

+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/NOTICE b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/NOTICE
new file mode 100644
index 0000000000..ad2ba40961
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/pom.xml b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/pom.xml
new file mode 100644
index 0000000000..c756831c73
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/pom.xml
@@ -0,0 +1,41 @@
+<?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>2.0-Beta2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-host-rmi</artifactId>
+    <name>Apache Tuscany SCA RMI Host Extension Point</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-Beta2-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
new file mode 100644
index 0000000000..dade6ef7f3
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
@@ -0,0 +1,177 @@
+/*
+ * 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.host.rmi;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.rmi.AlreadyBoundException;
+import java.rmi.NoSuchObjectException;
+import java.rmi.NotBoundException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.RMISocketFactory;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+
+/**
+ * Default implementation of a RMI host.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultRMIHost implements RMIHost {
+    private final static Logger logger = Logger.getLogger(DefaultRMIHost.class.getName());
+    private static final int CONNECTION_TIMEOUT = 3000; // 3 seconds
+
+    // Map of RMI registries started and running
+    private Map<String, Registry> rmiRegistries;
+    
+    private RMISocketFactory socketFactory;
+
+    public DefaultRMIHost() {
+        rmiRegistries = new ConcurrentHashMap<String, Registry>();
+        this.socketFactory = new RMISocketFactoryImpl(CONNECTION_TIMEOUT);
+    }
+    
+    public String registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException {
+        RMIURI rmiURI = new RMIURI(uri);
+
+        Registry registry;
+        try {
+            registry = rmiRegistries.get(Integer.toString(rmiURI.port));
+            if (registry == null) {
+                try {
+                    registry = LocateRegistry.createRegistry(rmiURI.port, socketFactory, socketFactory);
+                } catch (RemoteException e) {
+                    registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory);
+                } 
+                rmiRegistries.put(Integer.toString(rmiURI.port), registry);
+            }
+            registry.bind(rmiURI.serviceName, serviceObject);
+            logger.info("RMI service registered: " + rmiURI);
+            return rmiURI.toString();
+        } catch (AlreadyBoundException e) {
+            throw new RMIHostException(e);
+        } catch (RemoteException e) {
+            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
+            rmiExec.setStackTrace(e.getStackTrace());
+            throw rmiExec;
+        }
+
+    }
+
+    public void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException {
+        RMIURI rmiURI = new RMIURI(uri);
+
+        try {
+            Registry registry = rmiRegistries.get(Integer.toString(rmiURI.port));
+            if (registry == null) {
+                registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory);
+                rmiRegistries.put(Integer.toString(rmiURI.port), registry);
+            }
+            registry.unbind(rmiURI.serviceName);
+            logger.info("RMI service unregistered: " + rmiURI);
+        } catch (RemoteException e) {
+            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
+            rmiExec.setStackTrace(e.getStackTrace());
+            throw rmiExec;
+        } catch (NotBoundException e) {
+            throw new RMIHostException(e.getMessage());
+        }
+    }
+
+    public Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException {
+        RMIURI rmiURI = new RMIURI(uri);
+
+        Remote remoteService = null;
+        try {
+            // Requires permission java.net.SocketPermission "host:port", "connect,accept,resolve"
+            // in security policy.
+            Registry registry = LocateRegistry.getRegistry(rmiURI.host, rmiURI.port, socketFactory);
+
+            if (registry != null) {
+                remoteService = registry.lookup(rmiURI.serviceName);
+            }
+        } catch (RemoteException e) {
+            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
+            rmiExec.setStackTrace(e.getStackTrace());
+            throw rmiExec;
+        } catch (NotBoundException e) {
+            throw new RMIHostException(e.getMessage());
+        }
+        return remoteService;
+    }
+
+    /**
+     * A representation of an RMI URI.
+     *
+     * rmi://[host][:port][/[object]]
+     * rmi:[/][object]
+     */
+    private static class RMIURI {
+        private String uriStr;
+        private String host;
+        private int port;
+        private String serviceName;
+
+        private RMIURI(String uriStr) {
+            URI uri = URI.create(uriStr);
+            host = uri.getHost();
+            if (host == null) {
+                try {
+                    host = InetAddress.getLocalHost().getHostName();
+                } catch (UnknownHostException e) {
+                    host = "localhost";
+                }
+            }
+            port = uri.getPort();
+            if (port <= 0) {
+                port = RMI_DEFAULT_PORT;
+            }
+            String path = uri.getPath();
+            if (path != null && path.charAt(0) == '/') {
+                path = path.substring(1);
+            }
+            serviceName = path;
+            this.uriStr = "rmi://" + host + ":" + port + "/" + serviceName;
+        }
+
+        public String toString() {
+            return uriStr;
+        }
+    }
+
+    public void stop() {
+        for (Registry registry : rmiRegistries.values()) {
+            try {
+                UnicastRemoteObject.unexportObject(registry, false);
+            } catch (NoSuchObjectException e) {
+                e.printStackTrace();
+            }
+        }
+        rmiRegistries.clear();
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
new file mode 100644
index 0000000000..541ee8ba06
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
@@ -0,0 +1,67 @@
+/*
+ * 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.host.rmi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.core.LifeCycleListener;
+
+/**
+ * Default implementation of an RMI host extension point.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultRMIHostExtensionPoint implements RMIHostExtensionPoint, LifeCycleListener {
+
+    private List<RMIHost> rmiHosts = new ArrayList<RMIHost>();
+
+    public DefaultRMIHostExtensionPoint() {
+    }
+
+    public void addRMIHost(RMIHost rmiHost) {
+        rmiHosts.add(rmiHost);
+        if(rmiHost instanceof LifeCycleListener) {
+            ((LifeCycleListener) rmiHost).start();
+        }
+    }
+
+    public void removeRMIHost(RMIHost rmiHost) {
+        rmiHosts.remove(rmiHost);
+    }
+
+    public synchronized List<RMIHost> getRMIHosts() {
+        if(rmiHosts.isEmpty()) {
+            addRMIHost(new DefaultRMIHost());
+        }
+        return rmiHosts;
+    }
+
+    public void start() {
+    }
+
+    public void stop() {
+        for (RMIHost host : rmiHosts) {
+            if(host instanceof LifeCycleListener) {
+                ((LifeCycleListener) host).stop();
+            }
+        }
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
new file mode 100644
index 0000000000..d1936518ca
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
@@ -0,0 +1,62 @@
+/*
+ * 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.host.rmi;
+
+import java.rmi.Remote;
+
+
+/**
+ * Default implementation of an extensible RMI host.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExtensibleRMIHost implements RMIHost {
+
+    private RMIHostExtensionPoint rmiHosts;
+
+    public ExtensibleRMIHost(RMIHostExtensionPoint rmiHosts) {
+        this.rmiHosts = rmiHosts;
+    }
+
+    public String registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException {
+        if (rmiHosts.getRMIHosts().isEmpty()) {
+            throw new RMIHostException("No RMI host is available");
+        }
+        return getDefaultHost().registerService(uri, serviceObject);
+    }
+
+    public void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException {
+        if (rmiHosts.getRMIHosts().isEmpty()) {
+            throw new RMIHostException("No RMI host is available");
+        }
+        getDefaultHost().unregisterService(uri);
+    }
+
+    public Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException {
+        if (rmiHosts.getRMIHosts().isEmpty()) {
+            throw new RMIHostException("No RMI host available");
+        }
+        return getDefaultHost().findService(uri);
+    }
+
+    protected RMIHost getDefaultHost() {
+        return rmiHosts.getRMIHosts().get(0);
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
new file mode 100644
index 0000000000..df3f074168
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
@@ -0,0 +1,61 @@
+/*
+ * 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.host.rmi;
+
+import java.rmi.Remote;
+
+/**
+ * RMI Service hosting interface to be implemented by host environments that allows SCA Components
+ * to register RMI Services to handle inbound service requests over RMI to SCA Components
+ *
+ * @version $Rev$ $Date$
+ */
+public interface RMIHost {
+    int RMI_DEFAULT_PORT = 1099;
+
+    /**
+     * Register an RMI service with the given name and port
+     *
+     * @param uri the URI against which the server is to be registered
+     * @param serviceObject the server object to be registered
+     * @return TODO
+     * @throws RMIHostException
+     * @throws RMIHostRuntimeException
+     */
+    String registerService(String uri, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException;
+
+    /**
+     * Unregister a service registered under the given service name and port number
+     *
+     * @param uri the URI of the server
+     * @throws RMIHostException
+     * @throws RMIHostRuntimeException
+     */
+    void unregisterService(String uri) throws RMIHostException, RMIHostRuntimeException;
+
+    /**
+     * find a remote service hosted on the given host, port and service name
+     *
+     * @param uri the URI of the service
+     * @return the RMI server object
+     * @throws RMIHostException
+     * @throws RMIHostRuntimeException
+     */
+    Remote findService(String uri) throws RMIHostException, RMIHostRuntimeException;
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
new file mode 100644
index 0000000000..5ea46b9e0b
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
@@ -0,0 +1,45 @@
+/*
+ * 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.host.rmi;
+
+
+/**
+ * This exception will relate to situations where the end applicaition's input is the cause of the exception
+ *
+ * @version $Rev$ $Date$
+ */
+public class RMIHostException extends RuntimeException {
+ 
+    private static final long serialVersionUID = 3378300080918544410L;
+
+    public RMIHostException() {
+    }
+
+    public RMIHostException(String message) {
+        super(message);
+    }
+
+    public RMIHostException(Throwable e) {
+        super(e);
+    }
+
+    public RMIHostException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
new file mode 100644
index 0000000000..40d6013940
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
@@ -0,0 +1,51 @@
+/*
+ * 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.host.rmi;
+
+import java.util.List;
+
+/**
+ * An extension point for RMI hosts.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface RMIHostExtensionPoint {
+
+    /**
+     * Adds a Servlet host extension.
+     * 
+     * @param rmiHost
+     */
+    void addRMIHost(RMIHost rmiHost);
+
+    /**
+     * Removes a Servlet host extension.
+     * 
+     * @param rmiHost
+     */
+    void removeRMIHost(RMIHost rmiHost);
+    
+    /**
+     * Returns a list of Servlet host extensions.
+     * 
+     * @return
+     */
+    List<RMIHost> getRMIHosts();
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
new file mode 100644
index 0000000000..dfbcc62939
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
@@ -0,0 +1,46 @@
+/*
+ * 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.host.rmi;
+
+
+/**
+ * This exception relates to cases where there is a problem with the
+ * Host runtime
+ *
+ * @version $Rev$ $Date$
+ */
+public class RMIHostRuntimeException extends RuntimeException {
+   
+    private static final long serialVersionUID = -2639598547028423686L;
+
+    public RMIHostRuntimeException() {
+    }
+
+    public RMIHostRuntimeException(String message) {
+        super(message);
+    }
+    
+    public RMIHostRuntimeException(Throwable e) {
+        super(e);
+    }
+
+    public RMIHostRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
new file mode 100644
index 0000000000..763e5c1315
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
@@ -0,0 +1,57 @@
+/*
+ * 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.host.rmi;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.rmi.server.RMISocketFactory;
+
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+
+class RMISocketFactoryImpl extends RMISocketFactory {
+    private int clientTimeout;
+    private SocketFactory factory;
+    private ServerSocketFactory serverSocketFactory;
+
+    /**
+     * @param timeout
+     */
+    public RMISocketFactoryImpl(int clientTimeout) {
+        super();
+        this.clientTimeout = clientTimeout;
+        this.factory = SocketFactory.getDefault();
+        this.serverSocketFactory = ServerSocketFactory.getDefault();
+    }
+
+    public Socket createSocket(String host, int port) throws IOException {
+        Socket socket = factory.createSocket(host, port);
+        socket.setSoTimeout(clientTimeout);
+        return socket;
+    }
+
+    @Override
+    public ServerSocket createServerSocket(int port) throws IOException {
+        ServerSocket socket = serverSocketFactory.createServerSocket(port);
+        return socket;
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
new file mode 100644
index 0000000000..e7f8d54489
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
@@ -0,0 +1,19 @@
+# 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.

+

+org.apache.tuscany.sca.host.rmi.DefaultRMIHostExtensionPoint

+

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
new file mode 100644
index 0000000000..1164c33a16
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
@@ -0,0 +1,90 @@
+/*
+ * 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.host.rmi;
+
+import java.io.Serializable;
+import java.rmi.Remote;
+
+import junit.framework.TestCase;
+
+/**
+ * Test cases for the RMI Host.
+ *
+ * @version $Rev$ $Date$
+ */
+public class RMIHostImplTestCase extends TestCase {
+
+    public void testInit() {
+        new DefaultRMIHost();
+    }
+
+    public void testFindServiceBadHost() throws RMIHostRuntimeException, RMIHostException {
+        try {
+            new DefaultRMIHost().findService("rmi://locahost:9994/$BAD$");
+            fail();
+        } catch (RMIHostRuntimeException e) {
+            // expected
+        }
+    }
+
+    public void testRegisterService1() throws RMIHostRuntimeException, RMIHostException {
+        DefaultRMIHost host = new DefaultRMIHost();
+        host.registerService("rmi://localhost:9996/foo1", new MockRemote());
+        host.unregisterService("rmi://localhost:9996/foo1");
+    }
+
+    public void testExistingRegistry() throws RMIHostRuntimeException, RMIHostException {
+        DefaultRMIHost host1 = new DefaultRMIHost();
+        host1.registerService("rmi://localhost:9995/foo1", new MockRemote());
+        DefaultRMIHost host2 = new DefaultRMIHost();
+        host2.registerService("rmi://localhost:9995/foo2", new MockRemote());
+        host2.unregisterService("rmi://localhost:9995/foo1");
+        host2.unregisterService("rmi://localhost:9995/foo2");
+    }
+
+    public void testRegisterService2() throws RMIHostRuntimeException, RMIHostException {
+        DefaultRMIHost host = new DefaultRMIHost();
+        host.registerService("rmi://localhost:9999/bar1", new MockRemote());
+        host.unregisterService("rmi://localhost:9999/bar1");
+    }
+
+    public void testRegisterServiceAlreadyBound() throws RMIHostRuntimeException, RMIHostException {
+        DefaultRMIHost host = new DefaultRMIHost();
+        host.registerService("rmi://localhost:9997/bar2", new MockRemote());
+        try {
+            host.registerService("rmi://localhost:9997/bar2", new MockRemote());
+        } catch (RMIHostException e) {
+            // expected
+            host.unregisterService("rmi://localhost:9997/bar2");
+        }
+    }
+
+    public void testUnRegisterService() throws RMIHostRuntimeException, RMIHostException {
+        DefaultRMIHost host = new DefaultRMIHost();
+        try {
+            host.unregisterService("rmi://localhost:9998/bar3");
+            fail();
+        } catch (RMIHostRuntimeException e) {
+            // expected
+        }
+    }
+
+    private static class MockRemote implements Remote, Serializable {
+    }
+}