You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:52:20 UTC
[14/36] brooklyn-ui git commit: [BROOKLYN-162] package rename to
org.apache.brooklyn: software/webapp
[BROOKLYN-162] package rename to org.apache.brooklyn: software/webapp
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/f40d3c93
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/f40d3c93
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/f40d3c93
Branch: refs/heads/0.8.0-incubating
Commit: f40d3c93d5674fb0dc312aa64124a936a23461e8
Parents: 607b3d2
Author: Yavor Yanchev <ya...@yanchev.com>
Authored: Wed Aug 12 15:24:37 2015 +0300
Committer: Yavor Yanchev <ya...@yanchev.com>
Committed: Wed Aug 12 15:24:37 2015 +0300
----------------------------------------------------------------------
.../webapp/assets/tpl/app-add-wizard/required-config-entry.html | 2 +-
usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js | 2 +-
.../jsgui/src/test/javascript/specs/model/entity-summary-spec.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f40d3c93/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html
index b802624..1478963 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html
@@ -34,7 +34,7 @@ under the License.
element = null;
for (var i = 0; i < length; i++) {
element = data.possibleValues[i]; %>
- <option value="<%= element.value %>"<% if (data.defaultValue == element.value) { %> selected="selected"<% } %>><%= element.description %></option>
+ <option value="<%= element.value %>"><% if (data.defaultValue == element.value) { %> selected="selected"<% } %>><%= element.description %></option>
<% } %>
</select>
<% } else { %>
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f40d3c93/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js b/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js
index 079aff4..7cbacf4 100644
--- a/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js
@@ -38,7 +38,7 @@ define([
expect(app1.get("type")).toBe("")
expect(app1.get("children").length).toBe(1)
expect(app1.get("children")[0].name).toBe("tomcat1")
- expect(app1.get("children")[0].type).toBe("brooklyn.entity.webapp.tomcat.TomcatServer")
+ expect(app1.get("children")[0].type).toBe("org.apache.brooklyn.entity.webapp.tomcat.TomcatServer")
expect(apps.at(1).get("children").length).toBe(2)
})
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f40d3c93/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js b/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js
index d989415..230b331 100644
--- a/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js
@@ -28,8 +28,8 @@ define(
it('the collection element must be of type TomcatServer and have expected properties', function () {
expect(eSummary.getLinkByName('catalog'))
- .toBe('/v1/catalog/entities/brooklyn.entity.webapp.tomcat.TomcatServer')
- expect(eSummary.get("type")).toBe('brooklyn.entity.webapp.tomcat.TomcatServer')
+ .toBe('/v1/catalog/entities/org.apache.brooklyn.entity.webapp.tomcat.TomcatServer')
+ expect(eSummary.get("type")).toBe('org.apache.brooklyn.entity.webapp.tomcat.TomcatServer')
expect(eSummary.getLinkByName('sensors')).toBe('fixtures/sensor-summary-list.json')
expect(eSummary.getDisplayName()).toBe('TomcatServer:zQsqdXzi')
})