From d5f1d093fe6fa491cdec392dca7137639e98d149 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 15 Sep 2008 00:26:00 +0000 Subject: Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68 --- .../corba/jse/tns/CorbaRuntimeModuleActivator.java | 53 ++++++++++ .../host/corba/jse/tns/TnsDefaultCorbaHost.java | 116 +++++++++++++++++++++ .../org.apache.tuscany.sca.core.ModuleActivator | 18 ++++ .../corba/testing/TnsDefaultCorbaHostTestCase.java | 97 +++++++++++++++++ 4 files changed, 284 insertions(+) create mode 100644 branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java create mode 100644 branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java create mode 100644 branches/sca-android/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator create mode 100644 branches/sca-android/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java (limited to 'branches/sca-android/modules/host-corba-jse-tns/src') diff --git a/branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/branches/sca-android/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/branches/sca-android/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/branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java new file mode 100644 index 0000000000..2dc2c7ddd4 --- /dev/null +++ b/branches/sca-android/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java @@ -0,0 +1,116 @@ +/* + * 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 java.util.logging.Logger; + +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; + +/** + * @version $Rev$ $Date$ + * Default implementation of CORBA host + */ +public class TnsDefaultCorbaHost implements CorbaHost { + + private static final Logger logger = Logger.getLogger(TnsDefaultCorbaHost.class.getName()); + private Map localServers = new ConcurrentHashMap(); + private Map clientsCount = new ConcurrentHashMap(); + 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 { + logger.warning("Local name server on port " + port + " was null!"); + } + } else if (useCount > 1) { + clientsCount.put(port, --useCount); + } else { + logger.warning("Tried to release non existing local name server on port " + port); + } + + } + + public void stop() { + for (TransientNameServer tns : localServers.values()) { + tns.stop(); + } + } + +} diff --git a/branches/sca-android/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-android/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/branches/sca-android/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/branches/sca-android/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/branches/sca-android/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java new file mode 100644 index 0000000000..9f6be0f27d --- /dev/null +++ b/branches/sca-android/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.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; + +/** + * @version $Rev$ $Date$ + * 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); + } + } +} + -- cgit v1.2.3