Merge branch 'componentlist'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7038c0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7038c0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7038c0a Branch: refs/heads/master Commit: e7038c0af0aeb23e0cd7b41490a1b138c05ac520 Parents: 4857480 9482e56 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Nov 14 08:46:38 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Nov 14 08:46:38 2014 +0100 ---------------------------------------------------------------------- .../camel/component/ResourceEndpoint.java | 13 +- .../org/apache/camel/impl/DefaultEndpoint.java | 14 +- components/pom.xml | 9 - parent/pom.xml | 5 + platforms/catalog/pom.xml | 73 +++ .../camel/catalog/CamelComponentCatalog.java | 38 ++ .../catalog/DefaultCamelComponentCatalog.java | 121 +++++ platforms/commands/commands-core/pom.xml | 5 + .../camel/commands/AbstractCamelController.java | 62 +++ .../apache/camel/commands/CamelController.java | 10 +- .../commands/ComponentCatalogListCommand.java | 183 +++++++ .../camel/commands/ComponentListCommand.java | 2 +- .../camel/commands/ContextListCommandTest.java | 6 +- .../catalog/CamelComponentCatalogTest.java | 67 +++ .../karaf/commands/ComponentCatalogList.java | 35 ++ .../camel/karaf/commands/ComponentList.java | 2 +- .../OSGI-INF/blueprint/camel-commands.xml | 9 + .../features/src/main/resources/features.xml | 1 + platforms/pom.xml | 1 + .../tools/apt/EndpointAnnotationProcessor.java | 4 +- .../maven/camel-package-maven-plugin/pom.xml | 53 ++- .../camel/maven/packaging/EndpointMojo.java | 471 ------------------- .../maven/packaging/PrepareCatalogMojo.java | 271 +++++++++++ .../camel-package-maven-plugin.properties | 3 - .../java/org/apache/camel/spi/UriParam.java | 7 + 25 files changed, 935 insertions(+), 530 deletions(-) ----------------------------------------------------------------------
