Add an OSgi bundle activator to set the OSGiServiceDiscoverer to ServiceDiscovery

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681546 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 47 insertions, 1 deletions

diff --git a/java/sca/modules/extensibility-osgi/pom.xml b/java/sca/modules/extensibility-osgi/pom.xml
index b4b00c3f58..3eab33771d 100644
--- a/java/sca/modules/extensibility-osgi/pom.xml
+++ b/java/sca/modules/extensibility-osgi/pom.xml
@@ -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>
diff --git a/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
index 1b07753f3d..8b6a5ceea4 100644
--- a/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
+++ b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
@@ -163,7 +163,12 @@ public class OSGiServiceDiscoverer implements ServiceDiscoverer {
         }
 
         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() {
diff --git a/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
new file mode 100644
index 0000000000..0a58776754
--- /dev/null
+++ b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
@@ -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);
+    }
+
+}