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:08 UTC

[24/24] incubator-brooklyn git commit: This closes #1040

This closes #1040


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

Branch: refs/heads/master
Commit: dfa34b6177956f139a0bf52064b47b0025eefb47
Parents: f271d5c 0a28fc5
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Nov 18 18:31:10 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Nov 18 18:31:10 2015 -0500

----------------------------------------------------------------------
 camp/camp-server/pom.xml                        |    6 -
 .../server/dto/ApplicationComponentDto.java     |    4 -
 .../dto/ApplicationComponentTemplateDto.java    |    4 -
 .../brooklyn/camp/server/dto/AssemblyDto.java   |    4 -
 .../camp/server/dto/AssemblyTemplateDto.java    |    4 -
 .../camp/server/dto/PlatformComponentDto.java   |    4 -
 .../dto/PlatformComponentTemplateDto.java       |    4 -
 .../brooklyn/camp/server/dto/PlatformDto.java   |    4 -
 .../camp/server/rest/CampRestResources.java     |   10 +-
 .../rest/resource/ApidocRestResource.java       |    6 +-
 .../ApplicationComponentRestResource.java       |   10 +-
 ...pplicationComponentTemplateRestResource.java |   10 +-
 .../rest/resource/AssemblyRestResource.java     |   10 +-
 .../resource/AssemblyTemplateRestResource.java  |   10 +-
 .../resource/PlatformComponentRestResource.java |   10 +-
 .../PlatformComponentTemplateRestResource.java  |   10 +-
 .../rest/resource/PlatformRestResource.java     |    8 +-
 .../features/src/main/history/dependencies.xml  |    6 +-
 parent/pom.xml                                  |   34 +-
 pom.xml                                         |    4 +-
 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/launcher/BrooklynWebServer.java    |    2 +
 usage/rest-api/pom.xml                          |    9 +-
 .../org/apache/brooklyn/rest/api/AccessApi.java |   10 +-
 .../apache/brooklyn/rest/api/ActivityApi.java   |   26 +-
 .../brooklyn/rest/api/ApplicationApi.java       |   68 +-
 .../apache/brooklyn/rest/api/CatalogApi.java    |  132 +-
 .../apache/brooklyn/rest/api/EffectorApi.java   |   24 +-
 .../org/apache/brooklyn/rest/api/EntityApi.java |   72 +-
 .../brooklyn/rest/api/EntityConfigApi.java      |   40 +-
 .../apache/brooklyn/rest/api/LocationApi.java   |   18 +-
 .../org/apache/brooklyn/rest/api/PolicyApi.java |   42 +-
 .../brooklyn/rest/api/PolicyConfigApi.java      |   34 +-
 .../org/apache/brooklyn/rest/api/ScriptApi.java |   10 +-
 .../org/apache/brooklyn/rest/api/SensorApi.java |   44 +-
 .../org/apache/brooklyn/rest/api/ServerApi.java |   31 +-
 .../org/apache/brooklyn/rest/api/UsageApi.java  |   34 +-
 .../apache/brooklyn/rest/api/VersionApi.java    |    9 +-
 usage/rest-api/src/main/webapp/WEB-INF/web.xml  |   10 +-
 .../brooklyn/rest/client/BrooklynApi.java       |    5 +-
 usage/rest-server/pom.xml                       |    9 +-
 .../apache/brooklyn/rest/BrooklynRestApi.java   |    4 +-
 .../brooklyn/rest/filter/SwaggerFilter.java     |   76 +
 .../brooklyn/rest/resources/ApidocResource.java |   10 +-
 .../rest-server/src/main/webapp/WEB-INF/web.xml |   13 +-
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |    4 +-
 .../rest/resources/ApiDocResourceTest.java      |  138 --
 .../rest/resources/ApidocResourceTest.java      |  177 +++
 .../rest/testing/BrooklynRestApiTest.java       |   31 +-
 .../rest/util/NullServletConfigProvider.java    |    5 +
 utils/rest-swagger/pom.xml                      |   33 +-
 .../rest/apidoc/ApiListingResource.java         |  259 ++++
 .../org/apache/brooklyn/rest/apidoc/Apidoc.java |   33 -
 .../brooklyn/rest/apidoc/ApidocEndpoint.java    |   54 -
 .../apidoc/ApidocHelpMessageBodyWriter.java     |   28 -
 .../brooklyn/rest/apidoc/ApidocResource.java    |  291 ----
 .../apache/brooklyn/rest/apidoc/ApidocRoot.java |   47 -
 .../rest/apidoc/RestApiResourceScanner.java     |   79 +
 utils/swagger-annotations/pom.xml               |   44 +
 .../brooklyn/swagger/annotations/Apidoc.java    |   33 +
 97 files changed, 6587 insertions(+), 3252 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfa34b61/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfa34b61/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfa34b61/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
----------------------------------------------------------------------