Added Transient Name Server JSE Corba host. Adjusted existing bindings and integration tests and removed 'provideNameServer' flag from binding.corba configuration

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

20 files changed, 571 insertions, 177 deletions

diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
index 516605ec8f..0465dbe7e9 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
@@ -24,9 +24,7 @@ import org.apache.tuscany.sca.binding.corba.impl.service.ComponentInvocationProx
 import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant;
 import org.apache.tuscany.sca.binding.corba.impl.service.InvocationProxy;
 import org.apache.tuscany.sca.binding.corba.impl.types.util.Utils;
-import org.apache.tuscany.sca.binding.corba.impl.util.SocketUtil;
 import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbanameURL;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -42,20 +40,11 @@ public class CorbaServiceBindingProvider implements ServiceBindingProvider {
     private CorbaHost host;
     private RuntimeComponentService service;
     private DynaCorbaServant servant;
-    private boolean isLocalhost;    
-    private int port;
-    
+
     public CorbaServiceBindingProvider(CorbaBinding binding, CorbaHost host, RuntimeComponentService service) {
         this.binding = binding;
         this.host = host;
         this.service = service;
-        if (binding.isProvideNameServer()) {
-            CorbanameURL details = new CorbanameURL(binding.getCorbaname());
-            isLocalhost = SocketUtil.isLocalhost(details.getHost());
-            if (isLocalhost) {
-                port = details.getPort();
-            }
-        }
     }
 
     /**
@@ -74,9 +63,6 @@ public class CorbaServiceBindingProvider implements ServiceBindingProvider {
             InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(binding), javaClass);
             servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
             servant.setIds(new String[] {binding.getId()});
-            if (binding.isProvideNameServer() && isLocalhost) {
-                host.createLocalNameServer(port);
-            }
             host.registerServant(binding.getCorbaname(), servant);
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
@@ -89,10 +75,7 @@ public class CorbaServiceBindingProvider implements ServiceBindingProvider {
      */
     public void stop() {
         try {
-            if (binding.isProvideNameServer() && isLocalhost) {
-                host.releaseLocalNameServer(port);
-            }
-             host.unregisterServant(binding.getCorbaname());
+            host.unregisterServant(binding.getCorbaname());
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
         }
diff --git a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index bf3bc09461..0b79065cc3 100644
--- a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
@@ -43,8 +43,4 @@ public interface CorbaBinding extends Binding {
     void setId(String id);
     
     String getCorbaname();
-    
-    boolean isProvideNameServer();
-    
-    void setProvideNameServer(boolean provideNameServer);
 }
diff --git a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
index 167fe50d7b..54e98d4117 100644
--- a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
@@ -38,7 +38,6 @@ public class CorbaBindingImpl implements CorbaBinding, PolicySetAttachPoint {
     private String host;
     private int port;
     private String id;
-    private boolean provideNameServer;
     
     private List<Intent> requiredIntents = new ArrayList<Intent>();
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
@@ -130,12 +129,4 @@ public class CorbaBindingImpl implements CorbaBinding, PolicySetAttachPoint {
         return CorbaHostUtils.isValidCorbanameURI(getURI()) ? getURI(): CorbaHostUtils.createCorbanameURI(getHost(), getPort(), getName());
     }
 
-    public boolean isProvideNameServer() {
-        return provideNameServer;
-    }
-
-    public void setProvideNameServer(boolean provideNameServer) {
-        this.provideNameServer = provideNameServer;
-    }
-
 }
diff --git a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index a7be836437..0bb38d3682 100644
--- a/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/java/sca/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
@@ -86,10 +86,6 @@ public class CorbaBindingProcessor implements StAXArtifactProcessor<CorbaBinding
         if (id != null) {
             binding.setId(id);
         }
-        
-        // Read name server request
-        String provideNameServer = reader.getAttributeValue(null, "provideNameServer");
-        binding.setProvideNameServer("true".equals(provideNameServer) ? true : false);
         return binding;
     }
 
@@ -119,10 +115,6 @@ public class CorbaBindingProcessor implements StAXArtifactProcessor<CorbaBinding
         if (model.getId() != null) {
             writer.writeAttribute("id", model.getId());
         }
-        
-        if (model.isProvideNameServer()) {
-            writer.writeAttribute("provideNameServer", "true");
-        }
         writer.writeEndElement();
     }
 
diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
index dba88434be..6e74686b61 100644
--- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
+++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
@@ -23,13 +23,11 @@ import org.apache.axiom.om.OMElement;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant;
 import org.apache.tuscany.sca.binding.corba.impl.service.InvocationProxy;
-import org.apache.tuscany.sca.binding.corba.impl.util.SocketUtil;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbanameURL;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -48,8 +46,6 @@ public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider {
     private DynaCorbaServant servant;
     private MessageFactory messageFactory;
     private InterfaceContract wsdlInterfaceContract;
-    private boolean isLocalhost;
-    private int bindingPort;
 
     public CorbaSCAServiceBindingProvider(SCABinding binding,
                                           CorbaHost host,
@@ -60,10 +56,6 @@ public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider {
         this.host = host;
         this.service = service;
         
-        CorbanameURL details = new CorbanameURL(binding.getURI());
-        isLocalhost = SocketUtil.isLocalhost(details.getHost());
-        bindingPort = details.getPort();
-        
         messageFactory = extensions.getExtensionPoint(MessageFactory.class);
 
         WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class);
@@ -87,9 +79,6 @@ public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider {
                 new CorbaSCAInvocationProxy(service.getRuntimeWire(binding), service.getInterfaceContract()
                     .getInterface(), messageFactory);
             servant = new DynaCorbaServant(proxy, "IDL:org/apache/tuscany/sca/binding/sca/corba/Service:1.0");
-            if (isLocalhost) {
-                host.createLocalNameServer(bindingPort);
-            }
             host.registerServant(binding.getURI(), servant);
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
@@ -99,9 +88,6 @@ public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider {
     public void stop() {
         try {
             host.unregisterServant(binding.getURI());
-            if (isLocalhost) {
-                host.releaseLocalNameServer(bindingPort);
-            }
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
         }
diff --git a/java/sca/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/java/sca/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
index 561b9abfba..c2f903961b 100644
--- a/java/sca/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ b/java/sca/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
@@ -158,12 +158,4 @@ public class JEECorbaHost implements CorbaHost {
         }
     }
 
-    public void createLocalNameServer(int port) throws CorbaHostException {
-        // no need to start - server is provided by environment
-    }
-
-    public void releaseLocalNameServer(int port) throws CorbaHostException {
-        // no need to release - server is provided by environment
-    }
-
 }
diff --git a/java/sca/modules/host-corba-jse-tns/LICENSE b/java/sca/modules/host-corba-jse-tns/LICENSE
new file mode 100644
index 0000000000..6e529a25c4
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/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/java/sca/modules/host-corba-jse-tns/NOTICE b/java/sca/modules/host-corba-jse-tns/NOTICE
new file mode 100644
index 0000000000..1325efd8bf
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/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/java/sca/modules/host-corba-jse-tns/pom.xml b/java/sca/modules/host-corba-jse-tns/pom.xml
new file mode 100644
index 0000000000..4c6f6af352
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/pom.xml
@@ -0,0 +1,71 @@
+<?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.4-SNAPSHOT</version>
+    </parent>
+    <artifactId>tuscany-host-corba-jse-tns</artifactId>
+    <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba-jse</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.host.corba.jse.tns</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.host.corba.jse.tns*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
new file mode 100644
index 0000000000..312d739c53
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.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.host.corba.jse.tns;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+
+/**
+ * @version $Rev: 683329 $ $Date: 2008-08-06 19:06:39 +0200 (śro, 06 sie 2008) $
+ */
+public class CorbaRuntimeModuleActivator implements ModuleActivator {
+    // private static final Logger logger =
+    // Logger.getLogger(CorbaRuntimeModuleActivator.class.getName());
+
+    private TnsDefaultCorbaHost server;
+
+    public void start(ExtensionPointRegistry extensionPointRegistry) {       
+        // Register our Corba host
+        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
+        server = new TnsDefaultCorbaHost();
+        if (corbaHosts.getCorbaHosts().size() > 0 && corbaHosts.getCorbaHosts().get(0) instanceof DefaultCorbaHost) {
+            // Set TnsDefaultCorbaHost as default when DefaultCorbaHost was registered before
+            corbaHosts.getCorbaHosts().add(0, server);     
+        } else {
+            corbaHosts.getCorbaHosts().add(server);
+        }
+    }
+
+    public void stop(ExtensionPointRegistry registry) {
+        if (server != null) {
+            server.stop();
+        }
+    }
+
+}
diff --git a/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
new file mode 100644
index 0000000000..c322b5cfee
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
@@ -0,0 +1,115 @@
+/*
+ * 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.corba.jse.tns;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.tuscany.sca.host.corba.CorbaHost;
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
+import org.apache.tuscany.sca.host.corba.CorbanameURL;
+import org.apache.tuscany.sca.host.corba.SocketUtil;
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.omg.CORBA.Object;
+
+/**
+ * Default implementation of CORBA host
+ */
+public class TnsDefaultCorbaHost implements CorbaHost {
+    //private static final Logger logger = Logger.getLogger(TnsDefaultCorbaHost.class.getName());
+
+    private Map<Integer, TransientNameServer> localServers = new ConcurrentHashMap<Integer, TransientNameServer>();
+    private Map<Integer, Integer> clientsCount = new ConcurrentHashMap<Integer, Integer>();
+    private CorbaHost targetHost = new DefaultCorbaHost();
+
+    public void registerServant(String uri, Object servantObject) throws CorbaHostException {
+        CorbanameURL details = new CorbanameURL(uri);
+        if (SocketUtil.isLocalhost(details.getHost())) {
+            createLocalNameServer(details.getPort());
+        }
+        targetHost.registerServant(uri, servantObject);
+    }
+
+    public void unregisterServant(String uri) throws CorbaHostException {
+        targetHost.unregisterServant(uri);
+        CorbanameURL details = new CorbanameURL(uri);
+        if (SocketUtil.isLocalhost(details.getHost())) {
+            releaseLocalNameServer(details.getPort());
+        }
+    }
+
+    public Object lookup(String uri) throws CorbaHostException {
+        return targetHost.lookup(uri);
+    }
+
+    /**
+     * Starts transient name server under given port. If TNS was previously
+     * spawned it increments clients counter.
+     */
+    synchronized private void createLocalNameServer(int port) throws CorbaHostException {
+        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
+        // no server previously spawned
+        if (useCount == 0) {
+            TransientNameServer server =
+                new TransientNameServer("localhost", port, TransientNameService.DEFAULT_SERVICE_NAME);
+            Thread thread = server.start();
+            if (thread == null) {
+                throw new CorbaHostException("TransientNameServer couldn't be started");
+            } else {
+                localServers.put(port, server);
+            }
+        }
+        clientsCount.put(port, ++useCount);
+    }
+
+    /**
+     * Stops transient name server if there is only one client left using such
+     * TNS. Decrements clients counter if TNS is used by 2 or more clients.
+     */
+    synchronized private void releaseLocalNameServer(int port) throws CorbaHostException {
+        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
+        if (useCount == 1) {
+            // last client executed stop, cleaning up
+            TransientNameServer server = localServers.get(port);
+            if (server != null) {
+                server.stop();
+                clientsCount.remove(port);
+                localServers.remove(port);
+            } else {
+                // FIXME: should we throw exception when expecting not null
+                // server object?
+            }
+        } else if (useCount > 1) {
+            clientsCount.put(port, --useCount);
+        } else {
+            // ignoring request to stop non existing name server
+        }
+
+    }
+
+    public void stop() {
+        for (TransientNameServer tns : localServers.values()) {
+            tns.stop();
+        }
+    }
+
+}
diff --git a/java/sca/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..906ec4efce
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# 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.corba.jse.tns.CorbaRuntimeModuleActivator

diff --git a/java/sca/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/java/sca/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
new file mode 100644
index 0000000000..06bc14f4e3
--- /dev/null
+++ b/java/sca/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
@@ -0,0 +1,96 @@
+/*
+ * 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.corba.testing;
+
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import java.net.Socket;
+import java.net.SocketException;
+
+import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant;
+import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * General tests
+ */
+public class TnsDefaultCorbaHostTestCase {
+
+    private static TnsDefaultCorbaHost host;
+
+    @BeforeClass
+    public static void start() {
+        try {
+            host = new TnsDefaultCorbaHost();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+
+    @AfterClass
+    public static void stop() {
+        host.stop();
+    }
+
+    /**
+     * Test for creating and releasing local name server
+     */
+    @Test
+    public void test_localNameServer() {
+        int testPort = 5070;
+        try {
+            String testUri1 = "corbaname::localhost:" + testPort + "#Test1";
+            String testUri2 = "corbaname::localhost:" + testPort + "#Test2";
+            String testUri3 = "corbaname::localhost:" + testPort + "#Test3";
+            DynaCorbaServant servant = new DynaCorbaServant(null, "IDL:org/apache/tuscany:1.0");
+            host.registerServant(testUri1, servant);
+            host.registerServant(testUri2, servant);
+            host.registerServant(testUri3, servant);
+            Thread.sleep(1000);
+            // make test connection to name server
+            Socket socket = new Socket("localhost", testPort);
+            socket.close();
+            // and stop server
+            host.unregisterServant(testUri1);
+            host.unregisterServant(testUri2);
+            // after releasing 2 clients 3rd should still hold the server
+            socket = new Socket("localhost", testPort);
+            socket.close();
+            host.unregisterServant(testUri3);
+            Thread.sleep(1000);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+        try {
+            // previously made 3rd stop so there should be no name server under
+            // this port
+            new Socket("localhost", testPort);
+            fail();
+        } catch (Exception e) {
+            assertTrue(e instanceof SocketException);
+        }
+    }
+}
+
diff --git a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
index 4194e733a4..252a1512e4 100644
--- a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
+++ b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
@@ -18,8 +18,6 @@
  */
 package org.apache.tuscany.sca.host.corba.jse;
 
-import java.util.logging.Logger;
-
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ModuleActivator;
 import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
@@ -28,16 +26,15 @@ import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
  * @version $Rev$ $Date$
  */
 public class CorbaRuntimeModuleActivator implements ModuleActivator {
-    private static final Logger logger = Logger.getLogger(CorbaRuntimeModuleActivator.class.getName());
+    // private static final Logger logger =
+    // Logger.getLogger(CorbaRuntimeModuleActivator.class.getName());
 
     private DefaultCorbaHost server;
 
     public void start(ExtensionPointRegistry extensionPointRegistry) {
 
         // Register our Corba host
-        CorbaHostExtensionPoint corbaHosts =
-            extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
-        
+        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
         server = new DefaultCorbaHost();
         corbaHosts.addCorbaHost(server);
     }
diff --git a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index 14ef2eb908..e0cee52c3d 100644
--- a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
@@ -29,8 +29,6 @@ import org.apache.tuscany.sca.host.corba.CorbaHost;
 import org.apache.tuscany.sca.host.corba.CorbaHostException;
 import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
 import org.apache.tuscany.sca.host.corba.CorbanameURL;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 import org.omg.CosNaming.NameComponent;
@@ -48,8 +46,6 @@ public class DefaultCorbaHost implements CorbaHost {
     private static final Logger logger = Logger.getLogger(DefaultCorbaHost.class.getName());
 
     private Map<String, ORB> orbs = new ConcurrentHashMap<String, ORB>();
-    private Map<Integer, TransientNameServer> localServers = new ConcurrentHashMap<Integer, TransientNameServer>();
-    private Map<Integer, Integer> clientsCount = new ConcurrentHashMap<Integer, Integer>();
 
     private void validatePort(int port) throws IllegalArgumentException {
         if (port < 1) {
@@ -181,49 +177,4 @@ public class DefaultCorbaHost implements CorbaHost {
         }
     }
 
-    /**
-     * Starts transient name server under given port. If TNS was previously
-     * spawned it increments clients counter.
-     */
-    synchronized public void createLocalNameServer(int port) throws CorbaHostException {
-        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
-        // no server previously spawned
-        if (useCount == 0) {
-            TransientNameServer server =
-                new TransientNameServer("localhost", port, TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread thread = server.start();
-            if (thread == null) {
-                throw new CorbaHostException("TransientNameServer couldn't be started");
-            } else {
-                localServers.put(port, server);
-            }
-        }
-        clientsCount.put(port, ++useCount);
-    }
-
-    /**
-     * Stops transient name server if there is only one client left using such
-     * TNS. Decrements clients counter if TNS is used by 2 or more clients.
-     */
-    synchronized public void releaseLocalNameServer(int port) throws CorbaHostException {
-        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
-        if (useCount == 1) {
-            // last client executed stop, cleaning up
-            TransientNameServer server = localServers.get(port);
-            if (server != null) {
-                server.stop();
-                clientsCount.remove(port);
-                localServers.remove(port);
-            } else {
-                // FIXME: should we throw exception when expecting not null
-                // server object?
-            }
-        } else if (useCount > 1) {
-            clientsCount.put(port, --useCount);
-        } else {
-            // ignoring request to stop non existing name server
-        }
-
-    }
-
 }
diff --git a/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 6b98f1c949..8084e39956 100644
--- a/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
@@ -247,39 +247,4 @@ public class DefaultCorbaHostTestCase {
         }
     }
 
-    /**
-     * Test for creating and releasing local name server
-     */
-    @Test
-    public void test_localNameServer() {
-        int testPort = 5070;
-        try {
-            host.createLocalNameServer(testPort);
-            host.createLocalNameServer(testPort);
-            host.createLocalNameServer(testPort);
-            Thread.sleep(1000);
-            // make test connection to name server
-            Socket socket = new Socket("localhost", testPort);
-            socket.close();
-            // and stop server
-            host.releaseLocalNameServer(testPort);
-            host.releaseLocalNameServer(testPort);
-            // after releasing 2 clients 3rd should still hold the server
-            socket = new Socket("localhost", testPort);
-            socket.close();
-            host.releaseLocalNameServer(testPort);
-            Thread.sleep(1000);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            // previously made 3rd stop so there should be no name server under
-            // this port
-            new Socket("localhost", testPort);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof SocketException);
-        }
-    }
 }
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index 17e9566e17..01a27ba371 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
@@ -52,20 +52,4 @@ public interface CorbaHost {
      * @throws CorbaHostException
      */
     Object lookup(String uri) throws CorbaHostException;
-
-    /**
-     * Provides name server under given port.
-     * 
-     * @param port
-     * @throws CorbaHostException
-     */
-    void createLocalNameServer(int port) throws CorbaHostException;
-
-    /**
-     * Stops name server but only if every client released previously created NS.
-     * 
-     * @param port
-     * @throws CorbaHostException
-     */
-    void releaseLocalNameServer(int port) throws CorbaHostException;
 }
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 1c36fca57d..12112fea04 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
@@ -51,12 +51,4 @@ public class ExtensibleCorbaHost implements CorbaHost {
         return hosts.getCorbaHosts().get(0);
     }
 
-    public void createLocalNameServer(int port) throws CorbaHostException {
-        getCorbaHost().createLocalNameServer(port);
-    }
-    
-    public void releaseLocalNameServer(int port) throws CorbaHostException {
-        getCorbaHost().releaseLocalNameServer(port);
-    }
-
 }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/SocketUtil.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
index 3541fd92cf..b076e023da 100755
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/SocketUtil.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.corba.impl.util;
+package org.apache.tuscany.sca.host.corba;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 0ef4e87786..aed561953b 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -112,6 +112,7 @@
                 <module>host-corba</module>
                 <module>host-corba-jee</module>
                 <module>host-corba-jse</module>
+                <module>host-corba-jse-tns</module>
                 <module>host-ejb</module>
                 <module>host-embedded</module>
                 <module>host-http</module>