Merge branch 'master' into camel-metrics
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20f67f58 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20f67f58 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20f67f58 Branch: refs/heads/master Commit: 20f67f58846153beb4047946e542a3e4af3de765 Parents: 4c41ca9 d98a45e Author: Lauri Kimmel <lauri.kim...@gmx.com> Authored: Wed Jul 30 20:59:18 2014 +1000 Committer: Lauri Kimmel <lauri.kim...@gmx.com> Committed: Wed Jul 30 20:59:18 2014 +1000 ---------------------------------------------------------------------- .../camel/model/RestContextRefDefinition.java | 59 ++++++++ .../model/RestContextRefDefinitionHelper.java | 151 +++++++++++++++++++ .../model/RouteContextRefDefinitionHelper.java | 2 +- .../resources/org/apache/camel/model/jaxb.index | 1 + .../apache/camel/model/XmlRestParseTest.java | 44 ++++++ .../org/apache/camel/model/XmlTestSupport.java | 8 + .../org/apache/camel/model/simpleRest.xml | 27 ++++ .../blueprint/CamelContextFactoryBean.java | 11 ++ .../blueprint/CamelRestContextFactoryBean.java | 40 +++++ .../handler/CamelNamespaceHandler.java | 46 ++++++ .../org/apache/camel/blueprint/jaxb.index | 1 + .../xml/AbstractCamelContextFactoryBean.java | 22 ++- .../camel/osgi/CamelNamespaceHandler.java | 1 + .../camel/spring/CamelContextFactoryBean.java | 11 ++ .../spring/CamelRestContextFactoryBean.java | 59 ++++++++ .../spring/handler/CamelNamespaceHandler.java | 38 ++++- .../org/apache/camel/spring/jaxb.index | 1 + .../camel/component/rest/RestRefTest.java | 64 ++++++++ .../apache/camel/component/rest/RestRefTest.xml | 64 ++++++++ .../blueprint/component/rest/RestRefTest.java | 66 ++++++++ .../blueprint/component/rest/RestRefTest.xml | 62 ++++++++ 21 files changed, 774 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
