Repository: camel Updated Branches: refs/heads/master d72696455 -> 6b42a3534
Rename catalog to runtimecatalog to avoid clash with same package name in camel-catalog. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b42a353 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b42a353 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b42a353 Branch: refs/heads/master Commit: 6b42a3534120f58180e6194e6bf4f1a284707abc Parents: c66be7a Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 14 12:17:14 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 14 12:52:40 2017 +0200 ---------------------------------------------------------------------- platforms/camel-catalog/pom.xml | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6b42a353/platforms/camel-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml index 2be82e0..6c71fcb 100644 --- a/platforms/camel-catalog/pom.xml +++ b/platforms/camel-catalog/pom.xml @@ -92,7 +92,7 @@ <executions> <execution> <id>copy-resources</id> - <phase>process-sources</phase> + <phase>generate-sources</phase> <goals> <goal>copy-resources</goal> </goals> @@ -101,7 +101,7 @@ <overwrite>true</overwrite> <resources> <resource> - <directory>../../camel-core/src/main/java/org/apache/camel/catalog</directory> + <directory>../../camel-core/src/main/java/org/apache/camel/runtimecatalog</directory> <!-- the following files are maintained in camel-core and not here, so they are copied over --> <includes> <include>AbstractCamelCatalog.java</include> @@ -123,6 +123,42 @@ </execution> </executions> </plugin> + <!-- rename runtimecatalog to catalog which is the package name we use here --> + <plugin> + <groupId>com.google.code.maven-replacer-plugin</groupId> + <artifactId>replacer</artifactId> + <version>1.5.3</version> + <executions> + <execution> + <phase>process-sources</phase> + <goals> + <goal>replace</goal> + </goals> + </execution> + </executions> + <configuration> + <includes> + <include>${basedir}/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/CatalogHelper.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/CollectionStringBuffer.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/JSonSchemaResolver.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/LanguageValidationResult.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/SuggestionStrategy.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/TimePatternConverter.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java</include> + <include>${basedir}/src/main/java/org/apache/camel/catalog/URISupport.java</include> + </includes> + <replacements> + <replacement> + <token>org.apache.camel.runtimecatalog</token> + <value>org.apache.camel.catalog</value> + </replacement> + </replacements> + </configuration> + </plugin> <!-- generate and include all components in the catalog --> <plugin>
