From fb3dd9a9095abc40027318b1712d0184f6d60e73 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 30 Oct 2009 08:00:47 +0000 Subject: Delete old M4 branch and start again to pick up all the recent trunk changes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831223 13f79535-47bb-0310-9956-ffa450edef68 --- .../osgi/DefaultOSGiImplementationFactory.java | 34 -- .../osgi/DefaultServiceDescriptionsFactory.java | 33 -- .../implementation/osgi/OSGiImplementation.java | 51 --- .../osgi/OSGiImplementationFactory.java | 37 --- .../sca/implementation/osgi/OSGiProperty.java | 179 ----------- .../tuscany/sca/implementation/osgi/SCAConfig.java | 65 ---- .../implementation/osgi/ServiceDescription.java | 40 --- .../implementation/osgi/ServiceDescriptions.java | 36 --- .../osgi/ServiceDescriptionsFactory.java | 31 -- .../osgi/impl/OSGiImplementationFactoryImpl.java | 43 --- .../osgi/impl/OSGiImplementationImpl.java | 107 ------- .../implementation/osgi/impl/OSGiPropertyImpl.java | 51 --- .../implementation/osgi/impl/SCAConfigImpl.java | 58 ---- .../osgi/impl/ServiceDescriptionImpl.java | 51 --- .../osgi/impl/ServiceDescriptionsFactoryImpl.java | 48 --- .../osgi/impl/ServiceDescriptionsImpl.java | 36 --- .../osgi/xml/BluePrintComponentsProcessor.java | 144 --------- .../osgi/xml/OSGiComponentProcessor.java | 174 ----------- .../osgi/xml/OSGiImplementationActivator.java | 47 --- .../osgi/xml/OSGiImplementationProcessor.java | 342 --------------------- .../osgi/xml/OSGiPropertyProcessor.java | 104 ------- .../osgi/xml/SCAConfigProcessor.java | 190 ------------ .../xml/ServiceDescriptionsDocumentProcessor.java | 99 ------ .../osgi/xml/ServiceDescriptionsModelResolver.java | 59 ---- .../osgi/xml/ServiceDescriptionsProcessor.java | 191 ------------ 25 files changed, 2250 deletions(-) delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java delete mode 100644 branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java (limited to 'branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java') diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java deleted file mode 100644 index 20c7e8d60a..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java +++ /dev/null @@ -1,34 +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; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationFactoryImpl; - -/** - * - */ -public class DefaultOSGiImplementationFactory extends OSGiImplementationFactoryImpl { - - public DefaultOSGiImplementationFactory(ExtensionPointRegistry registry) { - super(registry); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java deleted file mode 100644 index d7296e24bb..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java +++ /dev/null @@ -1,33 +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; - -import org.apache.tuscany.sca.implementation.osgi.impl.ServiceDescriptionsFactoryImpl; - -/** - * - */ -public class DefaultServiceDescriptionsFactory extends ServiceDescriptionsFactoryImpl { - - public DefaultServiceDescriptionsFactory() { - super(); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java deleted file mode 100644 index ba5e5284be..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.osgi; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Extensible; -import org.apache.tuscany.sca.assembly.Implementation; -import org.osgi.framework.Bundle; - -/** - * - * The model representing an OSGi implementation in an SCA assembly model. - * - * @version $Rev$ $Date$ - */ -public interface OSGiImplementation extends Implementation, Extensible { - String BUNDLE_SYMBOLICNAME = "bundleSymbolicName"; - String BUNDLE_VERSION = "bundleVersion"; - QName IMPLEMENTATION_OSGI = new QName(SCA11_TUSCANY_NS, "implementation.osgi"); - QName TYPE = IMPLEMENTATION_OSGI; - - String getBundleSymbolicName(); - - void setBundleSymbolicName(String name); - - String getBundleVersion(); - - void setBundleVersion(String version); - - Bundle getBundle(); - - void setBundle(Bundle bundle); - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java deleted file mode 100644 index 0a83624e76..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java +++ /dev/null @@ -1,37 +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; - -/** - * The factory interface to create OSGiImplementation instances - */ -public interface OSGiImplementationFactory { - /** - * Create a new instance of OSGiImplementation - * @return - */ - OSGiImplementation createOSGiImplementation(); - - /** - * - * @return - */ - OSGiProperty createOSGiProperty(); -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java deleted file mode 100644 index e0b7f43add..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java +++ /dev/null @@ -1,179 +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; - -import javax.xml.namespace.QName; - -/** - * - */ -public interface OSGiProperty { - String NAME = "name"; - QName PROPERTY_QNAME = new QName(OSGiImplementation.SCA11_TUSCANY_NS, "osgi.property"); - - String REMOTE_CONFIG_SCA = "org.osgi.sca"; - String SCA_BINDINGS = "org.osgi.sca.bindings"; - String SCA_REFERENCE = "sca.reference"; - String SCA_SERVICE = "sca.service"; - String SCA_REFERENCE_BINDING = "sca.reference.binding"; - String SCA_SERVICE_BINDING = "sca.service.binding"; - - /** - * The configuration types supported by this Distribution Provider. - * - * Services that are suitable for distribution list the configuration types - * that describe the configuration information for that service in the - * {@link #SERVICE_EXPORTED_CONFIGS} or {@link #SERVICE_IMPORTED_CONFIGS} - * property. - * - * A distribution provider must register a service that has this property - * and enumerate all configuration types that it supports. - * - * The type of this property String+ - * - * @see #SERVICE_EXPORTED_CONFIGS - * @see #SERVICE_IMPORTED_CONFIGS - */ - public final static String REMOTE_CONFIGS_SUPPORTED = "remote.configs.supported"; - /** - * Service property that lists the intents supported by the distribution - * provider. - * - * Each distribution provider must register a service that has this property - * and enumerate all the supported intents, having any qualified intents - * expanded. - * - * The value of this property is of type String+. - * - * @see #SERVICE_INTENTS - * @see #SERVICE_EXPORTED_INTENTS - * @see #SERVICE_EXPORTED_INTENTS_EXTRA - */ - public final static String REMOTE_INTENTS_SUPPORTED = "remote.intents.supported"; - /** - * A list of configuration types that should be used to export the service. - * - * Configuration types can be synonymous or alternatives. - * In principle, a distribution provider should create an endpoint for each - * recognized configuration type, the deployer is responsible that synonyms - * do not clash. - * - * Each configuration type has an associated specification that describes - * how the configuration data for the exported service is represented in an - * OSGi framework. - * - * The value of this property is of type String+. - */ - public final static String SERVICE_EXPORTED_CONFIGS = "service.exported.configs"; - /** - * A list of intents that the distribution provider must implement to - * distribute the service. Intents listed in this property are reserved for - * intents that are critical for the code to function correctly, for - * example, ordering of messages. These intents should not be configurable. - * - * The value of this property is of type String+. - */ - public final static String SERVICE_EXPORTED_INTENTS = "service.exported.intents"; - /** - * Extra intents configured in addition to the the intents specified in - * {@link #SERVICE_EXPORTED_INTENTS}. - * - * These intents are merged with the service.exported.intents and therefore - * have the same semantics. They are extra, so that the - * {@link #SERVICE_EXPORTED_INTENTS} can be set by the bundle developer and - * this property is then set by the administrator/deployer. Bundles should - * make this property configurable, for example through the Configuration - * Admin service. - * - * The value of this property is of type String+. - */ - public final static String SERVICE_EXPORTED_INTENTS_EXTRA = "service.exported.intents.extra"; - /** - * Defines the interfaces under which this service can be exported. - * - * This list must be a subset of the types listed in the objectClass service - * property. The single value of an asterisk ('*' \u002A) indicates all - * interfaces in the registration's objectClass property (not classes). It - * is highly recommended to only export interfaces and not concrete classes - * due to the complexity of creating proxies for some type of classes. - * - * The value of this property is of type String+. - */ - public final static String SERVICE_EXPORTED_INTERFACES = "service.exported.interfaces"; - /** - * Must be set by a distribution provider to true when it - * registers the end-point proxy as an imported service. Can be used by a - * bundle to prevent it from getting an imported service. - * - * The value of this property is not defined, setting it is sufficient. - */ - public final static String SERVICE_IMPORTED = "service.imported"; - /** - * A list of intents that this service implements. This property has dual - * purpose. A bundle can use this service property to notify the - * distribution provider that these intents are already implemented by the - * exported service object. For an imported service, a distribution provider - * must use this property to convey the combined intents of the exporting - * service and the intents that the distribution providers add. To export a - * service, a distribution provider must recognize all these intents and - * expand any qualified intents. - * - * The value of this property is of type String+. - */ - public final static String SERVICE_INTENTS = "service.intents"; - /** - * The property key for the endpoint service id. This is a unique id for a - * service based on the framework id '.' service id or another model. As far as this specification is - * concerned, this unique id is opaque. - */ - final public static String SERVICE_REMOTE_FRAMEWORK_UUID = "service.remote.framework.id"; - /** - * The property key for the endpoint service id. This is a unique id for a - * service based on the framework id '.' service id or another model. As far as this specification is - * concerned, this unique id is opaque. - */ - final public static String SERVICE_REMOTE_ID = "service.remote.id"; - /** - * The property key for the endpoint URI. This is a unique id for an - * endpoint following the URI syntax. As far as this specification is - * concerned, this unique id is opaque. - */ - final public static String SERVICE_REMOTE_URI = "service.remote.uri"; - /** - * The configuration type used to import this services, as described in - * {@link #SERVICE_EXPORTED_CONFIGS}. Any associated properties for this - * configuration types must be properly mapped to the importing system. For - * example, a URL in these properties must point to a valid resource when - * used in the importing framework. Configuration types in this property - * must be synonymous. - * - * The value of this property is of type String+. - */ - public final String SERVICE_IMPORTED_CONFIGS = "service.imported.configs"; - - - String getValue(); - - void setValue(String value); - - String getName(); - - void setName(String name); -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java deleted file mode 100644 index a54324b027..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java +++ /dev/null @@ -1,65 +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; - -import java.util.List; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * - */ -public interface SCAConfig { - /** - * Returns the target namespace for this SCA Definition - * @return the target namespace - */ - String getTargetNamespace(); - - /** - * Sets the target names for this SCA Definition. - * - * @param ns the target namespace for this SCA Definition - */ - void setTargetNamespace(String ns); - - /** - * Returns a list of domain wide Policy Intents - * - * @return a list of domain wide Policy Intents - */ - List getIntents(); - - /** - * Returns a list of domain wide PolicySets - * - * @return a list of domain wide PolicySets - */ - List getPolicySets(); - - /** - * Returns a list of domain wide binding definition objects - * - * @return a list of domain wide binding definition objects - */ - List getBindings(); -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java deleted file mode 100644 index 119d7ed657..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java +++ /dev/null @@ -1,40 +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; - -import java.util.List; -import java.util.Map; - -/** - * The OSGi RFC 119 description of a remote OSGi service - */ -public interface ServiceDescription { - /** - * Get a list of interfaces - * @return - */ - List getInterfaces(); - - /** - * Get a list of properties - * @return - */ - Map getProperties(); -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java deleted file mode 100644 index 35866938d6..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java +++ /dev/null @@ -1,36 +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; - -import java.util.List; - -import javax.xml.namespace.QName; - -/** - * OSGi RFC 119 service descriptions - */ -public interface ServiceDescriptions extends List { - - String REMOTE_SERVICE_FOLDER = "OSGI-INF/remote-service"; - String OSGI_SD_NS = "http://www.osgi.org/xmlns/sd/v1.0.0"; - QName SERVICE_DESCRIPTIONS_QNAME = new QName(OSGI_SD_NS, "service-descriptions"); - QName SERVICE_DESCRIPTION_QNAME = new QName(OSGI_SD_NS, "service-description"); - String REMOTE_SERVICE_HEADER = "Remote-Service"; -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java deleted file mode 100644 index 535bef2b6b..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java +++ /dev/null @@ -1,31 +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; - -/** - * The factory interface to create OSGi RFC 119 service descriptions - */ -public interface ServiceDescriptionsFactory { - ServiceDescriptions createServiceDescriptions(); - - ServiceDescription createServiceDescription(); - - SCAConfig createSCAConfig(); -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java deleted file mode 100644 index 9fab65272f..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java +++ /dev/null @@ -1,43 +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.impl; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory; -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; - -/** - * - */ -public class OSGiImplementationFactoryImpl implements OSGiImplementationFactory { - public OSGiImplementationFactoryImpl(ExtensionPointRegistry registry) { - super(); - } - - public OSGiImplementation createOSGiImplementation() { - return new OSGiImplementationImpl(); - } - - public OSGiProperty createOSGiProperty() { - return new OSGiPropertyImpl(); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java deleted file mode 100644 index 51e1e69b5d..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java +++ /dev/null @@ -1,107 +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.impl; - -import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; -import org.osgi.framework.Bundle; -import org.osgi.framework.Constants; - -/** - * OSGi implementation - * All attributes from have getters in this class - * This class implements OSGiImplementationInterface which is associated with OSGiImplementationProvider. - * - * @version $Rev$ $Date$ - */ -public class OSGiImplementationImpl extends ImplementationImpl implements OSGiImplementation { - - private String bundleSymbolicName; - private String bundleVersion; - private Bundle osgiBundle; - - protected OSGiImplementationImpl() { - super(TYPE); - } - - public OSGiImplementationImpl(String bundleSymbolicName, String bundleVersion) { - super(TYPE); - this.bundleSymbolicName = bundleSymbolicName; - this.bundleVersion = bundleVersion; - } - - public String getBundleSymbolicName() { - return bundleSymbolicName; - } - - public String getBundleVersion() { - return bundleVersion; - } - - /** - * Since OSGi implementation annotations may not be processed until much later, leave it to - * the OSGi invoker to decide whether pass-by-reference is allowed. - * @return - */ - public boolean isAllowsPassByReference() { - return true; - } - - public Bundle getBundle() { - return osgiBundle; - } - - public void setBundle(Bundle osgiBundle) { - this.osgiBundle = osgiBundle; - if (osgiBundle != null) { - this.bundleSymbolicName = osgiBundle.getSymbolicName(); - this.bundleVersion = (String)osgiBundle.getHeaders().get(Constants.BUNDLE_VERSION); - } - } - - private boolean areEqual(Object obj1, Object obj2) { - if (obj1 == obj2) - return true; - if (obj1 == null || obj2 == null) - return false; - return obj1.equals(obj2); - } - - @Override - public boolean equals(Object obj) { - - if (!(obj instanceof OSGiImplementationImpl)) - return super.equals(obj); - OSGiImplementationImpl impl = (OSGiImplementationImpl)obj; - if (!areEqual(bundleSymbolicName, impl.bundleSymbolicName)) - return false; - if (!areEqual(bundleVersion, impl.bundleVersion)) - return false; - return super.equals(obj); - } - - public void setBundleSymbolicName(String bundleSymbolicName) { - this.bundleSymbolicName = bundleSymbolicName; - } - - public void setBundleVersion(String bundleVersion) { - this.bundleVersion = bundleVersion; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java deleted file mode 100644 index ec8b98f53f..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.impl; - -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; - -/** - * Implementation of OSGiProperty - */ -public class OSGiPropertyImpl implements OSGiProperty { - public OSGiPropertyImpl() { - super(); - } - - private String name; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java deleted file mode 100644 index 4bb1b2340f..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java +++ /dev/null @@ -1,58 +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.impl; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.implementation.osgi.SCAConfig; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * - */ -public class SCAConfigImpl implements SCAConfig { - private String targetNamespace = null; - private List intents = new CopyOnWriteArrayList(); - private List policySets = new CopyOnWriteArrayList(); - private List bindings = new CopyOnWriteArrayList(); - - public List getIntents() { - return intents; - } - - public List getPolicySets() { - return policySets; - } - - public String getTargetNamespace() { - return targetNamespace; - } - - public void setTargetNamespace(String ns) { - this.targetNamespace = ns; - } - - public List getBindings() { - return bindings; - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java deleted file mode 100644 index b990cf5980..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; - -/** - * The OSGi RFC 119 description of a remote OSGi service - */ -public class ServiceDescriptionImpl implements ServiceDescription { - private List interfaces = new ArrayList(); - private Map properties = new HashMap(); - - protected ServiceDescriptionImpl() { - super(); - } - - public List getInterfaces() { - return interfaces; - } - - public Map getProperties() { - return properties; - } - - public String toString() { - return "service-description: interfaces=" + interfaces + " properties=" + properties; - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java deleted file mode 100644 index 716984a13b..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java +++ /dev/null @@ -1,48 +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.impl; - -import org.apache.tuscany.sca.implementation.osgi.SCAConfig; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; - -/** - * The factory implementation - */ -public class ServiceDescriptionsFactoryImpl implements ServiceDescriptionsFactory { - - protected ServiceDescriptionsFactoryImpl() { - super(); - } - - public ServiceDescription createServiceDescription() { - return new ServiceDescriptionImpl(); - } - - public ServiceDescriptions createServiceDescriptions() { - return new ServiceDescriptionsImpl(); - } - - public SCAConfig createSCAConfig() { - return new SCAConfigImpl(); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java deleted file mode 100644 index c249c053a4..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java +++ /dev/null @@ -1,36 +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.impl; - -import java.util.ArrayList; - -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; - -/** - * - */ -public class ServiceDescriptionsImpl extends ArrayList implements ServiceDescriptions { - private static final long serialVersionUID = 6205649013621747968L; - - protected ServiceDescriptionsImpl() { - super(); - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java deleted file mode 100644 index ca6b0b70e1..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java +++ /dev/null @@ -1,144 +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.xml; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; - -/* - - - - - - - - - - - - - - - - - - - - - - - - -*/ -public class BluePrintComponentsProcessor implements StAXArtifactProcessor { - private static final String BLUE_PRINT_NS = "http://www.osgi.org/xmlns/blueprint/v1.0.0"; - private static final String COMPOMENTS = "components"; - private static final QName COMPONENTS_QNAME = new QName(BLUE_PRINT_NS, COMPOMENTS); - - private AssemblyFactory factory; - private JavaInterfaceFactory javaInterfaceFactory; - - public BluePrintComponentsProcessor(FactoryExtensionPoint modelFactories) { - this.factory = modelFactories.getFactory(AssemblyFactory.class); - this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); - } - - public ComponentType read(XMLStreamReader reader, ProcessorContext context) throws XMLStreamException { - int event = reader.getEventType(); - ComponentType componentType = factory.createComponentType(); - while (true) { - switch (event) { - case XMLStreamConstants.START_ELEMENT: - QName name = reader.getName(); - if (COMPONENTS_QNAME.equals(name)) { - // - } else if ("reference".equals(name.getLocalPart())) { - Reference ref = factory.createReference(); - ref.setName(reader.getAttributeValue(null, "id")); - String interfaceName = reader.getAttributeValue(null, "interface"); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - ref.setInterfaceContract(interfaceContract); - JavaInterface javaInterface = javaInterfaceFactory.createJavaInterface(); - javaInterface.setUnresolved(true); - javaInterface.setName(interfaceName); - interfaceContract.setInterface(javaInterface); - componentType.getReferences().add(ref); - } else if ("service".equals(name.getLocalPart())) { - Service service = factory.createService(); - String interfaceName = reader.getAttributeValue(null, "interface"); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - service.setInterfaceContract(interfaceContract); - JavaInterface javaInterface = javaInterfaceFactory.createJavaInterface(); - javaInterface.setUnresolved(true); - javaInterface.setName(interfaceName); - interfaceContract.setInterface(javaInterface); - componentType.getServices().add(service); - } - break; - case XMLStreamConstants.END_ELEMENT: - name = reader.getName(); - if (COMPONENTS_QNAME.equals(name)) { - return componentType; - } - break; - } - if (reader.hasNext()) { - event = reader.next(); - } else { - return componentType; - } - } - } - - public QName getArtifactType() { - return COMPONENTS_QNAME; - } - - public void write(ComponentType model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, - XMLStreamException { - // TODO: To be implemented - } - - public Class getModelType() { - return ComponentType.class; - } - - public void resolve(ComponentType model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - // TODO: To be implemented - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java deleted file mode 100644 index 860d3f6f45..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java +++ /dev/null @@ -1,174 +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.xml; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Property; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; - -/* - - - - - - - - - - - - -*/ -public class OSGiComponentProcessor implements StAXArtifactProcessor { - private static final String OSGI_SCR_NS = "http://www.osgi.org/xmlns/scr/v1.0.0"; - private static final String COMPOMENT = "component"; - private static final QName COMPONENT_QNAME = new QName(OSGI_SCR_NS, COMPOMENT); - - private AssemblyFactory factory; - private JavaInterfaceFactory javaInterfaceFactory; - - - public OSGiComponentProcessor(FactoryExtensionPoint modelFactories) { - this.factory = modelFactories.getFactory(AssemblyFactory.class); - this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); - } - - public ComponentType read(XMLStreamReader reader, ProcessorContext context) throws XMLStreamException { - int event = reader.getEventType(); - ComponentType componentType = factory.createComponentType(); - while (true) { - switch (event) { - case XMLStreamConstants.START_ELEMENT: - QName name = reader.getName(); - if (COMPONENT_QNAME.equals(name)) { - // - } else if ("reference".equals(name.getLocalPart())) { - Reference ref = factory.createReference(); - ref.setName(reader.getAttributeValue(null, "name")); - String interfaceName = reader.getAttributeValue(null, "interface"); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - ref.setInterfaceContract(interfaceContract); - JavaInterface javaInterface = javaInterfaceFactory.createJavaInterface(); - javaInterface.setUnresolved(true); - javaInterface.setName(interfaceName); - interfaceContract.setInterface(javaInterface); - componentType.getReferences().add(ref); - } else if ("provide".equals(name.getLocalPart())) { - Service service = factory.createService(); - String interfaceName = reader.getAttributeValue(null, "interface"); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - service.setInterfaceContract(interfaceContract); - JavaInterface javaInterface = javaInterfaceFactory.createJavaInterface(); - javaInterface.setUnresolved(true); - javaInterface.setName(interfaceName); - interfaceContract.setInterface(javaInterface); - componentType.getServices().add(service); - } else if ("property".equals(name.getLocalPart())) { - String propName = reader.getAttributeValue(null, "name"); - String propValue = reader.getAttributeValue(null, "value"); - String propType = reader.getAttributeValue(null, "type"); - if (propType == null) { - propType = "String"; - } - if (propValue == null) { - propValue = reader.getElementText(); - } - if (propValue != null) { - propValue = propValue.trim(); - } - Object prop = propValue; - if ("Integer".equals(propType)) { - prop = Integer.valueOf(propValue); - } else if ("Long".equals(propType)) { - prop = Long.valueOf(propValue); - } else if ("Float".equals(propType)) { - prop = Float.valueOf(propValue); - } else if ("Double".equals(propType)) { - prop = Double.valueOf(propValue); - } else if ("Short".equals(propType)) { - prop = Short.valueOf(propValue); - } else if ("Character".equals(propType)) { - prop = propValue.charAt(0); - } else if ("Byte".equals(propType)) { - prop = Byte.valueOf(propValue); - } else if ("Boolean".equals(propType)) { - prop = Boolean.valueOf(propValue); - } - Property property = factory.createProperty(); - property.setName(propName); - property.setValue(prop); - componentType.getProperties().add(property); - } - break; - case XMLStreamConstants.END_ELEMENT: - name = reader.getName(); - if (COMPONENT_QNAME.equals(name)) { - return componentType; - } - break; - } - if (reader.hasNext()) { - event = reader.next(); - } else { - return componentType; - } - } - } - - public QName getArtifactType() { - return COMPONENT_QNAME; - } - - public void write(ComponentType model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, - XMLStreamException { - // TODO: To be implemented - } - - public Class getModelType() { - return ComponentType.class; - } - - public void resolve(ComponentType model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - // TODO: To be implemented - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java deleted file mode 100644 index b604447696..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.xml; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * Bundle activator to receive the BundleContext - */ -public class OSGiImplementationActivator implements BundleActivator { - private static BundleContext bundleContext; - - public void start(BundleContext context) throws Exception { - bundleContext = context; - } - - public void stop(BundleContext context) throws Exception { - bundleContext = null; - } - - public static BundleContext getBundleContext() { - return bundleContext; - } - - static void setBundleContext(BundleContext bundleContext) { - OSGiImplementationActivator.bundleContext = bundleContext; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java deleted file mode 100644 index d98616cbc2..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java +++ /dev/null @@ -1,342 +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.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; -import static org.apache.tuscany.sca.implementation.osgi.OSGiImplementation.BUNDLE_SYMBOLICNAME; -import static org.apache.tuscany.sca.implementation.osgi.OSGiImplementation.BUNDLE_VERSION; -import static org.apache.tuscany.sca.implementation.osgi.OSGiImplementation.IMPLEMENTATION_OSGI; - -import java.net.URI; -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Property; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ClassReference; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -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.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; -import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; - -/** - * - * Process an element in a component definition. An instance of - * OSGiImplementation is created. - * Also associates the component type file with the implementation. - * - * @version $Rev$ $Date$ - */ -public class OSGiImplementationProcessor implements StAXArtifactProcessor { - private static final String BUNDLE_COMPONENT_TYPE = "OSGI-INF/sca/bundle.componentType"; - private static final String COMPONENT_TYPE_HEADER = "SCA-ComponentType"; - - private AssemblyFactory assemblyFactory; - private ServiceDescriptionsFactory serviceDescriptionsFactory; - private OSGiImplementationFactory osgiImplementationFactory; - private JavaInterfaceFactory javaInterfaceFactory; - - private ExtensionPointRegistry registry; - private StAXArtifactProcessor artifactProcessor; - - protected OSGiImplementationProcessor(FactoryExtensionPoint modelFactories) { - this.serviceDescriptionsFactory = modelFactories.getFactory(ServiceDescriptionsFactory.class); - this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - this.osgiImplementationFactory = modelFactories.getFactory(OSGiImplementationFactory.class); - this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); - } - - public OSGiImplementationProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor processor) { - this(registry.getExtensionPoint(FactoryExtensionPoint.class)); - this.artifactProcessor = processor; - this.registry = registry; - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(Monitor monitor, String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = - monitor.createProblem(this.getClass().getName(), - "impl-osgi-validation-messages", - Severity.ERROR, - model, - message, - (Object[])messageParameters); - monitor.problem(problem); - } - } - - public QName getArtifactType() { - return IMPLEMENTATION_OSGI; - } - - public Class getModelType() { - return OSGiImplementation.class; - } - - public OSGiImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { - assert IMPLEMENTATION_OSGI.equals(reader.getName()); - - String bundleSymbolicName = reader.getAttributeValue(null, BUNDLE_SYMBOLICNAME); - String bundleVersion = reader.getAttributeValue(null, BUNDLE_VERSION); - - OSGiImplementation implementation = osgiImplementationFactory.createOSGiImplementation(); - implementation.setBundleSymbolicName(bundleSymbolicName); - implementation.setBundleVersion(bundleVersion); - - implementation.setUnresolved(true); - - // Skip to the end of - while (reader.hasNext()) { - int next = reader.next(); - switch (next) { - case START_ELEMENT: - break; - case END_ELEMENT: - if (IMPLEMENTATION_OSGI.equals(reader.getName())) { - return implementation; - } - break; - } - } - return implementation; - } - - public void resolve(OSGiImplementation impl, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - - if (impl == null || !impl.isUnresolved()) - return; - Monitor monitor = context.getMonitor(); - impl.setUnresolved(false); - - BundleContext bundleContext = OSGiImplementationActivator.getBundleContext(); - if (bundleContext == null) { - // FIXME: What if the OSGi is not started - return; - } - Bundle bundle = null; - for (Bundle b : bundleContext.getBundles()) { - String sn = b.getSymbolicName(); - String ver = (String)b.getHeaders().get(Constants.BUNDLE_VERSION); - if (!impl.getBundleSymbolicName().equals(sn)) { - continue; - } - Version v1 = Version.parseVersion(ver); - Version v2 = Version.parseVersion(impl.getBundleVersion()); - if (v1.equals(v2)) { - bundle = b; - break; - } - } - if (bundle != null) { - impl.setBundle(bundle); - } else { - error(monitor, "CouldNotLocateOSGiBundle", impl, impl.getBundleSymbolicName()); - //throw new ContributionResolveException("Could not locate OSGi bundle " + - //impl.getBundleSymbolicName()); - return; - } - - try { - if (introspect(impl, resolver, context, bundle)) { - return; - } - } catch (ContributionReadException e) { - throw new ContributionResolveException(e); - } - - // The bundle may be different from the current contribution - ComponentType componentType = assemblyFactory.createComponentType(); - // Try to find a bundle.componentType for the target bundle - componentType.setURI("OSGI-INF/sca/" + bundle.getSymbolicName() + "/bundle.componentType"); - componentType.setUnresolved(true); - componentType = resolver.resolveModel(ComponentType.class, componentType, context); - if (componentType.isUnresolved()) { - // Create a new instance to prevent it being treated as reentry - // See org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver.resolveModel(Class, T) - componentType = assemblyFactory.createComponentType(); - // Try a generic one - componentType.setURI(BUNDLE_COMPONENT_TYPE); - componentType = resolver.resolveModel(ComponentType.class, componentType, context); - } - if (componentType.isUnresolved()) { - // Try to derive it from the service descriptions - if (!deriveFromServiceDescriptions(impl, resolver, context)) { - error(monitor, "MissingComponentTypeFile", impl, componentType.getURI()); - } - //throw new ContributionResolveException("missing .componentType side file " + ctURI); - return; - } else { - mergeFromComponentType(impl, componentType, resolver, context); - } - } - - private boolean deriveFromServiceDescriptions(OSGiImplementation impl, ModelResolver resolver, ProcessorContext context) - throws ContributionResolveException { - // FIXME: How to find the RFC 119 service descriptions in the contribution and - // derive the SCA component type from them? - ServiceDescriptions descriptions = serviceDescriptionsFactory.createServiceDescriptions(); - descriptions = resolver.resolveModel(ServiceDescriptions.class, descriptions, context); - if (descriptions != null && !descriptions.isEmpty()) { - ComponentType ct = assemblyFactory.createComponentType(); - int index = 0; - for (ServiceDescription ds : descriptions) { - for (String i : ds.getInterfaces()) { - Class cls = getJavaClass(resolver, i, context); - JavaInterface javaInterface; - try { - javaInterface = javaInterfaceFactory.createJavaInterface(cls); - } catch (InvalidInterfaceException e) { - throw new ContributionResolveException(e); - } - Reference reference = assemblyFactory.createReference(); - JavaInterfaceContract contract = javaInterfaceFactory.createJavaInterfaceContract(); - contract.setInterface(javaInterface); - reference.setInterfaceContract(contract); - String refName = (String)ds.getProperties().get(OSGiProperty.SCA_REFERENCE); - if (refName == null) { - refName = "ref" + (index++); - } - reference.setName(refName); - reference.setUnresolved(false); - ct.getReferences().add(reference); - } - } - mergeFromComponentType(impl, ct, resolver, context); - return true; - } - return false; - } - - private void mergeFromComponentType(OSGiImplementation impl, ComponentType componentType, ModelResolver resolver, ProcessorContext context) { - List services = componentType.getServices(); - for (Service service : services) { - Interface interfaze = service.getInterfaceContract().getInterface(); - if (interfaze instanceof JavaInterface) { - JavaInterface javaInterface = (JavaInterface)interfaze; - if (javaInterface.getJavaClass() == null) { - javaInterface.setJavaClass(getJavaClass(resolver, javaInterface.getName(), context)); - } - if (service.getInterfaceContract().getCallbackInterface() instanceof JavaInterface) { - JavaInterface callbackInterface = - (JavaInterface)service.getInterfaceContract().getCallbackInterface(); - if (callbackInterface.getJavaClass() == null) { - callbackInterface.setJavaClass(getJavaClass(resolver, callbackInterface.getName(), context)); - } - } - - impl.getServices().add(service); - } - } - - List references = componentType.getReferences(); - for (Reference reference : references) { - Interface interfaze = reference.getInterfaceContract().getInterface(); - if (interfaze instanceof JavaInterface) { - JavaInterface javaInterface = (JavaInterface)interfaze; - if (javaInterface.getJavaClass() == null) { - javaInterface.setJavaClass(getJavaClass(resolver, javaInterface.getName(), context)); - } - impl.getReferences().add(reference); - } else - impl.getReferences().add(reference); - } - - List properties = componentType.getProperties(); - for (Property property : properties) { - impl.getProperties().add(property); - } - } - - private Class getJavaClass(ModelResolver resolver, String className, ProcessorContext context) { - ClassReference ref = new ClassReference(className); - ref = resolver.resolveModel(ClassReference.class, ref, context); - return ref.getJavaClass(); - } - - public void write(OSGiImplementation model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, - XMLStreamException { - String ns = IMPLEMENTATION_OSGI.getNamespaceURI(); - writer.writeStartElement(ns, IMPLEMENTATION_OSGI.getLocalPart()); - writer.writeAttribute(BUNDLE_SYMBOLICNAME, model.getBundleSymbolicName()); - if (model.getBundleVersion() != null) { - writer.writeAttribute(BUNDLE_VERSION, model.getBundleVersion()); - } - writer.writeEndElement(); - } - - private boolean introspect(OSGiImplementation implementation, ModelResolver resolver, ProcessorContext context, Bundle bundle) - throws ContributionReadException, ContributionResolveException { - String componentTypeFile = (String)bundle.getHeaders().get(COMPONENT_TYPE_HEADER); - if (componentTypeFile == null) { - componentTypeFile = BUNDLE_COMPONENT_TYPE; - } - URL url = bundle.getEntry(componentTypeFile); - if (url != null) { - URLArtifactProcessorExtensionPoint processors = - registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor processor = processors.getProcessor(ComponentType.class); - ComponentType componentType = processor.read(null, URI.create(BUNDLE_COMPONENT_TYPE), url, context); - artifactProcessor.resolve(componentType, resolver, context); - mergeFromComponentType(implementation, componentType, resolver, context); - return true; - } - return false; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java deleted file mode 100644 index 9bd469df06..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java +++ /dev/null @@ -1,104 +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.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.NAME; -import static org.apache.tuscany.sca.implementation.osgi.OSGiProperty.PROPERTY_QNAME; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory; -import org.apache.tuscany.sca.implementation.osgi.OSGiProperty; - -/** - * A processor for - */ -public class OSGiPropertyProcessor implements StAXArtifactProcessor { - private OSGiImplementationFactory factory; - - - public OSGiPropertyProcessor(FactoryExtensionPoint modelFactories) { - this.factory = modelFactories.getFactory(OSGiImplementationFactory.class); - } - - public OSGiProperty read(XMLStreamReader reader, ProcessorContext context) throws XMLStreamException { - int event = reader.getEventType(); - OSGiProperty prop = null; - while (true) { - switch (event) { - case START_ELEMENT: - QName name = reader.getName(); - if (PROPERTY_QNAME.equals(name)) { - prop = factory.createOSGiProperty(); - prop.setName(reader.getAttributeValue(null, NAME)); - // After the following call, the reader will be positioned at END_ELEMENT - String text = reader.getElementText(); - if (text != null) { - text = text.trim(); - } - prop.setValue(text); - return prop; - } - break; - case END_ELEMENT: - name = reader.getName(); - if (PROPERTY_QNAME.equals(name)) { - return prop; - } - break; - } - if (reader.hasNext()) { - event = reader.next(); - } else { - return prop; - } - } - } - - public QName getArtifactType() { - return PROPERTY_QNAME; - } - - public void write(OSGiProperty model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { - writer.writeStartElement(PROPERTY_QNAME.getNamespaceURI(), PROPERTY_QNAME.getLocalPart()); - writer.writeAttribute(NAME, model.getName()); - writer.writeCharacters(model.getValue()); - writer.writeEndElement(); - } - - public Class getModelType() { - return OSGiProperty.class; - } - - public void resolve(OSGiProperty model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - // TODO: To be implemented - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java deleted file mode 100644 index 9c529eecfc..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java +++ /dev/null @@ -1,190 +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.xml; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.SCAConfig; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/* - - - - - - -*/ -public class SCAConfigProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { - private static final QName SCA_CONFIG_QNAME = new QName("http://www.osgi.org/xmlns/scact/v1.0.0", "sca-config"); - private ServiceDescriptionsFactory factory; - private StAXArtifactProcessor processor; - - public SCAConfigProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor processor) { - this.processor = processor; - FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); - this.factory = modelFactories.getFactory(ServiceDescriptionsFactory.class); - } - - public SCAConfig read(XMLStreamReader reader, ProcessorContext context) throws XMLStreamException, - ContributionReadException { - int event = reader.getEventType(); - SCAConfig definitions = factory.createSCAConfig(); - String targetNamespace = null; - while (true) { - switch (event) { - case XMLStreamConstants.START_ELEMENT: - QName name = reader.getName(); - if (SCA_CONFIG_QNAME.equals(name)) { - targetNamespace = reader.getAttributeValue(null, "targetNamespace"); - definitions.setTargetNamespace(targetNamespace); - } else { - Object extension = processor.read(reader, context); - if (extension != null) { - if (extension instanceof Intent) { - Intent intent = (Intent)extension; - intent.setName(new QName(targetNamespace, intent.getName().getLocalPart())); - definitions.getIntents().add(intent); - for (Intent i : intent.getQualifiedIntents()) { - i.setName(new QName(targetNamespace, i.getName().getLocalPart())); - } - } else if (extension instanceof PolicySet) { - PolicySet policySet = (PolicySet)extension; - policySet.setName(new QName(targetNamespace, policySet.getName().getLocalPart())); - definitions.getPolicySets().add(policySet); - } else if (extension instanceof Binding) { - Binding binding = (Binding)extension; - definitions.getBindings().add(binding); - } - } - } - break; - case XMLStreamConstants.END_ELEMENT: - name = reader.getName(); - if (SCA_CONFIG_QNAME.equals(name)) { - return definitions; - } - break; - } - if (reader.hasNext()) { - event = reader.next(); - } else { - return definitions; - } - } - } - - public QName getArtifactType() { - return SCA_CONFIG_QNAME; - } - - public void write(SCAConfig definitions, XMLStreamWriter writer, ProcessorContext context) - throws ContributionWriteException, XMLStreamException { - - writeStartDocument(writer, - SCA_CONFIG_QNAME.getNamespaceURI(), - SCA_CONFIG_QNAME.getLocalPart(), - new XAttr("targetNamespace", definitions.getTargetNamespace())); - - for (Intent policyIntent : definitions.getIntents()) { - processor.write(policyIntent, writer, context); - } - - for (PolicySet policySet : definitions.getPolicySets()) { - processor.write(policySet, writer, context); - } - - writeEndDocument(writer); - } - - public void resolve(SCAConfig scaDefns, ModelResolver resolver, ProcessorContext context) - throws ContributionResolveException { - // start by adding all of the top level artifacts into the resolver as there - // are many cross artifact references in a definitions file and we don't want - // to be dependent on the order things appear - - List intents = new ArrayList(); - List policySets = new ArrayList(); - List referredPolicySets = new ArrayList(); - - for (Intent intent : scaDefns.getIntents()) { - intents.add(intent); - resolver.addModel(intent, context); - for (Intent i : intent.getQualifiedIntents()) { - intents.add(i); - resolver.addModel(i, context); - } - } - - for (PolicySet policySet : scaDefns.getPolicySets()) { - if (policySet.getReferencedPolicySets().isEmpty()) { - policySets.add(policySet); - } else { - referredPolicySets.add(policySet); - } - - resolver.addModel(policySet, context); - } - - // now resolve everything to ensure that any references between - // artifacts are satisfied - - for (Intent policyIntent : intents) - processor.resolve(policyIntent, resolver, context); - - for (PolicySet policySet : policySets) - processor.resolve(policySet, resolver, context); - - for (PolicySet policySet : referredPolicySets) - processor.resolve(policySet, resolver, context); - - } - - public Class getModelType() { - return SCAConfig.class; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java deleted file mode 100644 index ad175e009c..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.osgi.xml; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.net.URLConnection; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; - -/** - * The service descriptions document processor - */ -public class ServiceDescriptionsDocumentProcessor implements URLArtifactProcessor { - private XMLInputFactory inputFactory; - private StAXArtifactProcessor extensionProcessor; - - public ServiceDescriptionsDocumentProcessor(FactoryExtensionPoint modelFactories, - StAXArtifactProcessor staxProcessor) { - super(); - this.extensionProcessor = staxProcessor; - this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class); - } - - public String getArtifactType() { - return "/OSGI-INF/remote-service/*.xml"; - } - - public ServiceDescriptions read(URL contributionURL, URI artifactURI, URL artifactURL, ProcessorContext context) - throws ContributionReadException { - InputStream is = null; - try { - URLConnection connection = artifactURL.openConnection(); - connection.setUseCaches(false); - is = connection.getInputStream(); - } catch (IOException e) { - ContributionReadException ce = new ContributionReadException(e); - throw ce; - } - try { - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - ValidatingXMLInputFactory.setMonitor(reader, context.getMonitor()); - Object result = extensionProcessor.read(reader, context); - return (ServiceDescriptions)result; - } catch (XMLStreamException e) { - ContributionReadException ce = new ContributionReadException(e); - throw ce; - } finally { - try { - if (is != null) { - is.close(); - is = null; - } - } catch (IOException ioe) { - //ignore - } - } - - } - - public Class getModelType() { - return ServiceDescriptions.class; - } - - public void resolve(ServiceDescriptions model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - } - -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java deleted file mode 100644 index cd62d5cfaf..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java +++ /dev/null @@ -1,59 +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.xml; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; - -/** - * - */ -public class ServiceDescriptionsModelResolver implements ModelResolver { - private ServiceDescriptions serviceDescriptions; - - public ServiceDescriptionsModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) { - ServiceDescriptionsFactory factory = modelFactories.getFactory(ServiceDescriptionsFactory.class); - this.serviceDescriptions = factory.createServiceDescriptions(); - } - - public void addModel(Object resolved, ProcessorContext context) { - // Merge the service descriptions - if (resolved instanceof ServiceDescriptions) { - serviceDescriptions.addAll((ServiceDescriptions)resolved); - } - } - - public Object removeModel(Object resolved, ProcessorContext context) { - // Remove the service descriptions - if (resolved instanceof ServiceDescriptions) { - serviceDescriptions.removeAll((ServiceDescriptions)resolved); - } - return resolved; - } - - public T resolveModel(Class modelClass, T unresolved, ProcessorContext context) { - // Always return the aggregated service descriptions - return modelClass.cast(serviceDescriptions); - } -} diff --git a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java b/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java deleted file mode 100644 index fc6e44d8d6..0000000000 --- a/branches/sca-java-2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java +++ /dev/null @@ -1,191 +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.xml; - -import java.util.StringTokenizer; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescription; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions; -import org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory; - -/* - - - - - SOAP HTTP - pojo - - http://localhost:9000/hello - - - - - SOAP HTTP - pojo - - http://localhost:9005/greeter - - - -*/ -public class ServiceDescriptionsProcessor extends BaseStAXArtifactProcessor implements - StAXArtifactProcessor { - private ServiceDescriptionsFactory factory; - private StAXArtifactProcessor processor; - - - public ServiceDescriptionsProcessor(ExtensionPointRegistry registry, - StAXArtifactProcessor processor) { - this.processor = processor; - FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); - this.factory = modelFactories.getFactory(ServiceDescriptionsFactory.class); - } - - public ServiceDescriptions read(XMLStreamReader reader, ProcessorContext context) throws XMLStreamException, ContributionReadException { - int event = reader.getEventType(); - ServiceDescriptions sds = factory.createServiceDescriptions(); - ServiceDescription sd = null; - while (true) { - switch (event) { - case XMLStreamConstants.START_ELEMENT: - QName name = reader.getName(); - if (ServiceDescriptions.SERVICE_DESCRIPTION_QNAME.equals(name)) { - sd = factory.createServiceDescription(); - sds.add(sd); - } else if ("provide".equals(name.getLocalPart())) { - String interfaceName = reader.getAttributeValue(null, "interface"); - if (interfaceName != null) { - sd.getInterfaces().add(interfaceName); - } - } else if ("property".equals(name.getLocalPart())) { - String propName = reader.getAttributeValue(null, "name"); - String propValue = reader.getAttributeValue(null, "value"); - String propType = reader.getAttributeValue(null, "type"); - if (propType == null) { - propType = "String"; - } - if (propValue == null) { - propValue = reader.getElementText(); - } - if (propValue != null) { - propValue = propValue.trim(); - } - Object prop = propValue; - if ("Integer".equals(propType)) { - prop = Integer.valueOf(propValue); - } else if ("Long".equals(propType)) { - prop = Long.valueOf(propValue); - } else if ("Float".equals(propType)) { - prop = Float.valueOf(propValue); - } else if ("Double".equals(propType)) { - prop = Double.valueOf(propValue); - } else if ("Short".equals(propType)) { - prop = Short.valueOf(propValue); - } else if ("Character".equals(propType)) { - prop = propValue.charAt(0); - } else if ("Byte".equals(propType)) { - prop = Byte.valueOf(propValue); - } else if ("Boolean".equals(propType)) { - prop = Boolean.valueOf(propValue); - } - if (propName.endsWith(".intents")) { - prop = toQNames(reader, propValue); - } - sd.getProperties().put(propName, prop); - } else { - name = reader.getName(); - if (!ServiceDescriptions.SERVICE_DESCRIPTIONS_QNAME.equals(name)) { - Object ext = processor.read(reader, context); - if (sd != null) { - sd.getProperties().put(name.toString(), ext); - } - } - } - break; - case XMLStreamConstants.END_ELEMENT: - name = reader.getName(); - if (ServiceDescriptions.SERVICE_DESCRIPTION_QNAME.equals(name)) { - // Reset the sd - sd = null; - } - if (ServiceDescriptions.SERVICE_DESCRIPTIONS_QNAME.equals(name)) { - return sds; - } - break; - } - if (reader.hasNext()) { - event = reader.next(); - } else { - return sds; - } - } - } - - /** - * Convert ns1:e1 ns2:e2 to {http://ns1}e1 {http://ns2}e2 - * @param reader - * @param value - * @return - */ - private String toQNames(XMLStreamReader reader, String value) { - if (value == null) { - return null; - } - StringBuffer sb = new StringBuffer(); - for (StringTokenizer tokens = new StringTokenizer(value, " \t\n\r\f,"); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - sb.append(qname.toString()).append(' '); - } - return sb.toString().trim(); - } - - public QName getArtifactType() { - return ServiceDescriptions.SERVICE_DESCRIPTIONS_QNAME; - } - - public void write(ServiceDescriptions model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, - XMLStreamException { - // TODO: To be implemented - } - - public Class getModelType() { - return ServiceDescriptions.class; - } - - public void resolve(ServiceDescriptions model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - // TODO: To be implemented - } -} -- cgit v1.2.3