Remove references to PojoSR
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3db84387 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3db84387 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3db84387 Branch: refs/heads/master Commit: 3db84387a1a0f2d4620603abbd91f183a8754a2a Parents: aa37931 Author: Grzegorz Grzybek <[email protected]> Authored: Fri Jul 17 21:11:25 2015 +0200 Committer: Grzegorz Grzybek <[email protected]> Committed: Mon Jul 20 14:51:37 2015 +0200 ---------------------------------------------------------------------- components/camel-test-blueprint/pom.xml | 2 +- .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 4 ++-- .../apache/camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +- .../camel-test-blueprint/src/test/resources/log4j.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3db84387/components/camel-test-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml index e555777..7588375 100644 --- a/components/camel-test-blueprint/pom.xml +++ b/components/camel-test-blueprint/pom.xml @@ -56,7 +56,7 @@ </dependency> <!-- the ordering of the dependencies can matter as we load the dependencies from the classpath - with pojosr, and you may get a weird error if wrong order --> + with felix-connect, and you may get a weird error if wrong order --> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.api</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/3db84387/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 2eea106..42592c3 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 @@ -103,7 +103,7 @@ public final class CamelBlueprintHelper { } public static BundleContext createBundleContext(String name, String bundleFilter, TinyBundle bundle) throws Exception { - // ensure pojosr stores bundles in an unique target directory + // ensure felix-connect stores bundles in an unique target directory String uid = "" + System.currentTimeMillis(); String tempDir = "target/bundles/" + uid; System.setProperty("org.osgi.framework.storage", tempDir); @@ -129,7 +129,7 @@ public final class CamelBlueprintHelper { } } - // setup pojosr to use our bundles + // setup felix-connect to use our bundles Map<String, Object> config = new HashMap<String, Object>(); config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS, bundles); http://git-wip-us.apache.org/repos/asf/camel/blob/3db84387/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java index a49b848..1bc22a5 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java @@ -162,7 +162,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { ConfigurationAdmin configAdmin = CamelBlueprintHelper.getOsgiService(answer, ConfigurationAdmin.class); // passing null as second argument ties the configuration to correct bundle. // using single-arg method causes: - // *ERROR* Cannot use configuration xxx.properties for [org.osgi.service.cm.ManagedService, id=N, bundle=N/jar:file:xyz.jar!/]: No visibility to configuration bound to file:pojosr + // *ERROR* Cannot use configuration xxx.properties for [org.osgi.service.cm.ManagedService, id=N, bundle=N/jar:file:xyz.jar!/]: No visibility to configuration bound to felix-connect Configuration config = configAdmin.getConfiguration(pid, null); if (config == null) { throw new IllegalArgumentException("Cannot find configuration with pid " + pid + " in OSGi ConfigurationAdmin service."); http://git-wip-us.apache.org/repos/asf/camel/blob/3db84387/components/camel-test-blueprint/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/log4j.properties b/components/camel-test-blueprint/src/test/resources/log4j.properties index 39dbf51..22dcbfe 100644 --- a/components/camel-test-blueprint/src/test/resources/log4j.properties +++ b/components/camel-test-blueprint/src/test/resources/log4j.properties @@ -20,7 +20,7 @@ # log4j.rootLogger=INFO, file -#log4j.logger.de.kalpatec.pojosr=DEBUG +#log4j.logger.org.apache.felix.connect=DEBUG #log4j.logger.org.apache.camel.test.blueprint=DEBUG #log4j.logger.org.apache.camel=DEBUG #log4j.logger.org.apache.camel.management=DEBUG
