diff options
24 files changed, 467 insertions, 88 deletions
diff --git a/java/sca/modules/host-corba-jdk/LICENSE b/java/sca/modules/host-corba-jdk/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/java/sca/modules/host-corba-jdk/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-jdk/NOTICE b/java/sca/modules/host-corba-jdk/NOTICE new file mode 100644 index 0000000000..1325efd8bf --- /dev/null +++ b/java/sca/modules/host-corba-jdk/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-jdk/pom.xml b/java/sca/modules/host-corba-jdk/pom.xml new file mode 100644 index 0000000000..771d22877e --- /dev/null +++ b/java/sca/modules/host-corba-jdk/pom.xml @@ -0,0 +1,57 @@ +<?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-jdk</artifactId> + <name>Apache Tuscany SCA JDK built-in CORBA Host</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-corba</artifactId> + <version>1.4-SNAPSHOT</version> + </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.jdk</Bundle-SymbolicName> + <Bundle-Description>${pom.name}</Bundle-Description> + <Export-Package>org.apache.tuscany.sca.host.corba.jdk*</Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java new file mode 100644 index 0000000000..1bf86ccec9 --- /dev/null +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.host.corba.jdk; + +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; + +/** + * @version $Rev$ $Date$ + */ +public class CorbaRuntimeModuleActivator implements ModuleActivator { + 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); + + server = new DefaultCorbaHost(); + corbaHosts.addCorbaHost(server); + } + + public void stop(ExtensionPointRegistry registry) { + if (server != null) { + server.stop(); + } + } + +} diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHost.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java index c8b485466e..2e6d319810 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHost.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java @@ -17,13 +17,21 @@ * under the License. */ -package org.apache.tuscany.sca.host.corba; +package org.apache.tuscany.sca.host.corba.jdk; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.host.corba.CorbaHost; +import org.apache.tuscany.sca.host.corba.CorbaHostException; import org.omg.CORBA.ORB; import org.omg.CORBA.Object; import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; +import org.omg.CosNaming.NamingContextExt; +import org.omg.CosNaming.NamingContextExtHelper; import org.omg.CosNaming.NamingContextPackage.InvalidName; import org.omg.CosNaming.NamingContextPackage.NotFound; @@ -31,6 +39,9 @@ import org.omg.CosNaming.NamingContextPackage.NotFound; * Default implementation of CORBA host */ 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 void validatePort(int port) throws IllegalArgumentException { if (port < 1) { @@ -44,15 +55,9 @@ public class DefaultCorbaHost implements CorbaHost { } } - private String[] getArgs(String host, int port) { - String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port}; - return args; - } - - private NamingContext getNamingContext(String host, int port) throws Exception { - ORB orb = ORB.init(getArgs(host, port), null); + private NamingContextExt getNamingContext(ORB orb) throws Exception { org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - return NamingContextHelper.narrow(objRef); + return NamingContextExtHelper.narrow(objRef); } private void handleException(Exception e) throws CorbaHostException { @@ -66,16 +71,11 @@ public class DefaultCorbaHost implements CorbaHost { } } - public void registerServant(String name, String host, int port, Object servantObject) throws CorbaHostException { - validatePort(port); + public void registerServant(ORB orb, String name, Object servantObject) throws CorbaHostException { validateName(name); - if (host == null || host.length() == 0) { - host = "localhost"; - } try { - NamingContext ncRef = getNamingContext(host, port); - NameComponent nc = new NameComponent(name, ""); - NameComponent[] path = {nc}; + NamingContextExt ncRef = getNamingContext(orb); + NameComponent[] path = ncRef.to_name(name); try { ncRef.resolve(path); // no exception means that some object is already registered @@ -91,33 +91,23 @@ public class DefaultCorbaHost implements CorbaHost { } } - public void unregisterServant(String name, String host, int port) throws CorbaHostException { - validatePort(port); + public void unregisterServant(ORB orb, String name) throws CorbaHostException { validateName(name); - if (host == null || host.length() == 0) { - host = "localhost"; - } try { - NamingContext ncRef = getNamingContext(host, port); - NameComponent nc = new NameComponent(name, ""); - NameComponent[] path = {nc}; + NamingContextExt ncRef = getNamingContext(orb); + NameComponent[] path = ncRef.to_name(name); ncRef.unbind(path); } catch (Exception e) { handleException(e); } } - public Object getReference(String name, String host, int port) throws CorbaHostException { - validatePort(port); + public Object lookup(ORB orb, String name) throws CorbaHostException { validateName(name); - if (host == null || host.length() == 0) { - host = "localhost"; - } Object result = null; try { - NamingContext ncRef = getNamingContext(host, port); - NameComponent nc = new NameComponent(name, ""); - NameComponent path[] = {nc}; + NamingContextExt ncRef = getNamingContext(orb); + NameComponent[] path = ncRef.to_name(name); result = ncRef.resolve(path); } catch (Exception e) { handleException(e); @@ -125,4 +115,52 @@ public class DefaultCorbaHost implements CorbaHost { return result; } + public ORB createORB(String host, int port, boolean server) throws CorbaHostException { + validatePort(port); + + String key = host + ":" + port; + ORB orb = orbs.get(key); + if (orb != null) { + return orb; + } + // Create an ORB object + Properties props = new Properties(); + props.putAll(System.getProperties()); + + String portStr = String.valueOf(port); + props.put("org.omg.CORBA.ORBServerId", "1000000"); + props.put("org.omg.CORBA.ORBInitialHost", host); + props.put("org.omg.CORBA.ORBInitialPort", portStr); + + // STEP 1: Set ORBPeristentServerPort property + // Set the proprietary property to open up a port to listen to + // INS requests. + + if (server) { + props.put("com.sun.CORBA.POA.ORBPersistentServerPort", portStr); + props.put("com.ibm.CORBA.ListenerPort", portStr); + props.put("gnu.CORBA.ListenerPort", portStr); + // props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB"); + // props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton"); + props.put("yoko.orb.oa.endpoint", "iiop --host " + host + " --port " + port); + props.put("yoko.orb.poamanager.TNameService.endpoint", "iiop --host " + host); + } + + String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port}; + orb = ORB.init(args, props); + orbs.put(key, orb); + return orb; + } + + public void stop() { + for (ORB orb : orbs.values()) { + try { + orb.shutdown(true); + orb.destroy(); + } catch (Throwable e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + } + } diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java index 59f0ce9a53..59f0ce9a53 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java index 7eb29b0859..03a243fd48 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java @@ -47,7 +47,7 @@ public class TransientNameServer { synchronized (flag) { try { service.run(); - orb = service.createdOrb; + orb = service.getORB(); started = Boolean.TRUE; } catch (Throwable e) { started = Boolean.FALSE; @@ -56,19 +56,11 @@ public class TransientNameServer { flag.notifyAll(); } } + // Wait for requests orb.run(); - /* - // now we just sit and wait here. - synchronized (service) { - try { - service.wait(); - } catch (InterruptedException e) { - throw new IllegalStateException(e); - } - } - */ } }; + // t.setDaemon(true); t.start(); checkState(); return t.isAlive() ? t : null; diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java index 4e6c7a9715..39ba6b784e 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java @@ -170,6 +170,7 @@ public class TransientNameService { public void destroy() { // only destroy this if we created the orb instance. if (createdOrb != null) { + createdOrb.shutdown(true); createdOrb.destroy(); createdOrb = null; } diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java index a7164e9ef3..a7164e9ef3 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java index 444143f173..444143f173 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java +++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java diff --git a/java/sca/modules/host-corba-jdk/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca/modules/host-corba-jdk/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator new file mode 100644 index 0000000000..7bd1cf7d40 --- /dev/null +++ b/java/sca/modules/host-corba-jdk/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.jdk.CorbaRuntimeModuleActivator
\ No newline at end of file diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java index 2c7a308769..96265a318e 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.apache.tuscany.sca.host.corba.CorbaHost; import org.apache.tuscany.sca.host.corba.CorbaHostException; -import org.apache.tuscany.sca.host.corba.DefaultCorbaHost; +import org.apache.tuscany.sca.host.corba.jdk.DefaultCorbaHost; import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; import org.apache.tuscany.sca.host.corba.naming.TransientNameService; import org.apache.tuscany.sca.host.corba.testing.general.TestInterface; @@ -106,7 +106,7 @@ public class DefaultCorbaHostTestCase { killProcess(tn); } */ - + private static TransientNameServer server; @BeforeClass @@ -135,13 +135,14 @@ public class DefaultCorbaHostTestCase { @Test public void test_registerServant() { try { + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false); TestInterface servant = new TestInterfaceServant(); - host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant); + host.registerServant(orb, "Test", servant); - TestInterface ref = TestInterfaceHelper.narrow(host.getReference("Test", null, DEFAULT_PORT)); + TestInterface ref = TestInterfaceHelper.narrow(host.lookup(orb, "Test")); assertEquals(2, ref.getInt(2)); - host.unregisterServant("Test", LOCALHOST, DEFAULT_PORT); + host.unregisterServant(orb, "Test"); } catch (Exception e) { e.printStackTrace(); fail(); @@ -154,9 +155,10 @@ public class DefaultCorbaHostTestCase { @Test public void test_nameAlreadyRegistered() { try { + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false); TestInterface servant = new TestInterfaceServant(); - host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant); - host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant); + host.registerServant(orb, "Test", servant); + host.registerServant(orb, "Test", servant); fail(); } catch (CorbaHostException e) { assertTrue(e.getMessage().equals(CorbaHostException.BINDING_IN_USE)); @@ -172,7 +174,8 @@ public class DefaultCorbaHostTestCase { @Test public void test_getNonExistingObject() { try { - host.getReference("NonExistingReference", LOCALHOST, DEFAULT_PORT); + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false); + host.lookup(orb, "NonExistingReference"); fail(); } catch (CorbaHostException e) { assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT)); @@ -188,7 +191,8 @@ public class DefaultCorbaHostTestCase { @Test public void test_unregisterNonExistentObject() { try { - host.unregisterServant("NonExistingReference2", LOCALHOST, DEFAULT_PORT); + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false); + host.unregisterServant(orb, "NonExistingReference2"); fail(); } catch (CorbaHostException e) { assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT)); @@ -204,8 +208,9 @@ public class DefaultCorbaHostTestCase { @Test public void test_invalidHost() { try { + ORB orb = host.createORB("not_" + LOCALHOST, DEFAULT_PORT, false); TestInterface servant = new TestInterfaceServant(); - host.registerServant("Test", "nosuchhost", DEFAULT_PORT, servant); + host.registerServant(orb, "Test", servant); fail(); } catch (CorbaHostException e) { // Expected @@ -221,8 +226,9 @@ public class DefaultCorbaHostTestCase { @Test public void test_invalidPort() { try { + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT + 1, false); TestInterface servant = new TestInterfaceServant(); - host.registerServant("Test", LOCALHOST, 9991, servant); + host.registerServant(orb, "Test", servant); fail(); } catch (CorbaHostException e) { // Expected @@ -239,8 +245,9 @@ public class DefaultCorbaHostTestCase { @Ignore("SUN JDK 6 is happy with all kind of names") public void test_invalidBindingName() { try { + ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false); TestInterface servant = new TestInterfaceServant(); - host.registerServant("---", LOCALHOST, DEFAULT_PORT, servant); + host.registerServant(orb, "---", servant); fail(); } catch (CorbaHostException e) { assertTrue(e.getMessage().equals(CorbaHostException.WRONG_NAME)); diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java index 8d1a9db9e9..8d1a9db9e9 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java index fe85dc7743..fe85dc7743 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java index 305a4d7b97..305a4d7b97 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java index f557d3e020..f557d3e020 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java index f993066dab..f993066dab 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java index 30a77deaf5..30a77deaf5 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java index 0ebde8ef0d..0ebde8ef0d 100644 --- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java +++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java diff --git a/java/sca/modules/host-corba/src/test/resources/general.idl b/java/sca/modules/host-corba-jdk/src/test/resources/general.idl index f67566deb8..f67566deb8 100644 --- a/java/sca/modules/host-corba/src/test/resources/general.idl +++ b/java/sca/modules/host-corba-jdk/src/test/resources/general.idl 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 7d9a3db587..1ff0e79cbd 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 @@ -19,43 +19,45 @@ package org.apache.tuscany.sca.host.corba; +import org.omg.CORBA.ORB; import org.omg.CORBA.Object; /** * CORBA Service hosting interface */ public interface CorbaHost { - + /** + * Create an ORB instance + * @param host The host name + * @param port The port number + * @param server Is it for server side + * @return + */ + ORB createORB(String host, int port, boolean server) throws CorbaHostException; /** * Registers servant in name server. - * + * @param orb The ORB instance * @param name binding name - * @param host name server host - * @param port name server port * @param serviceObject * @throws CorbaHostException */ - void registerServant(String name, String host, int port, Object serviceObject) throws CorbaHostException; + void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException; /** * Removes servant from name server - * + * @param orb The ORB instance * @param name binding name - * @param host name server host - * @param port name server port * @throws CorbaHostException */ - void unregisterServant(String name, String host, int port) throws CorbaHostException; + void unregisterServant(ORB orb, String name) throws CorbaHostException; /** * Gets reference to object - * + * @param orb The ORB instance * @param name binding name - * @param host name server host - * @param port name server port * @return objects reference * @throws CorbaHostException */ - Object getReference(String name, String host, int port) throws CorbaHostException; + Object lookup(ORB orb, String name) throws CorbaHostException; } diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java index f9150f137c..c7a6eb6ba4 100644 --- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java +++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java @@ -30,8 +30,6 @@ public class DefaultCorbaHostExtensionPoint implements CorbaHostExtensionPoint { private List<CorbaHost> corbaHosts = new ArrayList<CorbaHost>(); public DefaultCorbaHostExtensionPoint() { - CorbaHost defaultHost = new DefaultCorbaHost(); - addCorbaHost(defaultHost); } public void addCorbaHost(CorbaHost host) { 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 0b44ccafe1..630a42ece5 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 @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.host.corba; +import org.omg.CORBA.ORB; import org.omg.CORBA.Object; /** @@ -26,31 +27,33 @@ import org.omg.CORBA.Object; */ public class ExtensibleCorbaHost implements CorbaHost { - private CorbaHostExtensionPoint chep; + private CorbaHostExtensionPoint hosts; public ExtensibleCorbaHost(CorbaHostExtensionPoint chep) { - this.chep = chep; + this.hosts = chep; } - public Object getReference(String name, String host, int port) throws CorbaHostException { - if (chep.getCorbaHosts().isEmpty()) { - throw new CorbaHostException("No registered CORBA hosts"); - } - return chep.getCorbaHosts().get(0).getReference(name, host, port); + public Object lookup(ORB orb, String name) throws CorbaHostException { + return getCorbaHost().lookup(orb, name); } - public void registerServant(String name, String host, int port, Object serviceObject) throws CorbaHostException { - if (chep.getCorbaHosts().isEmpty()) { - throw new CorbaHostException("No registered CORBA hosts"); - } - chep.getCorbaHosts().get(0).registerServant(name, host, port, serviceObject); + public void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException { + getCorbaHost().registerServant(orb, name, serviceObject); } - public void unregisterServant(String name, String host, int port) throws CorbaHostException { - if (chep.getCorbaHosts().isEmpty()) { + public void unregisterServant(ORB orb, String name) throws CorbaHostException { + getCorbaHost().unregisterServant(orb, name); + } + + protected CorbaHost getCorbaHost() throws CorbaHostException { + if (hosts.getCorbaHosts().isEmpty()) { throw new CorbaHostException("No registered CORBA hosts"); } - chep.getCorbaHosts().get(0).unregisterServant(name, host, port); + return hosts.getCorbaHosts().get(0); + } + + public ORB createORB(String host, int port, boolean server) throws CorbaHostException { + return getCorbaHost().createORB(host, port, server); } } diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index 699f5e1aab..d4dbd7fe46 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -105,6 +105,7 @@ <module>extensibility</module> <module>extension-helper</module> <module>host-corba</module> + <module>host-corba-jdk</module> <module>host-ejb</module> <module>host-embedded</module> <module>host-http</module> |