camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcar...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Date Tue, 08 Oct 2013 17:41:20 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2f84f02
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2f84f02
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2f84f02

Branch: refs/heads/master
Commit: c2f84f02dc457008e93c180a2ba447e386b166fc
Parents: 743eb4a 5302422
Author: James W. Carman <jcarman@apache.org>
Authored: Tue Oct 8 13:39:52 2013 -0400
Committer: James W. Carman <jcarman@apache.org>
Committed: Tue Oct 8 13:39:52 2013 -0400

----------------------------------------------------------------------
 .../camel/processor/ShutdownDeferTest.java      |  39 +++-
 .../camel/processor/ShutdownNotDeferTest.java   |  41 +++-
 .../restlet/DefaultRestletBinding.java          |   3 +
 .../component/restlet/RestletSetBodyTest.java   |  42 ++++
 ...pringPropertyPlaceholderConfigurer3Test.java |  23 ++-
 .../processor/SpringShutdownDeferTest.java      |  32 ---
 .../processor/SpringShutdownNotDeferTest.java   |  32 ---
 ...SpringPropertyPlaceholderConfigurer3Test.xml |   1 +
 .../spring/processor/ShutdownDeferTest.xml      |  45 ----
 .../spring/processor/ShutdownNotDeferTest.xml   |  43 ----
 .../blueprint/CamelBlueprintTestSupport.java    |  13 +-
 .../pom.xml                                     |  61 ++++++
 .../META-INF/maven/archetype-metadata.xml       |  78 +++++++
 .../src/main/resources/META-INF/LICENSE.txt     | 203 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt      |  11 +
 .../resources/archetype-resources/ReadMe.txt    |  29 +++
 .../main/resources/archetype-resources/pom.xml  |  94 +++++++++
 .../src/main/java/incident/IncidentService.java |  35 ++++
 .../main/java/incident/InputReportIncident.java |  96 +++++++++
 .../main/java/incident/InputStatusIncident.java |  33 +++
 .../java/incident/OutputReportIncident.java     |  33 +++
 .../java/incident/OutputStatusIncident.java     |  33 +++
 .../java/incident/ReportIncidentProcessor.java  |  38 ++++
 .../java/incident/StatusIncidentProcessor.java  |  36 ++++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  59 ++++++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |   8 +-
 tooling/archetypes/pom.xml                      |   1 +
 27 files changed, 992 insertions(+), 170 deletions(-)
----------------------------------------------------------------------



Mime
View raw message