Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 6d2f8e19c -> b566cdbc8
[CAMEL-8835][CAMEL-7985] Replace PojoSR with felix-connect
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b566cdbc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b566cdbc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b566cdbc
Branch: refs/heads/camel-2.15.x
Commit: b566cdbc8e5eb814a26c126a2426131fbc29de5a
Parents: 6d2f8e1
Author: Grzegorz Grzybek <gr.grzy...@gmail.com>
Authored: Fri Jun 5 12:34:48 2015 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Fri Jul 31 17:07:44 2015 +0200
----------------------------------------------------------------------
components/camel-test-blueprint/pom.xml | 15 +++++----------
.../camel/test/blueprint/CamelBlueprintHelper.java | 14 +++++++-------
parent/pom.xml | 7 +++----
3 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b566cdbc/components/camel-test-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/pom.xml
b/components/camel-test-blueprint/pom.xml
index af5323f..6ef89f3 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -35,12 +35,6 @@
<dependencies>
<dependency>
- <!-- Make sure we use the version of osgi.core that we specify for
compiling -->
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
</dependency>
@@ -101,10 +95,11 @@
<version>${aries-blueprint-proxy-version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.pojosr</groupId>
- <artifactId>de.kalpatec.pojosr.framework</artifactId>
- <version>${pojosr-version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.connect</artifactId>
+ <version>${felix-connect-version}</version>
<exclusions>
+ <!-- felix-connect includes osgi.core and osgi.compendium
version 5.0.0 -->
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -150,7 +145,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${felix-fileinstall-pojosr-version}</version>
+ <version>${felix-fileinstall-version}</version>
<!-- exclude the following dependency which otherwise would
pop up a lot of compilation
errors both by this and the camel-maven-plugin modules
under eclipse. -->
<exclusions>
http://git-wip-us.apache.org/repos/asf/camel/blob/b566cdbc/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
----------------------------------------------------------------------
diff --git
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 4074376..6862d86 100644
---
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -40,17 +40,17 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.jar.JarInputStream;
-import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
-import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
-import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
import org.apache.camel.impl.DefaultClassResolver;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+import org.apache.felix.connect.PojoServiceRegistryFactoryImpl;
+import org.apache.felix.connect.launch.BundleDescriptor;
+import org.apache.felix.connect.launch.ClasspathScanner;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
@@ -136,7 +136,7 @@ public final class CamelBlueprintHelper {
}
// setup pojosr to use our bundles
- Map<String, List<BundleDescriptor>> config = new HashMap<String,
List<BundleDescriptor>>();
+ Map<String, Object> config = new HashMap<String, Object>();
config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS, bundles);
// create pojorsr osgi service registry
@@ -435,7 +435,7 @@ public final class CamelBlueprintHelper {
answer = new BundleDescriptor(
bundle.getClass().getClassLoader(),
- new URL("jar:" + file.toURI().toString() + "!/"),
+ "jar:" + file.toURI().toString() + "!/",
headers);
} finally {
IOHelper.close(jis, fis);
http://git-wip-us.apache.org/repos/asf/camel/blob/b566cdbc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0ec2aa8..b73d426 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -150,8 +150,8 @@
<facebook4j-core-version>1.1.12</facebook4j-core-version>
<fastinfoset-version>1.2.13_1</fastinfoset-version>
<felix-configadmin-version>1.8.0</felix-configadmin-version>
- <!-- need to keep using the older 3.2.8 that do not cause NPE issues when
using pojosr - see pojosr bug #13 -->
- <felix-fileinstall-pojosr-version>3.2.8</felix-fileinstall-pojosr-version>
+ <felix-connect-version>0.1.0</felix-connect-version>
+ <felix-fileinstall-version>3.5.0</felix-fileinstall-version>
<felix-framework-version>3.2.2</felix-framework-version>
<felix-scr-annotations-version>1.9.8</felix-scr-annotations-version>
<findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
@@ -379,8 +379,7 @@
<pdfbox-version>1.6.0</pdfbox-version>
<pgjdbc-ng-driver-version>0.4</pgjdbc-ng-driver-version>
<plexus-container-default-version>1.0-alpha-48</plexus-container-default-version>
- <plexus-utils-version>1.5.6</plexus-utils-version>
- <pojosr-version>0.2.1</pojosr-version>
+ <plexus-utils-version>1.5.8</plexus-utils-version>
<powermock-version>1.6.1</powermock-version>
<protobuf-version>2.6.1</protobuf-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
