From 3b7a9c51b93925c567b6b84450410b2737cc565e Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:20 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245037 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/implementation-osgi-runtime/LICENSE | 203 ------------- .../META-INF/MANIFEST.MF | 29 -- .../modules/implementation-osgi-runtime/NOTICE | 6 - .../modules/implementation-osgi-runtime/pom.xml | 78 ----- .../osgi/runtime/OSGiImplementationProvider.java | 336 --------------------- .../runtime/OSGiImplementationProviderFactory.java | 61 ---- .../osgi/runtime/OSGiTargetInvoker.java | 210 ------------- .../src/main/resources/META-INF/definitions.xml | 37 --- ...cany.sca.provider.ImplementationProviderFactory | 20 -- .../impl-osgi-validation-messages.properties | 25 -- 10 files changed, 1005 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/LICENSE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/NOTICE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties (limited to 'sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/LICENSE b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/LICENSE deleted file mode 100644 index 6b0b1270ff..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/LICENSE +++ /dev/null @@ -1,203 +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-Beta1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF deleted file mode 100644 index 478d05eec4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF +++ /dev/null @@ -1,29 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.apache.tuscany.sca.implementation.osgi.runtime -Bundle-Version: 2.0.0 -Bundle-Name: Apache Tuscany SCA OSGi Implementation Runtime -Bundle-Vendor: The Apache Software Foundation -Bundle-Description: Apache Tuscany SCA OSGi Implementation -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -SCA-Version: 1.1 -Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0", - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.core.factory;version="2.0.0", - org.apache.tuscany.sca.core.invocation;version="2.0.0", - org.apache.tuscany.sca.implementation.osgi;version="2.0.0", - org.apache.tuscany.sca.interfacedef;version="2.0.0", - org.apache.tuscany.sca.interfacedef.java;version="2.0.0", - org.apache.tuscany.sca.interfacedef.util;version="2.0.0", - org.apache.tuscany.sca.invocation;version="2.0.0", - org.apache.tuscany.sca.monitor;version="2.0.0", - org.apache.tuscany.sca.policy;version="2.0.0", - org.apache.tuscany.sca.provider;version="2.0.0", - org.apache.tuscany.sca.runtime;version="2.0.0", - org.oasisopen.sca;version="2.0.0", - org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional, - org.osgi.framework;version="1.4.0", - org.osgi.util.tracker;version="1.3.0" -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 -Bundle-ActivationPolicy: lazy diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/NOTICE b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/NOTICE deleted file mode 100644 index ad2ba40961..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2010 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/pom.xml deleted file mode 100644 index 134fc536be..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-Beta1 - ../pom.xml - - - tuscany-implementation-osgi-runtime - Apache Tuscany SCA OSGi Implementation Extension Runtime - - jar - - - - - org.apache.tuscany.sca - tuscany-implementation-osgi - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-contribution-osgi - 2.0-Beta1 - runtime - - - - org.eclipse - osgi - 3.5.0-v20090520 - compile - - - - org.apache.tuscany.sca - tuscany-core - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-interface-java - 2.0-Beta1 - - - - junit - junit - 4.8.1 - test - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java deleted file mode 100644 index 1d5d99cd34..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java +++ /dev/null @@ -1,336 +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.implementation.osgi.runtime; - -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.REMOTE_CONFIG_SCA; -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.SCA_REFERENCE; -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.SERVICE_IMPORTED; -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.SERVICE_IMPORTED_CONFIGS; -import static org.osgi.framework.Constants.SERVICE_RANKING; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.Extensible; -import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory; -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; -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.invocation.Invoker; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; -import org.oasisopen.sca.ServiceRuntimeException; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceException; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; - -/** - * - */ -public class OSGiImplementationProvider implements ImplementationProvider { - private RuntimeComponent component; - private ProxyFactoryExtensionPoint proxyFactoryExtensionPoint; - private Bundle osgiBundle; - private boolean startedByMe; - private OSGiImplementation implementation; - private List registrations = new ArrayList(); - private OSGiImplementationFactory implementationFactory; - - public OSGiImplementationProvider(RuntimeComponent component, - OSGiImplementation impl, - ProxyFactoryExtensionPoint proxyFactoryExtensionPoint, - OSGiImplementationFactory implementationFactory) throws BundleException { - this.component = component; - this.proxyFactoryExtensionPoint = proxyFactoryExtensionPoint; - this.implementationFactory = implementationFactory; - this.implementation = impl; - this.osgiBundle = impl.getBundle(); - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - return new OSGiTargetInvoker(operation, this, service); - } - - public void start() { - // First try to start the osgi bundle - try { - int state = osgiBundle.getState(); - if ((state & Bundle.STARTING) == 0 && (state & Bundle.ACTIVE) == 0) { - osgiBundle.start(); - startedByMe = true; - } - } catch (BundleException e) { - throw new ServiceRuntimeException(e); - } - - for (ComponentReference ref : component.getReferences()) { - RuntimeComponentReference reference = (RuntimeComponentReference)ref; - InterfaceContract interfaceContract = reference.getInterfaceContract(); - final JavaInterface javaInterface = (JavaInterface)interfaceContract.getInterface(); - // final Class interfaceClass = javaInterface.getJavaClass(); - - // final Hashtable props = new Hashtable(); - // props.put(FILTER_MATCH_CRITERIA, ""); - // Collection interfaceNames = new ArrayList(); - // props.put(INTERFACE_MATCH_CRITERIA, interfaceNames); - // interfaceNames.add(interfaceClass.getName()); - - final Hashtable osgiProps = getOSGiProperties(reference); - osgiProps.put(SERVICE_RANKING, Integer.MAX_VALUE); - osgiProps.put(SCA_REFERENCE, component.getURI() + "#reference(" + ref.getName() + ")"); - osgiProps.put(SERVICE_IMPORTED, "true"); - osgiProps.put(SERVICE_IMPORTED_CONFIGS, new String[] {REMOTE_CONFIG_SCA}); - - for (EndpointReference epr : reference.getEndpointReferences()) { - final OSGiServiceFactory serviceFactory = new OSGiServiceFactory(javaInterface.getName(), epr); - ServiceRegistration registration = - AccessController.doPrivileged(new PrivilegedAction() { - public ServiceRegistration run() { - // Register the proxy as OSGi service - BundleContext context = osgiBundle.getBundleContext(); - ServiceRegistration registration = - context.registerService(javaInterface.getName(), serviceFactory, osgiProps); - return registration; - } - }); - registrations.add(registration); - } - } - - // Set the OSGi service reference properties into the SCA service - for (ComponentService service : component.getServices()) { - // The properties might have been set by the export service - boolean found = false; - for (Object ext : service.getExtensions()) { - if (ext instanceof OSGiProperty) { - found = true; - break; - } - } - if (found) { - continue; - } - ServiceReference serviceReference = getServiceReference(osgiBundle.getBundleContext(), service); - if (serviceReference != null) { - service.getExtensions().addAll(implementationFactory.createOSGiProperties(serviceReference)); - } - } - } - - public void stop() { - for (ServiceRegistration registration : registrations) { - try { - registration.unregister(); - } catch (IllegalStateException e) { - // The service has been unregistered, ignore it - } - } - registrations.clear(); - // [REVIEW] Shoud it take care of stopping the bundle? - if (startedByMe) { - try { - int state = osgiBundle.getState(); - if ((state & Bundle.STOPPING) == 0 && (state & Bundle.ACTIVE) != 0) { - osgiBundle.stop(); - } - } catch (BundleException e) { - throw new ServiceRuntimeException(e); - } finally { - startedByMe = false; - } - } - } - - public boolean supportsOneWayInvocation() { - return false; - } - - /** - * Get all the OSGi properties from the extension list - * @param extensible - * @return - */ - protected Hashtable getOSGiProperties(Extensible extensible) { - Hashtable props = new Hashtable(); - for (Object ext : extensible.getExtensions()) { - if (ext instanceof OSGiProperty) { - OSGiProperty p = (OSGiProperty)ext; - props.put(p.getName(), p.getValue()); - } - } - return props; - } - - protected Object getOSGiService(ComponentService service) { - BundleContext bundleContext = osgiBundle.getBundleContext(); - ServiceReference ref = getServiceReference(bundleContext, service); - if (ref != null) { - Object instance = bundleContext.getService(ref); - return instance; - } else { - return null; - } - } - - private ServiceReference getServiceReference(BundleContext bundleContext, ComponentService service) { - JavaInterface javaInterface = (JavaInterface)service.getInterfaceContract().getInterface(); - // String filter = getOSGiFilter(provider.getOSGiProperties(service)); - // FIXME: What is the filter? - String filter = "(!(" + SERVICE_IMPORTED + "=*))"; - // "(sca.service=" + component.getURI() + "#service-name\\(" + service.getName() + "\\))"; - ServiceReference ref; - try { - ref = bundleContext.getServiceReferences(javaInterface.getName(), filter)[0]; - } catch (InvalidSyntaxException e) { - throw new ServiceRuntimeException(e); - } - return ref; - } - - RuntimeComponent getComponent() { - return component; - } - - OSGiImplementation getImplementation() { - return implementation; - } - - /** - * A proxy invocation handler that wrap exceptions into OSGi ServiceException - */ - private static class InvocationHandlerDelegate implements InvocationHandler { - private final Object instance; - - public InvocationHandlerDelegate(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - if (!Proxy.isProxyClass(instance.getClass())) { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - try { - return m.invoke(instance, args); - } catch (InvocationTargetException e) { - wrapException(method, e.getCause()); - return null; - } - } else { - InvocationHandler handler = Proxy.getInvocationHandler(instance); - try { - return handler.invoke(instance, method, args); - } catch (Throwable e) { - wrapException(method, e); - return null; - } - } - } - - private void wrapException(Method method, Throwable e) throws Throwable { - for (Class exType : method.getExceptionTypes()) { - if (exType.isInstance(e)) { - throw e; - } - } - throw new ServiceException(e.getMessage(), ServiceException.REMOTE, e); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param - * @param obj - * @param cls - * @return - */ - static T cast(Object obj, Class cls) { - if (obj == null) { - return null; - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class[] {cls}, - new InvocationHandlerDelegate(obj))); - } - } - } - - public class OSGiServiceFactory implements ServiceFactory { - private RuntimeEndpointReference epr; - private String interfaceName; - - /** - * @param interfaceName - * @param epr - */ - public OSGiServiceFactory(String interfaceName, EndpointReference epr) { - super(); - this.interfaceName = interfaceName; - this.epr = (RuntimeEndpointReference)epr; - } - - public Object getService(Bundle bundle, ServiceRegistration registration) { - try { - Class interfaceClass = null; - try { - interfaceClass = bundle.loadClass(interfaceName); - } catch (ClassNotFoundException e) { - return null; - } - ProxyFactory proxyService = proxyFactoryExtensionPoint.getInterfaceProxyFactory(); - if (!interfaceClass.isInterface()) { - proxyService = proxyFactoryExtensionPoint.getClassProxyFactory(); - } - Object proxy = proxyService.createProxy(interfaceClass, epr); - return InvocationHandlerDelegate.cast(proxy, interfaceClass); - } catch (Throwable e) { - throw new ServiceException(e.getMessage(), ServiceException.FACTORY_EXCEPTION, e); - } - } - - public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) { - // Do we need to release the proxy? - } - - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java deleted file mode 100644 index 11b29de248..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.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.implementation.osgi.runtime; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osgi.framework.BundleException; - -/** - * Builds a OSGi-based implementation provider from a component definition - * - * @version $Rev$ $Date$ - */ -public class OSGiImplementationProviderFactory implements ImplementationProviderFactory { - private OSGiImplementationFactory implementationFactory; - private ProxyFactoryExtensionPoint proxyFactoryExtensionPoint; - - public OSGiImplementationProviderFactory(ExtensionPointRegistry registry) { - proxyFactoryExtensionPoint = registry.getExtensionPoint(ProxyFactoryExtensionPoint.class); - FactoryExtensionPoint factoryExtensionPoint = registry.getExtensionPoint(FactoryExtensionPoint.class); - this.implementationFactory = factoryExtensionPoint.getFactory(OSGiImplementationFactory.class); - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, - OSGiImplementation implementation) { - try { - return new OSGiImplementationProvider(component, implementation, proxyFactoryExtensionPoint, - implementationFactory); - } catch (BundleException e) { - throw new RuntimeException(e); - } - - } - - public Class getModelType() { - return OSGiImplementation.class; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java deleted file mode 100644 index a9a2fdbd0b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java +++ /dev/null @@ -1,210 +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.implementation.osgi.runtime; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - -import org.apache.tuscany.sca.interfacedef.DataType; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.interfacedef.java.JavaOperation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osgi.framework.Constants; - -/** - * The Invoker looks up the corresponding OSGi service from the OSGi service registry - * and delegate the call to it. - * - * @version $Rev$ $Date$ - */ -public class OSGiTargetInvoker implements Invoker { - - private Operation operation; - - private final OSGiImplementationProvider provider; - private final RuntimeComponent component; - private final RuntimeComponentService service; - - public OSGiTargetInvoker(Operation operation, OSGiImplementationProvider provider, RuntimeComponentService service) { - - this.operation = operation; - this.service = service; - this.provider = provider; - this.component = provider.getComponent(); - - } - - private Object invokeTarget(Message msg) throws InvocationTargetException { - - Operation op = msg.getOperation(); - if (op == null) { - op = this.operation; - } - - try { - Object instance = provider.getOSGiService(service); - Method m = findMethod(instance.getClass(), operation); - - Object ret = invokeMethod(instance, m, msg); - - return ret; - } catch (InvocationTargetException e) { - throw e; - } catch (Exception e) { - throw new InvocationTargetException(e); - } - } - - protected Object invokeMethod(Object instance, Method m, Message msg) throws InvocationTargetException { - - try { - - Object payload = msg.getBody(); - - if (payload != null && !payload.getClass().isArray()) { - return m.invoke(instance, payload); - } else { - return m.invoke(instance, (Object[])payload); - } - - } catch (InvocationTargetException e) { - throw e; - } catch (Exception e) { - throw new InvocationTargetException(e); - } - } - - public Message invoke(Message msg) { - try { - Object resp = invokeTarget(msg); - msg.setBody(resp); - } catch (InvocationTargetException e) { - msg.setFaultBody(e.getCause()); - } - return msg; - } - - private String getOSGiFilter(Hashtable props) { - Object serviceID = props.get(Constants.SERVICE_ID); - if (serviceID != null) { - return "(" + Constants.SERVICE_ID + "=" + serviceID + ")"; - } - - String filter = ""; - - if (props != null && props.size() > 0) { - int propCount = 0; - for (String propName : props.keySet()) { - String value = String.valueOf(props.get(propName)); - StringBuffer buf = new StringBuffer(); - for (char c : value.toCharArray()) { - if (c == '(' || c == ')') { - buf.append("\\" + c); - } else { - buf.append(c); - } - } - filter = filter + "(" + propName + "=" + buf.toString() + ")"; - propCount++; - } - - if (propCount > 1) { - filter = "(&" + filter + ")"; - } - } else { - filter = null; - } - return filter; - } - - /** - * @Deprecated - */ - private static Class[] getPhysicalTypes(Operation operation) { - DataType> inputType = operation.getInputType(); - if (inputType == null) { - return new Class[] {}; - } - List types = inputType.getLogical(); - Class[] javaTypes = new Class[types.size()]; - for (int i = 0; i < javaTypes.length; i++) { - Type physical = types.get(i).getPhysical(); - if (physical instanceof Class) { - javaTypes[i] = (Class)physical; - } else { - throw new UnsupportedOperationException(); - } - } - return javaTypes; - } - - /** - * Return the method on the implementation class that matches the operation. - * - * @param implClass the implementation class or interface - * @param operation the operation to match - * @return the method described by the operation - * @throws NoSuchMethodException if no such method exists - * @Deprecated - */ - public static Method findMethod(Class implClass, Operation operation) throws NoSuchMethodException { - String name = operation.getName(); - if (operation instanceof JavaOperation) { - name = ((JavaOperation)operation).getJavaMethod().getName(); - } - Interface interface1 = operation.getInterface(); - int numParams = operation.getInputType().getLogical().size(); - if (interface1 != null && interface1.isRemotable()) { - List matchingMethods = new ArrayList(); - for (Method m : implClass.getMethods()) { - if (m.getName().equals(name) && m.getParameterTypes().length == numParams) { - matchingMethods.add(m); - } - } - - // TUSCANY-2180 If there is only one method then we just match on the name - // (this is the same as the existing behaviour) - if (matchingMethods.size() == 1) { - return matchingMethods.get(0); - } - if (matchingMethods.size() > 1) { - // TUSCANY-2180 We need to check the parameter types too - Class[] paramTypes = getPhysicalTypes(operation); - return implClass.getMethod(name, paramTypes); - } - - // No matching method found - throw new NoSuchMethodException("No matching method for operation " + operation.getName() - + " is found on " - + implClass); - } - Class[] paramTypes = getPhysicalTypes(operation); - return implClass.getMethod(name, paramTypes); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml deleted file mode 100644 index 8718e58d8e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - An OSGi intent to pass data by reference - - - - - - An OSGi intent to pass data by value - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory deleted file mode 100644 index 33f152ba13..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ /dev/null @@ -1,20 +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. - -# Implementation class for the implementation extension -org.apache.tuscany.sca.implementation.osgi.runtime.OSGiImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties deleted file mode 100644 index 2503be0b13..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties +++ /dev/null @@ -1,25 +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. -# -# -ContributionReadException = ContributionReadException occured due to: -ContributionResolveException = ContributionResolveException occured due to: -PropertyShouldSpecifySR = Properties in implementation.osgi should specify service or reference -CouldNotLocateOSGiBundle = Could not locate OSGi bundle: {0} -MissingComponentTypeFile = Missing .componentType side file: {0} \ No newline at end of file -- cgit v1.2.3