Repository: camel Updated Branches: refs/heads/master 14bdb705d -> 92a5b6055
camel-8647 Fixing build Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92a5b605 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92a5b605 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92a5b605 Branch: refs/heads/master Commit: 92a5b6055c74e96c45f8015dc1df2759c4872fe5 Parents: 14bdb70 Author: Christian Schneider <ch...@die-schneider.net> Authored: Sun Apr 19 23:40:28 2015 +0200 Committer: Christian Schneider <ch...@die-schneider.net> Committed: Sun Apr 19 23:40:28 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/osgi/Activator.java | 5 ++++- components/camel-spring/pom.xml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/92a5b605/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java index 2eddc25..12135cb 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java +++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java @@ -89,7 +89,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer { public void start(BundleContext context) throws Exception { LOG.info("Camel activator starting"); bundleId = context.getBundle().getBundleId(); - BundleContext systemBundleContext = context.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).getBundleContext(); + BundleContext systemBundleContext = context.getBundle(0).getBundleContext(); tracker = new BundleTracker(systemBundleContext, Bundle.ACTIVE, this); tracker.open(); LOG.info("Camel activator started"); @@ -120,6 +120,9 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer { private boolean extenderCapabilityWired(Bundle bundle) { BundleWiring wiring = bundle.adapt(BundleWiring.class); + if (wiring == null) { + return true; + } List<BundleWire> requiredWires = wiring.getRequiredWires(EXTENDER_NAMESPACE); for (BundleWire requiredWire : requiredWires) { if (CAMEL_EXTENDER.equals(requiredWire.getCapability().getAttributes().get(EXTENDER_NAMESPACE))) { http://git-wip-us.apache.org/repos/asf/camel/blob/92a5b605/components/camel-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index 00958e2..f91e9d4 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -38,7 +38,6 @@ !org.apache.camel.language.spel, org.apache.camel.*;${camel.osgi.import.strict.version}, org.springframework.osgi.*;version="[1.2,2)", - org.osgi.framework;version="[1.3,2)", org.osgi.service.event;resolution:=optional, ${camel.osgi.import.defaults}, *
