From 05cb79859c35a801922b5eb86f336ab5e1e13d53 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 18 Oct 2010 02:28:46 +0000 Subject: Deleting 2.0-M5-RC2 release candidate tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1023632 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-M5-RC2/modules/host-corba-jse-tns/LICENSE | 205 --------------------- .../host-corba-jse-tns/META-INF/MANIFEST.MF | 21 --- .../2.0-M5-RC2/modules/host-corba-jse-tns/NOTICE | 6 - .../2.0-M5-RC2/modules/host-corba-jse-tns/pom.xml | 53 ------ .../host/corba/jse/tns/TnsDefaultCorbaHost.java | 120 ------------ .../org.apache.tuscany.sca.host.corba.CorbaHost | 17 -- .../corba/testing/TnsDefaultCorbaHostTestCase.java | 99 ---------- 7 files changed, 521 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/LICENSE delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/NOTICE delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java (limited to 'sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns') diff --git a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/LICENSE b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - 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/tags/2.0-M5-RC2/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/META-INF/MANIFEST.MF deleted file mode 100644 index 8edf701bf7..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Private-Package: org.apache.tuscany.sca.host.corba.jse.tns;version="1. - 4" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA Transient Name Server CORBA Host -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1225397430015 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Transient Name Server CORBA Hos - t -Import-Package: org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.host.corba;version="2.0.0", - org.apache.tuscany.sca.host.corba.jse;version="2.0.0", - org.apache.tuscany.sca.host.corba.naming;version="2.0.0", - org.omg.CORBA -Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse.tns -Bundle-DocURL: http://www.apache.org/ - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/NOTICE b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/NOTICE deleted file mode 100644 index 9ddba06a32..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${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/tags/2.0-M5-RC2/modules/host-corba-jse-tns/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/pom.xml deleted file mode 100644 index 2cb1392a03..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0 - - tuscany-host-corba-jse-tns - Apache Tuscany SCA Transient Name Server CORBA Host - - - - - org.apache.tuscany.sca - tuscany-host-corba - 2.0 - - - - org.apache.tuscany.sca - tuscany-host-corba-jse - 2.0 - - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 2.0 - test - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java deleted file mode 100644 index 4a395631b1..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.host.corba.jse.tns; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.core.LifeCycleListener; -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, LifeCycleListener { - - 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(); - } - } - - public void start() { - } - -} diff --git a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost deleted file mode 100644 index 5706b13a42..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;ranking=10 diff --git a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java deleted file mode 100644 index 85ac98cfef..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.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.provider.service.DynaCorbaServant; -import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -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 - @Ignore - 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