Repository: camel Updated Branches: refs/heads/master 76d808632 -> 4e58755f6
CAMEL-8239 Adjusting karaf features for the split module Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e58755f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e58755f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e58755f Branch: refs/heads/master Commit: 4e58755f6ddfb52c24ce2d8d1dfe3c96529ee775 Parents: 8b2a887 Author: Christian Schneider <ch...@die-schneider.net> Authored: Mon Jan 19 14:43:35 2015 +0100 Committer: Christian Schneider <ch...@die-schneider.net> Committed: Mon Jan 19 14:44:04 2015 +0100 ---------------------------------------------------------------------- components/camel-jetty-common/pom.xml | 2 +- components/camel-jetty8/pom.xml | 2 +- components/camel-jetty9/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4e58755f/components/camel-jetty-common/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml index a331bd3..962c0a7 100644 --- a/components/camel-jetty-common/pom.xml +++ b/components/camel-jetty-common/pom.xml @@ -33,7 +33,7 @@ <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.jetty.*</camel.osgi.export.pkg> + <camel.osgi.export.pkg>org.apache.camel.component.jetty</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4e58755f/components/camel-jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml index 095a2ba..676729c 100644 --- a/components/camel-jetty8/pom.xml +++ b/components/camel-jetty8/pom.xml @@ -33,7 +33,7 @@ <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.*</camel.osgi.export.pkg> + <camel.osgi.export.pkg>org.apache.camel.component.jetty8</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4e58755f/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index e5b6313..87b8105 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -33,7 +33,7 @@ <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.jetty*</camel.osgi.export.pkg> + <camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> <jetty-version>${jetty9-version}</jetty-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4e58755f/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 52666bc..40762e0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -733,7 +733,8 @@ <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> <feature version='${project.version}'>camel-http</feature> - <bundle>mvn:org.apache.camel/camel-jetty/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-jetty8/${project.version}</bundle> </feature> <feature name='camel-jgroups' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature>
