Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c4a3fb3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c4a3fb3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c4a3fb3 Branch: refs/heads/master Commit: 7c4a3fb36afd8858270649917d22ba457379c729 Parents: 36932e4 3244c1e Author: Scott England-Sullivan <sully6...@apache.org> Authored: Wed Nov 27 09:53:58 2013 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Wed Nov 27 09:53:58 2013 -0600 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 + .../src/main/descriptors/common-bin.xml | 1 + .../camel/component/seda/SedaEndpoint.java | 6 + .../DefaultManagementMBeanAssembler.java | 2 +- .../camel/management/MBeanInfoAssembler.java | 12 +- .../camel/management/mbean/ManagedRoute.java | 10 + .../camel/management/ManagedResourceTest.java | 9 + .../ManagedRouteUpdateRouteFromXmlTest.java | 76 +++++++ .../management/ManagedSedaEndpointTest.java | 3 + components/camel-cometd/pom.xml | 1 + components/camel-gae/pom.xml | 3 + components/camel-http/pom.xml | 3 + components/camel-http4/pom.xml | 11 +- components/camel-jetty/pom.xml | 3 + components/camel-optaplanner/pom.xml | 72 +++++++ .../optaplanner/OptaPlannerComponent.java | 41 ++++ .../optaplanner/OptaPlannerEndpoint.java | 77 +++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../org/apache/camel/component/optaplanner | 18 ++ .../component/optaplanner/OptaPlannerTest.java | 54 +++++ .../src/test/resources/log4j.properties | 36 ++++ .../component/optaplanner/solverConfig.xml | 51 +++++ components/camel-servlet/pom.xml | 7 +- components/camel-servletlistener/pom.xml | 3 + components/camel-urlrewrite/pom.xml | 3 + components/pom.xml | 1 + parent/pom.xml | 27 ++- .../features/src/main/resources/features.xml | 20 ++ .../camel/itest/karaf/CamelOptaplannerTest.java | 42 ++++ 30 files changed, 793 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
