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:36 UTC
[30/36] brooklyn-ui git commit: BROOKLYN-162 - apply org.apache
package prefix to software-base, tidying package names,
and moving a few sensory things to core
BROOKLYN-162 - apply org.apache package prefix to software-base, tidying package names, and moving a few sensory things to core
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/30a1d8f8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/30a1d8f8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/30a1d8f8
Branch: refs/heads/0.8.0-incubating
Commit: 30a1d8f8d8d932bd9f3492299540216526b7bd0e
Parents: 4fb7a59
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Aug 18 22:12:56 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Aug 19 00:52:54 2015 +0100
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js | 2 +-
.../test/javascript/specs/model/catalog-application-spec.js | 8 ++++----
.../src/test/javascript/specs/model/sensor-summary-spec.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/30a1d8f8/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js b/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js
index 80ecb8f..045e4f1 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js
@@ -51,7 +51,7 @@ define([
},
loadExample: function() {
$(".input textarea").val(
- 'import static brooklyn.entity.basic.Entities.*\n'+
+ 'import static org.apache.brooklyn.entity.software.base.Entities.*\n'+
'\n'+
'println "Last result: "+last\n'+
'data.exampleRunCount = (data.exampleRunCount ?: 0) + 1\n'+
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/30a1d8f8/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js b/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js
index df2bb94..d6a1c27 100644
--- a/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js
@@ -30,7 +30,7 @@ define([
expect(catalogApplication.get('name')).toEqual('My example application')
expect(catalogApplication.get('version')).toEqual('1.1')
expect(catalogApplication.get('description')).toEqual('My awesome example application, as a catalog item')
- expect(catalogApplication.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
+ expect(catalogApplication.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
expect(catalogApplication.get('iconUrl')).toEqual('http://my.example.com/icon.png')
})
})
@@ -54,7 +54,7 @@ define([
expect(catalogApplication1.get('name')).toEqual('My example application')
expect(catalogApplication1.get('version')).toEqual('1.1')
expect(catalogApplication1.get('description')).toEqual('My awesome example application, as a catalog item')
- expect(catalogApplication1.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
+ expect(catalogApplication1.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
expect(catalogApplication1.get('iconUrl')).toEqual('http://my.example.com/icon.png')
var catalogApplication2 = catalogApplicationFixture.at(1)
@@ -63,7 +63,7 @@ define([
expect(catalogApplication2.get('name')).toEqual('My example application')
expect(catalogApplication2.get('version')).toEqual('2.0')
expect(catalogApplication2.get('description')).toEqual('My awesome example application, as a catalog item')
- expect(catalogApplication2.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
+ expect(catalogApplication2.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"')
expect(catalogApplication2.get('iconUrl')).toEqual('http://my.example.com/icon.png')
var catalogApplication3 = catalogApplicationFixture.at(2)
@@ -72,7 +72,7 @@ define([
expect(catalogApplication3.get('name')).toEqual('Another example application')
expect(catalogApplication3.get('version')).toEqual('1.0')
expect(catalogApplication3.get('description')).toEqual('Another awesome example application, as a catalog item')
- expect(catalogApplication3.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch other application\"\n checkRunning.command: echo \"Check running other application\"')
+ expect(catalogApplication3.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch other application\"\n checkRunning.command: echo \"Check running other application\"')
expect(catalogApplication3.get('iconUrl')).toEqual('http://my.other.example.com/icon.png')
})
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/30a1d8f8/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js b/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js
index 63db6f2..b1bd2fd 100644
--- a/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js
@@ -32,7 +32,7 @@ define(['model/sensor-summary'], function (SensorSummary) {
expect(filteredSensors.length).toBe(1)
var ourSensor = filteredSensors.pop()
expect(ourSensor.get("name")).toBe('service.state')
- expect(ourSensor.get("type")).toBe('brooklyn.entity.basic.Lifecycle')
+ expect(ourSensor.get("type")).toBe('org.apache.brooklyn.entity.software.base.Lifecycle')
expect(ourSensor.get("description")).toBe('Service lifecycle state')
expect(ourSensor.getLinkByName('self')).toBe('fixtures/service-state.json')
expect(ourSensor.getLinkByName()).toBe(undefined)