You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/09/11 09:45:21 UTC
[2/3] camel git commit: CAMEL-9125: Fixed camel scr archetype on
2.15.x branch
CAMEL-9125: Fixed camel scr archetype on 2.15.x branch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ceb1790c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ceb1790c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ceb1790c
Branch: refs/heads/camel-2.15.x
Commit: ceb1790ceda1105f505448d37c89e5266f55598f
Parents: 5982c8f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 11 09:45:00 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 11 09:45:00 2015 +0200
----------------------------------------------------------------------
components/camel-scr/pom.xml | 2 +-
.../archetype-resources/src/test/java/__className__Test.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ceb1790c/components/camel-scr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 6aa985e..3cf5e3e 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -30,7 +30,7 @@
<packaging>bundle</packaging>
<properties>
- <camel.osgi.export.pkg>org.apache.camel.scr.*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.scr.*,org.apache.camel.scr.internal.*</camel.osgi.export.pkg>
<camel.osgi.import.camel.version>version="[2.12,$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
</properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/ceb1790c/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
index 65c0127..5c55f79 100644
--- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
+++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
@@ -21,12 +21,12 @@ package ${package};
import java.util.List;
-import org.apache.camel.scr.internal.ScrHelper;
+import org.apache.camel.CamelContext;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.scr.internal.ScrHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -46,7 +46,7 @@ public class ${className}Test {
public TestName testName = new TestName();
${className} integration;
- ModelCamelContext context;
+ CamelContext context;
@Before
public void setUp() throws Exception {