[1/2] brooklyn-server git commit: Fix external-config for jclouds credentials

Repository: brooklyn-server Updated Branches: refs/heads/master fa19e8f5f -> 8da814a9f Fix external-config for jclouds credentials - Adds ResolvingConfigBag, which resolves deferred-supplier on get() - Use that in jcloudsLocation.getComputeService(ConfigBag) Project:

[31/34] brooklyn-server git commit: move common ha filter code to shared class

move common ha filter code to shared class and ensure classes not in scope aren't referenced Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3ab00406 Tree:

[27/34] brooklyn-server git commit: REST API optional Jersey compatibility

REST API optional Jersey compatibility Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/abd2d5f3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/abd2d5f3 Diff:

[2/2] brooklyn-ui git commit: This closes #6

This closes #6 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/68fb2262 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/68fb2262 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/68fb2262

[30/34] brooklyn-server git commit: fix tests which expected a particular result

fix tests which expected a particular result Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7f047baa Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7f047baa Diff:

[11/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java -- diff --git

[29/34] brooklyn-server git commit: This closes #15

This closes #15 simple merge conflicts resolved (imports, and extra param/code in places) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/79b98c67 Tree:

[02/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java -- diff --git

[24/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java -- diff --git

[05/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/MultimapSerializer.java -- diff --git

[17/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java -- diff --git

[10/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/util/HaHotStateCheckResource.java -- diff --git

[08/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java -- diff --git

[26/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java -- diff --git

[04/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java -- diff --git

[20/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

[BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation Changes: * Replace Jersey dependency (JAX-RS 1.1) implementation with CXF (JAX-RS 2.0) * Use relative paths for REST resource paths Move the context root at /v1, and use paths relative to that in resource annotations. * Add CXF REST

[1/2] brooklyn-ui git commit: Remove /v1 prefix from REST API

Repository: brooklyn-ui Updated Branches: refs/heads/master b9ba6544d -> 68fb22627 Remove /v1 prefix from REST API Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/cf1c6a7f Tree:

[22/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java -- diff --git

[28/34] brooklyn-server git commit: This closes #15

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79b98c67/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java -- diff --cc

[23/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java -- diff --git

[25/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java -- diff --git

[03/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java -- diff --git

[06/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java -- diff --git

[19/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-api/src/main/webapp/WEB-INF/web.xml -- diff --git a/rest/rest-api/src/main/webapp/WEB-INF/web.xml b/rest/rest-api/src/main/webapp/WEB-INF/web.xml

[34/34] brooklyn-server git commit: Merge remote-tracking branch 'apache-git/master' into osgi

Merge remote-tracking branch 'apache-git/master' into osgi Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fa19e8f5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fa19e8f5 Diff:

[21/34] brooklyn-server git commit: REST API optional Jersey compatibility

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/abd2d5f3/rest/rest-server-jersey/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java -- diff --git

[07/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java -- diff --git

[09/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java -- diff --git

[32/34] brooklyn-server git commit: clarify when /v1/ is or is not required, fixing many integration tests

clarify when /v1/ is or is not required, fixing many integration tests and remove warnings Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/96d804a7 Tree:

[01/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

Repository: brooklyn-server Updated Branches: refs/heads/master a2820e5f6 -> fa19e8f5f http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/NullHttpServletRequestProvider.java

[13/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java -- diff --git

[18/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java -- diff --git

[16/34] brooklyn-server git commit: [BROOKLYN-183] REST API using CXF JAX-RS 2.0 implementation

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f624c78/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java -- diff --git

[04/27] brooklyn-ui git commit: can go from catalog item to open in composer

can go from catalog item to open in composer Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/0554b079 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/0554b079 Diff:

[27/27] brooklyn-ui git commit: apply code review to ui #7 codemirror yaml-parse and completion

apply code review to ui #7 codemirror yaml-parse and completion and some styling tweaks so highlight is correct Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b9ba6544 Tree:

[18/27] brooklyn-ui git commit: add font awesome

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/631292f7/src/main/webapp/assets/js/libs/font-awesome/fonts/fontawesome-webfont.ttf -- diff --git a/src/main/webapp/assets/js/libs/font-awesome/fonts/fontawesome-webfont.ttf

[10/27] brooklyn-ui git commit: call buttons "Open in Composer" and "Deploy" rather than "Preview" / "Finish"

call buttons "Open in Composer" and "Deploy" rather than "Preview" / "Finish" and the "Open in Composer" button is highlighted if you pick a template Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/9d3d9bb3 Tree:

[16/27] brooklyn-ui git commit: simple but effective code completion

simple but effective code completion does not attempt to cover everything or do a perfect parse tree, as that is much harder, but does simple heuristics which give a lot of help without too much work it would be great to offer something much sounder, basing e.g. on json-schema, but that is a

[23/27] brooklyn-ui git commit: make span12 (composer) line up with other pages

make span12 (composer) line up with other pages and remove debug js logging just introduced Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/2414c144 Tree:

[11/27] brooklyn-ui git commit: minor bug fixes

minor bug fixes Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/438132fc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/438132fc Diff:

[25/27] brooklyn-ui git commit: This closes #5

This closes #5 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b7954f13 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/b7954f13 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/b7954f13

[07/27] brooklyn-ui git commit: update js-yaml to latest (snapshot) version

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1e17eeef/src/main/webapp/assets/js/libs/js-yaml.js -- diff --git a/src/main/webapp/assets/js/libs/js-yaml.js b/src/main/webapp/assets/js/libs/js-yaml.js index

[22/27] brooklyn-ui git commit: tell people about code completion.

tell people about code completion. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/500b5fa8 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/500b5fa8 Diff:

[08/27] brooklyn-ui git commit: update js-yaml to latest (snapshot) version

update js-yaml to latest (snapshot) version from commit 50c82bccf70a19fd4add99542dfdf06a60280da8 (today) with parse listener enhancement https://github.com/nodeca/js-yaml/pull/249 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit:

[05/27] brooklyn-ui git commit: composer allows blueprints to be passed, and app-add-wizard preview button takes you to composer

composer allows blueprints to be passed, and app-add-wizard preview button takes you to composer previously "preview" button just reset the dialog; this also gives slightly more interesting examples Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit:

[24/27] brooklyn-ui git commit: use apache brooklyn logo w feather

use apache brooklyn logo w feather and add various brooklyn logo files Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/dfc2d21b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/dfc2d21b Diff:

[15/27] brooklyn-ui git commit: move codemirror libraries to the usual places

move codemirror libraries to the usual places Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/d19e3156 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/d19e3156 Diff:

[14/27] brooklyn-ui git commit: move codemirror libraries to the usual places

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d19e3156/src/main/webapp/assets/js/lib/codemirror.js -- diff --git a/src/main/webapp/assets/js/lib/codemirror.js b/src/main/webapp/assets/js/lib/codemirror.js deleted file

[26/27] brooklyn-ui git commit: This closes #7

This closes #7 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/e1646d73 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/e1646d73 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/e1646d73

[01/27] brooklyn-ui git commit: tweak buttons for composer, following @tbouron and @hellberg suggestions

Repository: brooklyn-ui Updated Branches: refs/heads/master c2e374eb8 -> b9ba6544d tweak buttons for composer, following @tbouron and @hellberg suggestions also adjust height w custom codemirror styling Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit:

[21/27] brooklyn-ui git commit: use icons for example and docs link

use icons for example and docs link Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/d4d88aab Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/d4d88aab Diff:

[12/27] brooklyn-ui git commit: move codemirror libraries to the usual places

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d19e3156/src/main/webapp/assets/js/libs/codemirror/addon/display/placeholder.js -- diff --git a/src/main/webapp/assets/js/libs/codemirror/addon/display/placeholder.js

[20/27] brooklyn-ui git commit: add font awesome

add font awesome Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/631292f7 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/631292f7 Diff:

[1/2] brooklyn-server git commit: Adds equals and hashcode to DslComponent and related classes

Repository: brooklyn-server Updated Branches: refs/heads/master a5103bba5 -> a2820e5f6 Adds equals and hashcode to DslComponent and related classes Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit:

[2/2] brooklyn-server git commit: This closes #24

This closes #24 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a2820e5f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a2820e5f Diff:

[2/2] brooklyn-dist git commit: This closes #7

This closes #7 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/006a31ee Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/006a31ee Diff:

[1/2] brooklyn-dist git commit: Update servers.yaml

Repository: brooklyn-dist Updated Branches: refs/heads/master 00248bc51 -> 006a31eea Update servers.yaml added missing execute command on install_brooklyn.sh to fix permission denied error Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: