Updated Branches: refs/heads/master d2ea01654 -> c095e270f
CAMEL-6292: Camel Maven archetypes for creating components/dataformat is now packaging as OSGi bundles. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c095e270 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c095e270 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c095e270 Branch: refs/heads/master Commit: c095e270fa8fbe4516d03a3fe6c697a6a2c6b518 Parents: d2ea016 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jul 17 11:33:31 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jul 17 11:33:31 2013 +0200 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 3 +++ .../main/resources/archetype-resources/pom.xml | 19 ++++++++++++++++++- .../META-INF/maven/archetype-metadata.xml | 3 +++ .../main/resources/archetype-resources/pom.xml | 19 ++++++++++++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c095e270/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 09838f8..5d3fd92 100644 --- a/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -35,6 +35,9 @@ <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> + <requiredProperty key="maven-bundle-plugin-version"> + <defaultValue>${maven-bundle-plugin-version}</defaultValue> + </requiredProperty> <requiredProperty key="slf4j-version"> <defaultValue>${slf4j-version}</defaultValue> </requiredProperty> http://git-wip-us.apache.org/repos/asf/camel/blob/c095e270/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml index 0cbb31e..8df926c 100644 --- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>jar</packaging> + <packaging>bundle</packaging> <version>${version}</version> <name>Camel ${name} Component</name> @@ -71,6 +71,7 @@ <defaultGoal>install</defaultGoal> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -80,6 +81,7 @@ <target>1.6</target> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -88,6 +90,21 @@ <encoding>UTF-8</encoding> </configuration> </plugin> + + <!-- to generate the MANIFEST-FILE of the bundle --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven-bundle-plugin-version}</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName> + <Export-Service>org.apache.camel.spi.ComponentResolver;component=${scheme}</Export-Service> + </instructions> + </configuration> + </plugin> + </plugins> </build> http://git-wip-us.apache.org/repos/asf/camel/blob/c095e270/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index e06ab51..8985575 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -35,6 +35,9 @@ <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> + <requiredProperty key="maven-bundle-plugin-version"> + <defaultValue>${maven-bundle-plugin-version}</defaultValue> + </requiredProperty> <requiredProperty key="slf4j-version"> <defaultValue>${slf4j-version}</defaultValue> </requiredProperty> http://git-wip-us.apache.org/repos/asf/camel/blob/c095e270/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml index fca72bf..922dd71 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>jar</packaging> + <packaging>bundle</packaging> <version>${version}</version> <name>Camel ${name} Data format</name> @@ -71,6 +71,7 @@ <defaultGoal>install</defaultGoal> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -80,6 +81,7 @@ <target>1.6</target> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -88,6 +90,21 @@ <encoding>UTF-8</encoding> </configuration> </plugin> + + <!-- to generate the MANIFEST-FILE of the bundle --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven-bundle-plugin-version}</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName> + <Export-Service>org.apache.camel.spi.DataFormatResolver;dataformat=${scheme}</Export-Service> + </instructions> + </configuration> + </plugin> + </plugins> </build>
