Repository: camel Updated Branches: refs/heads/master 12f85a77c -> b9c2a4bda
Added readme for camel-archetype-scr, improved generated project readme Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9c2a4bd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9c2a4bd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9c2a4bd Branch: refs/heads/master Commit: b9c2a4bda365a4d2f5309fd5b239efcb2295c6f4 Parents: 49bf494 Author: yuruki <yur...@kotikone.fi> Authored: Tue Nov 11 15:20:16 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Nov 11 15:48:51 2014 +0100 ---------------------------------------------------------------------- .../archetypes/camel-archetype-scr/README.md | 36 ++++++++++++++++++++ tooling/archetypes/camel-archetype-scr/pom.xml | 4 --- .../META-INF/maven/archetype-metadata.xml | 3 -- .../resources/archetype-resources/ReadMe.txt | 34 ++++++++++-------- .../main/resources/archetype-resources/pom.xml | 3 +- .../camel-scr-example/archetype.properties | 1 - 6 files changed, 56 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/README.md ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/README.md b/tooling/archetypes/camel-archetype-scr/README.md new file mode 100644 index 0000000..d0ff746 --- /dev/null +++ b/tooling/archetypes/camel-archetype-scr/README.md @@ -0,0 +1,36 @@ +camel-archetype-scr +=================== + +To install the archetype run + + mvn install + +To generate a Camel SCR bundle project run + + mvn archetype:generate -Dfilter=org.apache.camel.archetypes:camel-archetype-scr + + Choose archetype: + 1: local -> org.apache.camel.archetypes:camel-archetype-scr (Creates a new Camel SCR bundle project for Karaf) + Choose a number or apply filter (format: [groupId:]artifactId, case sensitive contains): : 1 + Define value for property 'groupId': : my.example + [INFO] Using property: groupId = my.example + Define value for property 'artifactId': : my-test + Define value for property 'version': 1.0-SNAPSHOT: : + Define value for property 'package': my.example: : + [INFO] Using property: archetypeArtifactId = camel-archetype-scr + [INFO] Using property: archetypeGroupId = org.apache.camel.archetypes + [INFO] Using property: archetypeVersion = 2.15-SNAPSHOT + Define value for property 'className': : MyTest + Confirm properties configuration: + groupId: my.example + groupId: my.example + artifactId: my-test + version: 1.0-SNAPSHOT + package: my.example + archetypeArtifactId: camel-archetype-scr + archetypeGroupId: org.apache.camel.archetypes + archetypeVersion: 2.15-SNAPSHOT + className: MyTest + Y: : + +All done! Check ReadMe.txt in the generated project folder for the next steps. http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/pom.xml b/tooling/archetypes/camel-archetype-scr/pom.xml index 164fccd..cb47dec 100644 --- a/tooling/archetypes/camel-archetype-scr/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/pom.xml @@ -32,10 +32,6 @@ <description>Creates a new Camel SCR bundle project for Karaf</description> <packaging>maven-archetype</packaging> - <properties> - <target-camel-version>${project.version}</target-camel-version> - </properties> - <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 20b2b96..a7d4d09 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -32,9 +32,6 @@ </requiredProperty> <requiredProperty key="groupId"/> <requiredProperty key="className"/> - <requiredProperty key="target-camel-version"> - <defaultValue>${target-camel-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt index 74b2f56..cd78e83 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt @@ -1,26 +1,30 @@ -Camel SCR bundle Project +Camel SCR bundle project ======================== -To build this project use +To build this project run mvn install -To deploy this project in Red Hat JBoss Fuse 6.1 +To deploy this project in Apache Karaf (2.4.0) - JBossFuse:karaf@root> profile-edit --bundles mvn:example/camel-scr-example/1.0-SNAPSHOT my-test 1.0 - Adding bundle:mvn:example/camel-scr-example/1.0-SNAPSHOT to profile:my-test version:1.0 + On Karaf command line: - From the container's karaf.log: + # Add Camel feature repository + features:chooseurl camel ${archetypeVersion} - 2014-10-10 14:51:56,785 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 1533 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Apache Camel 2.12.0.redhat-610379 (CamelContext: camel-scr-example) is starting - 2014-10-10 14:51:56,786 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 1610 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | MDC logging is enabled on CamelContext: camel-scr-example - 2014-10-10 14:51:56,786 | INFO | pool-49-thread-1 | ManagedManagementStrategy | gement.ManagedManagementStrategy 187 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | JMX is enabled - 2014-10-10 14:51:56,856 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 2224 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Route: foo/timer-log started and consuming from: Endpoint[timer://foo?period=5000] - 2014-10-10 14:51:56,858 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 2224 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Route: foo/timer-log.completion started and consuming from: Endpoint[direct://processCompletion] - 2014-10-10 14:51:56,860 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 1568 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Total 2 routes, of which 2 is started. - 2014-10-10 14:51:56,860 | INFO | pool-49-thread-1 | OsgiDefaultCamelContext | e.camel.impl.DefaultCamelContext 1569 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Apache Camel 2.12.0.redhat-610379 (CamelContext: camel-scr-example) started in 0.075 seconds - 2014-10-10 14:51:57,872 | INFO | 14 - timer://foo | foo | rg.apache.camel.util.CamelLogger 176 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Exchange[ExchangePattern: InOnly, Headers: {breadcrumbId=ID-12345-58358-1412941739290-5-1}, BodyType: null, Body: [Body is null]] - 2014-10-10 14:51:57,881 | INFO | 6 - OnCompletion | completion | rg.apache.camel.util.CamelLogger 176 | 122 - org.apache.camel.camel-core - 2.12.0.redhat-610387 | Success: timer:foo?period=5000 -> log:foo?showHeaders=true + # Install camel-scr feature + features:install camel-scr + + # Install commons-lang, used in the example route to validate parameters + osgi:install mvn:commons-lang/commons-lang/2.6 + + # Install and start your bundle + osgi:install -s mvn:${groupId}/${artifactId}/${version} + + # See how it's running + log:tail -n 10 + + Press ctrl-c to stop watching the log. For more help see the Apache Camel documentation http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml index df5bc38..5a4228a 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml @@ -44,7 +44,7 @@ This file was generated from ${archetypeGroupId}/${archetypeArtifactId}/${archet <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <camel-version>${target-camel-version}</camel-version> + <camel-version>${archetypeVersion}</camel-version> </properties> <distributionManagement> @@ -174,7 +174,6 @@ This file was generated from ${archetypeGroupId}/${archetypeArtifactId}/${archet <extensions>true</extensions> <configuration> <instructions> - <Gravia-Enabled>true</Gravia-Enabled> <Export-Package/> <Private-Package> ${groupId}, http://git-wip-us.apache.org/repos/asf/camel/blob/b9c2a4bd/tooling/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties b/tooling/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties index 397e986..ab56cf8 100644 --- a/tooling/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties +++ b/tooling/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties @@ -22,4 +22,3 @@ className = CamelScrExample archetypeGroupId = ${project.groupId} archetypeArtifactId = ${project.artifactId} archetypeVersion = ${project.version} -target-camel-version = ${target-camel-version} \ No newline at end of file
