diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-16 15:38:02 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-16 15:38:02 +0000 |
commit | 6a5618b2741471546e0b0885e1758c391837dff6 (patch) | |
tree | 4ce17155a4e4e9046d4cc1355042ac35d96209a2 /sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba | |
parent | 498901ee4d30917ba1fd696e75b61ce3aea79c29 (diff) |
Rename beta3 tag to final name
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245031 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba')
14 files changed, 0 insertions, 1214 deletions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/LICENSE b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/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-Beta3-RC2/modules/host-corba/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/META-INF/MANIFEST.MF deleted file mode 100644 index 2b38d299c0..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.host.corba;uses:="org.omg.CORBA
- ";version="2.0.0"
-Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA CORBA Host Extension Point
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-Bnd-LastModified: 1225397126578
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA CORBA Host Extension Point
-Import-Package: org.apache.tuscany.sca.host.corba;version="2.0.0",org.om
- g.CORBA
-Bundle-SymbolicName: org.apache.tuscany.sca.host.corba
-Bundle-DocURL: http://www.apache.org/
-
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/NOTICE b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/NOTICE deleted file mode 100644 index f6ce2542c3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name}
-Copyright (c) 2005 - 2011 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-Beta3-RC2/modules/host-corba/pom.xml b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/pom.xml deleted file mode 100644 index dbdd054338..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?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-Beta3</version> - </parent> - <artifactId>tuscany-host-corba</artifactId> - <name>Apache Tuscany SCA CORBA Host Extension Point</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> - <version>2.0-Beta3</version> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java deleted file mode 100644 index eb49f3f841..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.host.corba; - -import org.omg.CORBA.Object; - -/** - * @version $Rev$ $Date$ - * CORBA Service hosting interface - */ -public interface CorbaHost { - - /** - * Registers servant in name server. - * - * @param uri corbaname URI - * @param serviceObject - * @throws CorbaHostException - */ - void registerServant(String uri, Object serviceObject) throws CorbaHostException; - - /** - * Removes servant from name server - * - * @param orb The ORB instance - * @param name binding name - * @throws CorbaHostException - */ - void unregisterServant(String uri) throws CorbaHostException; - - /** - * Gets reference to object - * - * @param name binding name - * @return objects reference - * @throws CorbaHostException - */ - Object lookup(String uri) throws CorbaHostException; -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java deleted file mode 100644 index 049bfdb6cd..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java +++ /dev/null @@ -1,47 +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; - -/** - * @version $Rev$ $Date$ - * General exception for corba hosts operations - */ -public class CorbaHostException extends Exception { - - private static final long serialVersionUID = 1L; - - public static final String BINDING_IN_USE = "Binding name is already in use"; - public static final String NO_SUCH_OBJECT = "There is no object under given location"; - public static final String NO_SUCH_HOST = "Couldn't find specified host"; - public static final String NO_SUCH_PORT = "Couldn't connect to specified port"; - public static final String WRONG_NAME = "Characters used in binding name are illegal"; - - public CorbaHostException(String message) { - super(message); - } - - public CorbaHostException(Exception cause) { - super(cause); - } - - public CorbaHostException(String message, Exception cause) { - super(message, cause); - } -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java deleted file mode 100644 index 067b9193c5..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java +++ /dev/null @@ -1,51 +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; - -import java.util.List; - -/** - * @version $Rev$ $Date$ - * An extension point for CORBA hostst - */ -public interface CorbaHostExtensionPoint { - - /** - * Removes CORBA host extension - * - * @param corbaHost - */ - void addCorbaHost(CorbaHost corbaHost); - - /** - * Removes CORBA host extension - * - * @param corbaHost - */ - void removeCorbaHost(CorbaHost corbaHost); - - /** - * Gets all CORBA host extensions - * - * @return - */ - List<CorbaHost> getCorbaHosts(); - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java deleted file mode 100644 index b90fe9c78b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java +++ /dev/null @@ -1,61 +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; - - -/** - * @version $Rev$ $Date$ - * Various utilities for host-corba - */ -public class CorbaHostUtils { - - /** - * Tests if given URI is valid corbaname string - * @param uri - * @return - */ - public static boolean isValidCorbanameURI(String uri) { - return uri != null && uri.startsWith("corbaname:") && uri.contains("#") && uri.indexOf('#') < uri.length() - 1; - } - - /** - * Creates corbaname URI basing on given parameters - * @param host - * @param port - * @param name - * - * @return - */ - public static String createCorbanameURI(String host, int port, String name) { - return new CorbanameURL(host, port, name).toString(); - } - - /** - * Translates corbaname URI to CorbanameDetails instances - * - * @param uri - * @return - */ - public static CorbanameURL getServiceDetails(String uri) { - CorbanameURL details = new CorbanameURL(uri); - return details; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java deleted file mode 100644 index a380fd6d79..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java +++ /dev/null @@ -1,202 +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; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Arrays; -import java.util.List; - -/** - * @version $Rev$ $Date$ - * Holds corbaname URI details - */ -public class CorbanameURL { - public static String DEFAULT_PROTOCOL = "iiop"; - public static String DEFAULT_VERSION = ""; - public static String DEFAULT_NAME_SERVICE = "NameService"; - public static String DEFAULT_HOST = "localhost"; - public static int DEFAULT_PORT = 2809; - - private String protocol = ""; - private String version = ""; - private String host; - private int port; - private String nameService; - private List<String> namePath; - - public CorbanameURL(String host, int port, String namePath, String nameService) { - super(); - this.host = host == null ? DEFAULT_HOST : host; - this.port = port <= 0 ? DEFAULT_PORT : port; - this.namePath = parseName(namePath); - this.nameService = nameService == null ? DEFAULT_NAME_SERVICE : nameService; - } - - public CorbanameURL(String host, int port, String namePath) { - this(host, port, namePath, DEFAULT_NAME_SERVICE); - } - - public CorbanameURL(String url) { - if (url == null || (!url.startsWith("corbaname"))) { - throw new IllegalArgumentException("Malformed corbaname URL: " + url); - } - try { - url = URLDecoder.decode(url, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(e); - } - String[] parts = url.split("#"); - if (parts.length == 2) { - String serviceLocation = parts[0]; - String servicePath = parts[1]; - namePath = parseName(servicePath); - - parts = serviceLocation.split("/"); - if (parts.length == 2) { - nameService = parts[1]; - } else { - nameService = DEFAULT_NAME_SERVICE; - } - - parts = parts[0].split(":"); - - if (parts.length >= 2) { - protocol = parts[1]; - } - if (parts.length >= 3) { - version = parts[2]; - String[] strs = version.split("@"); - if (strs.length == 2) { - version = strs[0]; - host = strs[1]; - } else { - version = ""; - host = strs[0]; - } - } - if (host == null || "".equals(host)) { - host = DEFAULT_HOST; - } - if (parts.length >= 4 && !"".equals(parts[3])) { - port = Integer.parseInt(parts[3]); - } else { - port = DEFAULT_PORT; - } - } else { - throw new IllegalArgumentException("Malformed corbaname URL: " + url); - } - } - - private static List<String> parseName(String name) { - try { - name = URLDecoder.decode(name, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(e); - } - String[] names = name.split("/"); - return Arrays.asList(names); - } - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public String getNameService() { - return nameService; - } - - public void setNameService(String nameService) { - this.nameService = nameService; - } - - public List<String> getNamePath() { - return namePath; - } - - public String getName() { - if (namePath != null) { - StringBuffer buf = new StringBuffer(); - for (int i = 0; i < namePath.size(); i++) { - buf.append(namePath.get(i)); - if (i < namePath.size() - 1) { - buf.append("/"); - } - } - return buf.toString(); - } - return null; - } - - public void setNamePath(List<String> namePath) { - this.namePath = namePath; - } - - @Override - public String toString() { - StringBuffer buf = new StringBuffer(); - buf.append("corbaname:"); - buf.append(protocol).append(":"); - if (version != null && !"".equals(version)) { - buf.append(version).append("@"); - } - buf.append(host).append(":").append(port); - buf.append("/").append(nameService); - buf.append("#"); - if (namePath != null) { - for (int i = 0; i < namePath.size(); i++) { - buf.append(namePath.get(i)); - if (i < namePath.size() - 1) { - buf.append("/"); - } - } - } - return buf.toString(); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java deleted file mode 100644 index 6ed7f3ea83..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.host.corba; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.LifeCycleListener; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceHelper; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * @version $Rev$ $Date$ - * Default implementation of CorbaHostExtensionPoint - */ -public class DefaultCorbaHostExtensionPoint implements CorbaHostExtensionPoint, LifeCycleListener { - private ExtensionPointRegistry registry; - private boolean loaded; - private List<CorbaHost> corbaHosts = new ArrayList<CorbaHost>(); - - public DefaultCorbaHostExtensionPoint(ExtensionPointRegistry registry) { - this.registry = registry; - } - - private synchronized void loadHosts() { - if (loaded) { - return; - } - try { - ServiceDeclaration sd = registry.getServiceDiscovery().getServiceDeclaration(CorbaHost.class); - CorbaHost host = ServiceHelper.newInstance(registry, sd); - ServiceHelper.start(host); - corbaHosts.add(host); - } catch (Throwable e) { - throw new ServiceRuntimeException(e); - } - } - - public void addCorbaHost(CorbaHost host) { - corbaHosts.add(host); - } - - public void removeCorbaHost(CorbaHost host) { - corbaHosts.remove(host); - } - - public List<CorbaHost> getCorbaHosts() { - loadHosts(); - return corbaHosts; - } - - public void start() { - } - - public void stop() { - ServiceHelper.stop(corbaHosts); - corbaHosts.clear(); - loaded = false; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java deleted file mode 100644 index 644682e106..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java +++ /dev/null @@ -1,62 +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; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.omg.CORBA.Object; - -/** - * @version $Rev$ $Date$ - * Default implementation of extensible CORBA host - */ -public class ExtensibleCorbaHost implements CorbaHost { - - private CorbaHostExtensionPoint hosts; - - public ExtensibleCorbaHost(ExtensionPointRegistry registry) { - this.hosts = registry.getExtensionPoint(CorbaHostExtensionPoint.class); - } - - public static ExtensibleCorbaHost getInstance(ExtensionPointRegistry registry) { - UtilityExtensionPoint utilityExtensionPoint = registry.getExtensionPoint(UtilityExtensionPoint.class); - return utilityExtensionPoint.getUtility(ExtensibleCorbaHost.class); - } - - public Object lookup(String uri) throws CorbaHostException { - return getCorbaHost().lookup(uri); - } - - public void registerServant(String uri, Object serviceObject) throws CorbaHostException { - getCorbaHost().registerServant(uri, serviceObject); - } - - public void unregisterServant(String uri) throws CorbaHostException { - getCorbaHost().unregisterServant(uri); - } - - protected CorbaHost getCorbaHost() throws CorbaHostException { - if (hosts.getCorbaHosts().isEmpty()) { - throw new CorbaHostException("No registered CORBA hosts"); - } - return hosts.getCorbaHosts().get(0); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java deleted file mode 100755 index 6989b3ad06..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java +++ /dev/null @@ -1,226 +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; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.UnknownHostException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -/** - * @version $Rev$ $Date$ - * Class partially copied from eclipse wst project - * (http://repo1.maven.org/maven2/org/eclipse/wst/server/core/1.0.205-v20070829b/). - * Finally we should use jar from maven dependency. Problem described in - * http://www.fornax-platform.org/cp/display/fornax/2.+Hello+World+Tutorial+(CSC)?replyToComment=2098#comment-2098 - * needs to be fixed. - */ -public class SocketUtil { - - protected static final Object lock = new Object(); - - private static Set<String> localHostCache; - private static Set<String> notLocalHostCache = new HashSet<String>(); - private static Map<String, CacheThread> threadMap = new HashMap<String, CacheThread>(); - - private static Set<InetAddress> addressCache; - - static class CacheThread extends Thread { - private Set<InetAddress> currentAddresses; - private Set<String> addressList; - private String host; - private Set<String> nonAddressList; - private Map<String, CacheThread> threadMap2; - - public CacheThread(String host, - Set<InetAddress> currentAddresses, - Set<String> addressList, - Set<String> nonAddressList, - Map<String, CacheThread> threadMap2) { - super("Caching localhost information"); - this.host = host; - this.currentAddresses = currentAddresses; - this.addressList = addressList; - this.nonAddressList = nonAddressList; - this.threadMap2 = threadMap2; - } - - public void run() { - if (currentAddresses != null) { - Iterator<InetAddress> iter2 = currentAddresses.iterator(); - while (iter2.hasNext()) { - InetAddress addr = iter2.next(); - String hostname = addr.getHostName(); - String hostname2 = addr.getCanonicalHostName(); - synchronized (lock) { - if (hostname != null && !addressList.contains(hostname)) - addressList.add(hostname); - if (hostname2 != null && !addressList.contains(hostname2)) - addressList.add(hostname2); - } - } - } - - try { - InetAddress[] addrs = InetAddress.getAllByName(host); - int length = addrs.length; - for (int j = 0; j < length; j++) { - InetAddress addr = addrs[0]; - String hostname = addr.getHostName(); - String hostname2 = addr.getCanonicalHostName(); - synchronized (lock) { - if (addr.isLoopbackAddress()) { - if (hostname != null && !addressList.contains(hostname)) - addressList.add(hostname); - if (hostname2 != null && !addressList.contains(hostname2)) - addressList.add(hostname2); - } else { - if (hostname != null && !nonAddressList.contains(hostname)) - nonAddressList.add(hostname); - if (hostname2 != null && !nonAddressList.contains(hostname2)) - nonAddressList.add(hostname2); - } - } - } - } catch (UnknownHostException e) { - synchronized (lock) { - if (host != null && !nonAddressList.contains(host)) - nonAddressList.add(host); - } - } - synchronized (lock) { - threadMap2.remove(host); - } - } - } - - public static boolean isLocalhost(final String host) { - if (host == null || host.equals("")) - return false; - - if ("localhost".equals(host) || "127.0.0.1".equals(host)) - return true; - - // check simple cases - try { - InetAddress localHostaddr = InetAddress.getLocalHost(); - if (localHostaddr.getHostName().equals(host) || host.equals(localHostaddr.getCanonicalHostName()) - || localHostaddr.getHostAddress().equals(host)) - return true; - } catch (Exception e) { - - } - - // check for current thread and wait if necessary - boolean currentThread = false; - try { - Thread t = null; - synchronized (lock) { - t = threadMap.get(host); - } - if (t != null && t.isAlive()) { - currentThread = true; - t.join(30); - } - } catch (Exception e) { - - } - - // check if cache is still ok - boolean refreshedCache = false; - try { - // get network interfaces - final Set<InetAddress> currentAddresses = new HashSet<InetAddress>(); - currentAddresses.add(InetAddress.getLocalHost()); - Enumeration<?> nis = NetworkInterface.getNetworkInterfaces(); - while (nis.hasMoreElements()) { - NetworkInterface inter = (NetworkInterface)nis.nextElement(); - Enumeration<InetAddress> ias = inter.getInetAddresses(); - while (ias.hasMoreElements()) - currentAddresses.add(ias.nextElement()); - } - - // check if cache is empty or old and refill it if necessary - if (addressCache == null || !addressCache.containsAll(currentAddresses) - || !currentAddresses.containsAll(addressCache)) { - CacheThread cacheThread = null; - refreshedCache = true; - - synchronized (lock) { - addressCache = currentAddresses; - notLocalHostCache = new HashSet<String>(); - localHostCache = new HashSet<String>(currentAddresses.size() * 3); - - Iterator<InetAddress> iter = currentAddresses.iterator(); - while (iter.hasNext()) { - InetAddress addr = iter.next(); - String a = addr.getHostAddress(); - if (a != null && !localHostCache.contains(a)) - localHostCache.add(a); - } - - cacheThread = new CacheThread(host, currentAddresses, localHostCache, notLocalHostCache, threadMap); - threadMap.put(host, cacheThread); - cacheThread.setDaemon(true); - cacheThread.setPriority(Thread.NORM_PRIORITY - 1); - cacheThread.start(); - } - cacheThread.join(200); - } - } catch (Exception e) { - } - - synchronized (lock) { - if (localHostCache.contains(host)) - return true; - if (notLocalHostCache.contains(host)) - return false; - } - - // if the cache hasn't been cleared, maybe we still need to lookup the - // host - if (!refreshedCache && !currentThread) { - try { - CacheThread cacheThread = null; - synchronized (lock) { - cacheThread = new CacheThread(host, null, localHostCache, notLocalHostCache, threadMap); - threadMap.put(host, cacheThread); - cacheThread.setDaemon(true); - cacheThread.setPriority(Thread.NORM_PRIORITY - 1); - cacheThread.start(); - } - cacheThread.join(75); - - synchronized (lock) { - if (localHostCache.contains(host)) - return true; - } - } catch (Exception e) { - } - } - return false; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint deleted file mode 100644 index a72bed4ea8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint +++ /dev/null @@ -1,18 +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.DefaultCorbaHostExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java deleted file mode 100644 index 4e076f9342..0000000000 --- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java +++ /dev/null @@ -1,145 +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; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests for host utils - */ -public class UtilsTestCase { - - private void assertDetailsAreOk(CorbanameURL details, String host, int port, String nameService, List<String> namePath) { - assertTrue(details.getHost().equals(host)); - assertTrue(details.getNameService().equals(nameService)); - assertTrue(details.getPort() == port); - assertTrue(details.getNamePath().size() == namePath.size()); - for (int i = 0; i < namePath.size(); i++) { - assertTrue(details.getNamePath().get(i).equals(namePath.get(i))); - } - } - - /** - * Tests if corbaname url is beeing processes properly - */ - @Test - public void test_validCorbaname() { - String testUri = null; - CorbanameURL details = null; - List<String> namePath = null; - - testUri = "corbaname:ignore:host:1234/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, "host", 1234, "Service", namePath); - - testUri = "corbaname:ignore:host:/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, "host", CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname:ignore:host/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, "host", CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname:ignore:/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname:ignore/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname:/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname/Service#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath); - - testUri = "corbaname#Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, CorbanameURL.DEFAULT_NAME_SERVICE, namePath); - - testUri = "corbaname#Parent/Mid/Reference"; - details = CorbaHostUtils.getServiceDetails(testUri); - namePath = new ArrayList<String>(); - namePath.add("Parent"); - namePath.add("Mid"); - namePath.add("Reference"); - assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, CorbanameURL.DEFAULT_NAME_SERVICE, namePath); - } - - /** - * Test for invalid corbaname url - */ - @Test - public void test_invalidCorbaname() { - String testUri = null; - - try { - testUri = "this.string.should.not.appear.in.the.beggining:ignore:host:1234/Service#Reference"; - CorbaHostUtils.getServiceDetails(testUri); - fail(); - } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); - } - - try { - testUri = "corbaname:ignore:host:1234/Service#"; - CorbaHostUtils.getServiceDetails(testUri); - fail(); - } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); - } - } - - /** - * Test for creating corbaname url from host, port, name parameters - */ - @Test - public void test_creatingCorbanameURI() { - String uri = CorbaHostUtils.createCorbanameURI("SomeHost", 1000, "SomeName"); - assertEquals("corbaname::SomeHost:1000/NameService#SomeName", uri); - } -} |