You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/08/10 11:42:16 UTC

[10/11] git commit: Merge branch 'swagger'

Merge branch 'swagger'


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

Branch: refs/heads/master
Commit: 4252f653a3a53ceda8fadbf25dae123fb8e4e086
Parents: 625eb8d a53b2da
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 10 11:17:22 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 10 11:17:22 2014 +0200

----------------------------------------------------------------------
 apache-camel/pom.xml                            |   4 +
 .../src/main/descriptors/common-bin.xml         |   1 +
 components/camel-swagger/pom.xml                | 158 +++++++++++++++
 .../src/main/resources/META-INF/LICENSE.txt     | 203 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt      |  11 +
 .../component/swagger/RestApiListingCache.scala |  55 +++++
 .../RestSwaggerApiDeclarationServlet.scala      | 164 +++++++++++++++
 .../component/swagger/RestSwaggerReader.scala   | 194 ++++++++++++++++++
 .../swagger/DummyRestConsumerFactory.java       |  48 +++++
 .../swagger/RestSwaggerReaderTest.java          |  75 +++++++
 .../src/test/resources/log4j.properties         |  42 ++++
 components/pom.xml                              |   1 +
 .../README.txt                                  |   3 +
 .../camel-example-servlet-rest-tomcat/pom.xml   |  35 +++-
 .../camel/example/rest/UserRouteBuilder.java    |   5 +
 .../src/main/resources/camel-config.xml         |   6 +-
 .../src/main/resources/log4j.properties         |   2 +
 .../src/main/webapp/WEB-INF/web.xml             |  26 +++
 .../src/main/webapp/index.html                  |   8 +
 parent/pom.xml                                  |   6 +
 20 files changed, 1045 insertions(+), 2 deletions(-)
----------------------------------------------------------------------