summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-01-27 17:40:53 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-01-27 17:40:53 +0000
commit3dac3171ff215d276640c268155794b7d10e2a4b (patch)
treee60ce0d0b4aa07aa774a690f7e055b2d8a0e74c9 /sca-java-2.x
parent45c51c44a7530b18f7f0e087eec82459fcaf527e (diff)
Remove unused bundle activator
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@903755 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF4
-rw-r--r--sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java86
-rw-r--r--sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java55
3 files changed, 1 insertions, 144 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
index a2518ab9d3..478d05eec4 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
@@ -2,11 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.osgi.runtime
Bundle-Version: 2.0.0
-Bundle-ActivationPolicy: lazy
Bundle-Name: Apache Tuscany SCA OSGi Implementation Runtime
Bundle-Vendor: The Apache Software Foundation
-Eclipse-LazyStart: true
-Bundle-Activator: org.apache.tuscany.sca.implementation.osgi.runtime.OSGiImplementationRuntimeActivator
Bundle-Description: Apache Tuscany SCA OSGi Implementation
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
SCA-Version: 1.1
@@ -29,3 +26,4 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
org.osgi.util.tracker;version="1.3.0"
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java
deleted file mode 100644
index e54d2eee7b..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.implementation.osgi.runtime;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-/**
- * OSGi distribution provider for remote services
- */
-public class OSGiDistributionProvider {
- /**
- * Registered by the distribution provider on one of its services to indicate the
- * supported configuration types.
- */
- public static final String REMOTE_CONFIGS_SUPPORTED = "remote.configs.supported"; // String+
-
- /**
- * Registered by the distribution provider on one of its services to indicate the vocabulary
- * of implemented intents.
- */
- public static final String REMOTE_INTENTS_SUPPORTED = "remote.intents.supported"; // String+
-
- /**
- * Service Registration property for the name of the Distribution Provider
- * product.
- * <p>
- * The value of this property is of type String.
- */
- static final String PRODUCT_NAME = "osgi.remote.distribution.product";
-
- /**
- * Service Registration property for the version of the Distribution
- * Provider product.
- * <p>
- * The value of this property is of type String.
- */
- static final String PRODUCT_VERSION = "osgi.remote.distribution.product.version";
-
- /**
- * Service Registration property for the Distribution Provider product
- * vendor name.
- * <p>
- * The value of this property is of type String.
- */
- static final String VENDOR_NAME = "osgi.remote.distribution.vendor";
-
- private BundleContext bundleContext;
-
- public OSGiDistributionProvider(BundleContext bundleContext) {
- super();
- this.bundleContext = bundleContext;
- }
-
- public Dictionary<String, Object> getProperties() {
- Dictionary headers = bundleContext.getBundle().getHeaders();
- Hashtable<String, Object> props = new Hashtable<String, Object>();
- props.put(PRODUCT_NAME, "Apache Tuscany SCA");
- props.put(PRODUCT_VERSION, headers.get(Constants.BUNDLE_VERSION));
- props.put(VENDOR_NAME, headers.get(Constants.BUNDLE_VENDOR));
- props.put(REMOTE_CONFIGS_SUPPORTED, new String[] {"org.osgi.sca"});
- // FIXME: We need to populate the list of intents from the SCA definitions
- props.put(REMOTE_INTENTS_SUPPORTED, new String[] {});
- return props;
- }
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java
deleted file mode 100644
index a1de00d240..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.implementation.osgi.runtime;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * Bundle activator to receive the BundleContext
- */
-public class OSGiImplementationRuntimeActivator implements BundleActivator {
- private static BundleContext bundleContext;
- private ServiceRegistration distributionProvider;
-
- public void start(BundleContext context) throws Exception {
- bundleContext = context;
- OSGiDistributionProvider provider = new OSGiDistributionProvider(bundleContext);
- distributionProvider =
- bundleContext.registerService(OSGiDistributionProvider.class.getName(), provider, provider.getProperties());
- }
-
- public void stop(BundleContext context) throws Exception {
- if (distributionProvider != null) {
- try {
- distributionProvider.unregister();
- } catch (IllegalStateException e) {
- // The service has been unregistered, ignore it
- }
- }
- bundleContext = null;
- }
-
- static BundleContext getBundleContext() {
- return bundleContext;
- }
-
-}