You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/06/20 04:07:56 UTC
git commit: Updated camel-archetype-api-component to use re-factored
camel-api-component-maven-plugin
Repository: camel
Updated Branches:
refs/heads/master a26eee003 -> dfa698fca
Updated camel-archetype-api-component to use re-factored camel-api-component-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dfa698fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dfa698fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dfa698fc
Branch: refs/heads/master
Commit: dfa698fcade10e4e1c2e4b69203b6bef7b81bec0
Parents: a26eee0
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Thu Jun 19 19:07:48 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Thu Jun 19 19:07:48 2014 -0700
----------------------------------------------------------------------
.../__artifactId__-component/pom.xml | 124 +++++++------------
1 file changed, 47 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dfa698fc/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 6d67150..7e31a39 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -52,6 +52,23 @@
<version>${version}</version>
</dependency>
+ <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>spi-annotations</artifactId>
+ <version>${camel-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Component API javadoc in test scope to read API signatures -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-api</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ <scope>provided</scope>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -71,14 +88,6 @@
<scope>test</scope>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${camel-version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -86,14 +95,6 @@
<version>${camel-version}</version>
<scope>test</scope>
</dependency>
- <!-- include component API javadoc in test scope to read API signatures -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-api</artifactId>
- <version>${version}</version>
- <classifier>javadoc</classifier>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -151,63 +152,35 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api-component-maven-plugin</artifactId>
+ <version>${camel-version}</version>
<executions>
<execution>
- <id>generate-from-file-api</id>
- <goals>
- <goal>fromFile</goal>
- </goals>
- <configuration>
- <proxyClass>${package}.api.${name}FileHello</proxyClass>
- <!-- Use substitutions to manipulate parameter names and avoid name clashes
- <substitutions>
- <substitution>
- <method>^.+$</method>
- <argName>^.+$</argName>
- <argType>java.lang.String</argType>
- <replacement>$1Param</replacement>
- <replaceWithType>false</replaceWithType>
- </substitution>
- </substitutions>
- -->
- <signatureFile>signatures/file-sig-api.txt</signatureFile>
- </configuration>
- </execution>
- <execution>
- <id>generate-from-javadoc-api</id>
- <goals>
- <goal>fromJavadoc</goal>
- </goals>
- <configuration>
- <proxyClass>${package}.api.${name}JavadocHello</proxyClass>
- <!-- Use substitutions to manipulate parameter names and avoid name clashes
- <substitutions>
- <substitution>
- <method>^.+$</method>
- <argName>^.+$</argName>
- <argType>java.lang.String</argType>
- <replacement>$1Arg</replacement>
- <replaceWithType>false</replaceWithType>
- </substitution>
- </substitutions>
- -->
- <!-- Use exclude patterns to limit what gets exposed in component endpoint
- <excludePackages>package-name-patterns</excludePackages>
- <excludeClasses>class-name-patterns</excludeClasses>
- <excludeMethods>method-name-patterns</excludeMethods>
- -->
- </configuration>
- </execution>
- <execution>
<id>generate-test-component-classes</id>
<goals>
<goal>fromApis</goal>
</goals>
<configuration>
+ <scheme>${schemeName}</scheme>
+ <componentName>${componentName}</componentName>
+ <componentPackage>${componentPackage}</componentPackage>
+ <outPackage>${outPackage}</outPackage>
<apis>
<api>
<apiName>hello-file</apiName>
<proxyClass>${package}.api.${name}FileHello</proxyClass>
+ <fromSignatureFile>signatures/file-sig-api.txt</fromSignatureFile>
+ <!-- Use substitutions to manipulate parameter names and avoid name clashes
+ <substitutions>
+ <substitution>
+ <method>^.+$</method>
+ <argName>^.+$</argName>
+ <argType>java.lang.String</argType>
+ <replacement>$1Param</replacement>
+ <replaceWithType>false</replaceWithType>
+ </substitution>
+ </substitutions>
+ -->
+
<!-- Use method aliases in endpoint URIs, e.g. support 'widget' as alias for getWidget or setWidget
<aliases>
<alias>
@@ -224,8 +197,20 @@
<api>
<apiName>hello-javadoc</apiName>
<proxyClass>${package}.api.${name}JavadocHello</proxyClass>
+ <fromJavadoc>
+ <!-- Use exclude patterns to limit what gets exposed in component endpoint
+ <excludePackages>package-name-patterns</excludePackages>
+ <excludeClasses>class-name-patterns</excludeClasses>
+ <excludeMethods>method-name-patterns</excludeMethods>
+ -->
+ </fromJavadoc>
</api>
</apis>
+ <!-- Specify global values for all APIs here, only aliases are merged, others are overridden at API level
+ <substitutions/>
+ <fromJavadoc/>
+ <aliases/>
+ -->
</configuration>
</execution>
</executions>
@@ -264,21 +249,6 @@
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-api-component-maven-plugin</artifactId>
- <version>${camel-version}</version>
- <configuration>
- <scheme>${schemeName}</scheme>
- <componentName>${componentName}</componentName>
- <componentPackage>${componentPackage}</componentPackage>
- <outPackage>${outPackage}</outPackage>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>