You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/21 23:29:54 UTC
svn commit: r697616 - in /tuscany/branches/sca-equinox/modules:
binding-rmi-runtime/ binding-rmi-runtime/META-INF/ binding-rmi-runtime/src/
binding-rmi-runtime/src/main/ binding-rmi-runtime/src/main/java/
binding-rmi-runtime/src/main/java/org/ binding-...
Author: jsdelfino
Date: Sun Sep 21 14:29:53 2008
New Revision: 697616
URL: http://svn.apache.org/viewvc?rev=697616&view=rev
Log:
Another fix for JIRA TUSCANY-2396, split binding-rmi into two modules, binding-rmi and binding-rmi-runtime.
Added:
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/README
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloException.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
- copied, changed from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
Removed:
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloException.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
Modified:
tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml
tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
Added: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE?rev=697616&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE (added)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE Sun Sep 21 14:29:53 2008
@@ -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.
+
+
+
Added: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/README
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/README?rev=697616&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/README (added)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/README Sun Sep 21 14:29:53 2008
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
Added: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE?rev=697616&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE (added)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE Sun Sep 21 14:29:53 2008
@@ -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/).
+
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml&p1=tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml Sun Sep 21 14:29:53 2008
@@ -25,14 +25,20 @@
<version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-binding-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<name>Apache Tuscany SCA RMI Binding Extension</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extension-helper</artifactId>
+ <artifactId>tuscany-binding-rmi</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
@@ -55,6 +61,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -66,10 +79,9 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.binding.rmi</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.binding.rmi.runtime</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.binding.rmi*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Export-Package>org.apache.tuscany.sca.binding.rmi.provider</Export-Package>
</instructions>
</configuration>
</plugin>
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java Sun Sep 21 14:29:53 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.binding.rmi;
+package org.apache.tuscany.sca.binding.rmi.provider;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -32,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics {
+public class RMIBindingInvoker implements Invoker, DataExchangeSemantics {
private RMIHost rmiHost;
private String host;
@@ -41,7 +41,7 @@
private Method remoteMethod;
private Remote proxy;
- public RMIReferenceInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) {
+ public RMIBindingInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) {
this.rmiHost = rmiHost;
this.remoteMethod = remoteMethod;
this.host = host;
Added: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java?rev=697616&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java (added)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java Sun Sep 21 14:29:53 2008
@@ -0,0 +1,65 @@
+/*
+ * 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.binding.rmi.provider;
+
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.rmi.ExtensibleRMIHost;
+import org.apache.tuscany.sca.host.rmi.RMIHost;
+import org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * RMI Binding Provider Factory
+ *
+ * @version $Rev$ $Date$
+ */
+public class RMIBindingProviderFactory implements BindingProviderFactory<RMIBinding> {
+
+ private RMIHost rmiHost;
+
+ public RMIBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+ RMIHostExtensionPoint rmiHosts = extensionPoints.getExtensionPoint(RMIHostExtensionPoint.class);
+ this.rmiHost = new ExtensibleRMIHost(rmiHosts);
+ }
+
+ public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
+ RuntimeComponentReference reference,
+ RMIBinding binding) {
+
+ return new RMIReferenceBindingProvider(component, reference, binding, rmiHost);
+ }
+
+ public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
+ RuntimeComponentService service,
+ RMIBinding binding) {
+ return new RMIServiceBindingProvider(component, service, binding, rmiHost);
+ }
+
+ public Class<RMIBinding> getModelType() {
+ return RMIBinding.class;
+ }
+
+}
Added: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java?rev=697616&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java (added)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java Sun Sep 21 14:29:53 2008
@@ -0,0 +1,81 @@
+/*
+ * 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.binding.rmi.provider;
+
+import java.lang.reflect.Method;
+
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
+import org.apache.tuscany.sca.host.rmi.RMIHost;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * Implementation of the RMI Binding Provider for References
+ *
+ * @version $Rev$ $Date$
+ */
+public class RMIReferenceBindingProvider implements ReferenceBindingProvider {
+
+ private RuntimeComponentReference reference;
+ private RMIBinding binding;
+ private RMIHost rmiHost;
+
+ public RMIReferenceBindingProvider(RuntimeComponent component,
+ RuntimeComponentReference reference,
+ RMIBinding binding,
+ RMIHost rmiHost) {
+ this.reference = reference;
+ this.binding = binding;
+ this.rmiHost = rmiHost;
+ }
+
+ public InterfaceContract getBindingInterfaceContract() {
+ return reference.getInterfaceContract();
+ }
+
+ public Invoker createInvoker(Operation operation) {
+ Class<?> iface = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass();
+ Method remoteMethod;
+ try {
+ remoteMethod = JavaInterfaceUtil.findMethod(iface, operation);
+ } catch (NoSuchMethodException e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ return new RMIBindingInvoker(rmiHost, binding.getHost(), binding.getPort(), binding.getServiceName(), remoteMethod);
+ }
+
+ public void start() {
+ }
+
+ public void stop() {
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
+
+}
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java Sun Sep 21 14:29:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.rmi;
+package org.apache.tuscany.sca.binding.rmi.provider;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -34,13 +34,15 @@
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.host.rmi.RMIHost;
import org.apache.tuscany.sca.host.rmi.RMIHostException;
import org.apache.tuscany.sca.interfacedef.Interface;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
import org.apache.tuscany.sca.runtime.RuntimeWire;
@@ -51,7 +53,7 @@
*
* @version $Rev$ $Date$
*/
-public class RMIService implements ComponentLifecycle {
+public class RMIServiceBindingProvider implements ServiceBindingProvider {
private RuntimeComponent component;
private RuntimeComponentService service;
@@ -59,7 +61,7 @@
private RMIHost rmiHost;
private RuntimeWire wire;
- public RMIService(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) {
+ public RMIServiceBindingProvider(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) {
this.component = rc;
this.service = rcs;
this.binding = binding;
@@ -87,7 +89,7 @@
public void stop() {
}
- protected int getPort(String port) {
+ private int getPort(String port) {
int portNumber = RMIHost.RMI_DEFAULT_PORT;
if (port != null && port.length() > 0) {
portNumber = Integer.decode(port);
@@ -95,7 +97,7 @@
return portNumber;
}
- protected Remote createRmiService(final Interface serviceInterface) {
+ private Remote createRmiService(final Interface serviceInterface) {
Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(UnicastRemoteObject.class);
enhancer.setCallback(new MethodInterceptor() {
@@ -138,7 +140,7 @@
return (Remote)enhancer.create();
}
- protected Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException {
+ private Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException {
return wire.invoke(op, args);
}
@@ -148,7 +150,7 @@
* generating the bytecode. Defining the class from the byte code must be the responsibility of the
* caller of this method, since it requires a ClassLoader to be created to define and load this interface.
*/
- protected byte[] generateRemoteInterface(Class serviceInterface) {
+ private byte[] generateRemoteInterface(Class serviceInterface) {
String interfazeName = serviceInterface.getCanonicalName();
ClassWriter cw = new ClassWriter(false);
@@ -179,7 +181,7 @@
return cw.toByteArray();
}
- protected Class<?> getTargetJavaClass(Interface targetInterface) {
+ private Class<?> getTargetJavaClass(Interface targetInterface) {
// TODO: right now assume that the target is always a Java
// Implementation. Need to figure out
// how to generate Java Interface in cases where the target is not a
@@ -196,4 +198,13 @@
return defineClass(null, byteArray, 0, byteArray.length);
}
}
+
+ public InterfaceContract getBindingInterfaceContract() {
+ return service.getInterfaceContract();
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
+
}
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory Sun Sep 21 14:29:53 2008
@@ -13,6 +13,7 @@
# "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.
-# Implementation class for the ExtensionActivator
-org.apache.tuscany.sca.binding.rmi.RMIBindingActivator
+# under the License.
+
+# Implementation class for the binding extension
+org.apache.tuscany.sca.binding.rmi.provider.RMIBindingProviderFactory;model=org.apache.tuscany.sca.binding.rmi.RMIBinding
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloException.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloException.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Copied: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/RMIBindingTest.composite)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite?p2=tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/test/resources/RMIBindingTest.composite&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
(empty)
Modified: tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml?rev=697616&r1=697615&r2=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi/pom.xml Sun Sep 21 14:29:53 2008
@@ -26,35 +26,16 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-binding-rmi</artifactId>
- <name>Apache Tuscany SCA RMI Binding Extension</name>
+ <name>Apache Tuscany SCA RMI Binding Model</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extension-helper</artifactId>
+ <artifactId>tuscany-assembly</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-rmi</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
@@ -68,8 +49,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.rmi</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.binding.rmi*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Export-Package>org.apache.tuscany.sca.binding.rmi</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java?rev=697616&r1=697615&r2=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java Sun Sep 21 14:29:53 2008
@@ -18,18 +18,20 @@
*/
package org.apache.tuscany.sca.binding.rmi;
-import org.apache.tuscany.sca.extension.helper.utils.AbstractBinding;
+import org.apache.tuscany.sca.assembly.Binding;
/**
* Represents a binding to an RMI service.
*
* @version $Rev$ $Date$
*/
-public class RMIBinding extends AbstractBinding {
+public class RMIBinding implements Binding {
private String host;
private String port;
private String serviceName;
+ private String uri;
+ private String name;
/**
* @return the host name of the RMI Service
@@ -74,4 +76,35 @@
public void setServiceName(String rmiServiceName) {
this.serviceName = rmiServiceName;
}
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean isUnresolved() {
+ // The binding is always resolved
+ return false;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+ // The binding is always resolved
+ }
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ // TODO Auto-generated method stub
+ return super.clone();
+ }
}
Copied: tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (from r697614, tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?p2=tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor&p1=tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator&r1=697614&r2=697616&rev=697616&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Sun Sep 21 14:29:53 2008
@@ -13,6 +13,7 @@
# "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.
-# Implementation class for the ExtensionActivator
-org.apache.tuscany.sca.binding.rmi.RMIBindingActivator
+# under the License.
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.rmi,model=org.apache.tuscany.sca.binding.rmi.RMIBinding