Author: rfeng
Date: Thu Jul 31 16:22:25 2008
New Revision: 681546
URL: http://svn.apache.org/viewvc?rev=681546&view=rev
Log:
Add an OSgi bundle activator to set the OSGiServiceDiscoverer to
ServiceDiscovery
Added:
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
(with props)
Modified:
tuscany/java/sca/modules/extensibility-osgi/pom.xml
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
Modified: tuscany/java/sca/modules/extensibility-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-osgi/pom.xml?rev=681546&r1=681545&r2=681546&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/extensibility-osgi/pom.xml Thu Jul 31 16:22:25 2008
@@ -55,6 +55,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.osgi</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
+
<Bundle-Activator>org.apache.tuscany.sca.extensibility.osgi.OSGiServiceDiscoveryActivator</Bundle-Activator>
<!-- This bundle will be the gateway to all exported
packages -->
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
Modified:
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java?rev=681546&r1=681545&r2=681546&view=diff
==============================================================================
---
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
(original)
+++
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
Thu Jul 31 16:22:25 2008
@@ -163,7 +163,12 @@
}
public Class<?> loadClass(String className) throws
ClassNotFoundException {
- return bundle.loadClass(className);
+ try {
+ return bundle.loadClass(className);
+ } catch (ClassNotFoundException e) {
+ logger.severe(e.getMessage() + ": " +
OSGiServiceDiscoverer.toString(bundle));
+ throw e;
+ }
}
public URL getLocation() {
Added:
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java?rev=681546&view=auto
==============================================================================
---
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
(added)
+++
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
Thu Jul 31 16:22:25 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.extensibility.osgi;
+
+import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Bundle Activator that creates the OSGi-based service discoverer
+ */
+public class OSGiServiceDiscoveryActivator implements BundleActivator {
+
+ public void start(BundleContext context) throws Exception {
+ OSGiServiceDiscoverer discoverer = new OSGiServiceDiscoverer(context);
+ ServiceDiscovery.setServiceDiscoverer(discoverer);
+ }
+
+ public void stop(BundleContext arg0) throws Exception {
+ // ServiceDiscovery.setServiceDiscoverer(discoverer);
+ }
+
+}
Propchange:
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
