You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/19 00:43:07 UTC

[23/24] incubator-brooklyn git commit: Merge pull request #3 from m4rkmckenna/cmoh-swagger-1.5.3

Merge pull request #3 from m4rkmckenna/cmoh-swagger-1.5.3

[BROOKLYN-185] Added static swagger-ui avoiding JS dependency changes in main JSGUI

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0a28fc53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0a28fc53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0a28fc53

Branch: refs/heads/master
Commit: 0a28fc53b68628bf37cdb76a61462d213a3567a3
Parents: 95da81e 63c575d
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Nov 18 14:50:17 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 18 14:50:17 2015 +0200

----------------------------------------------------------------------
 usage/dist/licensing/overrides.yaml             |   52 +-
 usage/jsgui/pom.xml                             |    9 +-
 usage/jsgui/src/main/license/files/LICENSE      |   54 +-
 .../src/main/license/source-inclusions.yaml     |    1 +
 .../src/main/webapp/assets/html/swagger-ui.html |   78 +
 .../main/webapp/assets/js/libs/swagger-ui.js    | 1410 ------------------
 .../src/main/webapp/assets/js/libs/swagger.js   |  708 ---------
 usage/jsgui/src/main/webapp/assets/js/router.js |   16 +-
 .../src/main/webapp/assets/js/view/apidoc.js    |   82 -
 .../main/webapp/assets/swagger-ui/css/print.css | 1195 +++++++++++++++
 .../main/webapp/assets/swagger-ui/css/reset.css |  144 ++
 .../webapp/assets/swagger-ui/css/screen.css     | 1301 ++++++++++++++++
 .../main/webapp/assets/swagger-ui/css/style.css |  269 ++++
 .../webapp/assets/swagger-ui/css/typography.css |   45 +
 .../fonts/droid-sans-v6-latin-700.eot           |  Bin 0 -> 22922 bytes
 .../fonts/droid-sans-v6-latin-700.svg           |  411 +++++
 .../fonts/droid-sans-v6-latin-700.ttf           |  Bin 0 -> 40513 bytes
 .../fonts/droid-sans-v6-latin-700.woff          |  Bin 0 -> 25992 bytes
 .../fonts/droid-sans-v6-latin-700.woff2         |  Bin 0 -> 11480 bytes
 .../fonts/droid-sans-v6-latin-regular.eot       |  Bin 0 -> 22008 bytes
 .../fonts/droid-sans-v6-latin-regular.svg       |  403 +++++
 .../fonts/droid-sans-v6-latin-regular.ttf       |  Bin 0 -> 39069 bytes
 .../fonts/droid-sans-v6-latin-regular.woff      |  Bin 0 -> 24868 bytes
 .../fonts/droid-sans-v6-latin-regular.woff2     |  Bin 0 -> 11304 bytes
 .../assets/swagger-ui/images/explorer_icons.png |  Bin 0 -> 5763 bytes
 .../assets/swagger-ui/images/pet_store_api.png  |  Bin 0 -> 824 bytes
 .../assets/swagger-ui/images/throbber.gif       |  Bin 0 -> 9257 bytes
 .../assets/swagger-ui/images/wordnik_api.png    |  Bin 0 -> 980 bytes
 .../assets/swagger-ui/lib/backbone-min.js       |   34 +
 .../assets/swagger-ui/lib/handlebars-2.0.0.js   |   20 +
 .../assets/swagger-ui/lib/jquery-1.8.0.min.js   |   21 +
 .../assets/swagger-ui/lib/jquery.ba-bbq.min.js  |   29 +
 .../assets/swagger-ui/lib/jquery.wiggle.min.js  |   27 +
 .../main/webapp/assets/swagger-ui/lib/marked.js | 1285 ++++++++++++++++
 .../assets/swagger-ui/lib/swagger-ui.min.js     |   37 +
 .../assets/swagger-ui/lib/underscore-min.js     |   25 +
 .../assets/swagger-ui/lib/underscore-min.map    |    1 +
 usage/jsgui/src/main/webapp/index.html          |   32 +-
 .../brooklyn/rest/filter/SwaggerFilter.java     |   66 +-
 39 files changed, 5470 insertions(+), 2285 deletions(-)
----------------------------------------------------------------------