fix: OSGi require-capability manifest entry

closes #497
pgjdbc · Feb 8, 2016 · a3e204580220ca0b243f9562b2cbf44e0e60d51c · a3e2045
1 parent ee6118e
commit a3e204580220ca0b243f9562b2cbf44e0e60d51c
Unified Split

Showing with 15 additions and 3 deletions.

+14 −2 pgjdbc/src/main/java/org/postgresql/osgi/PGBundleActivator.java

+1 −1 pom.xml
diff --git a/pgjdbc/src/main/java/org/postgresql/osgi/PGBundleActivator.java b/pgjdbc/src/main/java/org/postgresql/osgi/PGBundleActivator.java
@@ -29,8 +29,20 @@ public void start(BundleContext context) throws Exception {
    properties.put(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS, Driver.class.getName());
    properties.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "PostgreSQL JDBC Driver");
    properties.put(DataSourceFactory.OSGI_JDBC_DRIVER_VERSION, Driver.getVersion());
-  
-    _registration = context.registerService(DataSourceFactory.class.getName(),
-  
-        new PGDataSourceFactory(), properties);
+  
+    try {
+  
+      _registration = context.registerService(DataSourceFactory.class.getName(),
+  
+          new PGDataSourceFactory(), properties);
+  
+    } catch (NoClassDefFoundError e) {
+  
+      String msg = e.getMessage();
+  
+      if (msg != null && msg.contains("org/osgi/service/jdbc/DataSourceFactory")) {
+  
+        new IllegalArgumentException("Unable to load DataSourceFactory. "
+  
+            + "Will ignore DataSourceFactory registration. If you need one, "
+  
+            + "ensure org.osgi.enterprise is on the classpath", e).printStackTrace();
+  
+        // just ignore. Assume OSGi-enterprise is not loaded
+  
+        return;
+  
+      }
+  
+      throw e;
+  
+    }
  }
  public void stop(BundleContext context) throws Exception {
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.postgresql</groupId>
    <artifactId>pgjdbc-versions</artifactId>
-  
-    <version>1.0.4</version>
+  
+    <version>1.0.5</version>
  </parent>
  <artifactId>pgjdbc-aggregate</artifactId>