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 2019/12/20 16:14:26 UTC
[brooklyn-ui] branch master updated (4b749c4 -> ea139c6)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 4b749c4 Merge pull request #150 from frogfather/order-blueprints-by-date
new cdfca29 require endpoint when provider is azure-arm
new e4eac30 This closes #161
new 74ee1cb add relativePath to parent for release make
new a28d4f1 This closes #160
new e8dec48 allow relative path to parent to be configured
new ea139c6 This closes #162
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 5 +++--
.../location-manager/app/views/wizard/cloud/cloud.controller.js | 5 +++++
.../location-manager/app/views/wizard/cloud/cloud.template.html | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
[brooklyn-ui] 04/06: allow relative path to parent to be configured
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit e8dec48eae0b07d1d2918c7315b1090e5c856345
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 15:07:31 2019 +0000
allow relative path to parent to be configured
surprisingly (to me) this _is_ permitted in maven; according to the docs it only restricts:
> Properties are not supported in the following XPath elements:
> `/project(/parent)?/(groupId/artifactId/version)`
---
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4a223d6..525199c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../brooklyn-server/parent/</relativePath>
+ <relativePath>${brooklyn.ui.relativePath.to.brooklyn.server.parent}</relativePath>
</parent>
<groupId>org.apache.brooklyn.ui</groupId>
@@ -84,6 +84,8 @@
<brooklyn.version>1.0.0-SNAPSHOT</brooklyn.version><!-- BROOKLYN_VERSION -->
<build.version>${revision}</build.version>
<build.name>Apache Brooklyn</build.name>
+ <brooklyn.ui.relativePath.to.brooklyn.server.parent>../brooklyn-server/parent/</brooklyn.ui.relativePath.to.brooklyn.server.parent>
+
<buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
<!-- versions from brooklyn server which have a different var name here -->
[brooklyn-ui] 06/06: This closes #162
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit ea139c6cac245d463a66d63a0fc633523be49e18
Merge: e4eac30 e8dec48
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 16:14:18 2019 +0000
This closes #162
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
[brooklyn-ui] 05/06: This closes #161
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit e4eac30f1951d950a2544a47f1f001c14947b1f2
Merge: 4b749c4 cdfca29
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 16:12:49 2019 +0000
This closes #161
.../location-manager/app/views/wizard/cloud/cloud.controller.js | 5 +++++
.../location-manager/app/views/wizard/cloud/cloud.template.html | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
[brooklyn-ui] 03/06: This closes #160
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit a28d4f1565a77af0772f9809708611c95ff11a14
Merge: 4b749c4 74ee1cb
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 14:59:48 2019 +0000
This closes #160
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[brooklyn-ui] 02/06: require endpoint when provider is azure-arm
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit cdfca29961cf688a50e148008b4d54b83c6cc060
Author: frogfather <j....@icloud.com>
AuthorDate: Fri Dec 20 10:25:40 2019 +0000
require endpoint when provider is azure-arm
---
.../location-manager/app/views/wizard/cloud/cloud.controller.js | 5 +++++
.../location-manager/app/views/wizard/cloud/cloud.template.html | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
index 996a156..9309e50 100644
--- a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
+++ b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
@@ -71,6 +71,11 @@ export function wizardCloudController($element, $state, brSnackbar, locationSpec
return disabled.indexOf(vm.provider) > -1;
};
+ vm.isEndpointRequired = function () {
+ let required = ['jclouds:azurecompute-arm'];
+ return required.indexOf(vm.provider) > -1;
+ }
+
vm.save = function () {
let config = angular.copy(vm.config);
if (vm.region) {
diff --git a/ui-modules/location-manager/app/views/wizard/cloud/cloud.template.html b/ui-modules/location-manager/app/views/wizard/cloud/cloud.template.html
index 418e2fb..7d22072 100644
--- a/ui-modules/location-manager/app/views/wizard/cloud/cloud.template.html
+++ b/ui-modules/location-manager/app/views/wizard/cloud/cloud.template.html
@@ -67,7 +67,10 @@
<div class="form-group" ng-class="{'has-error': form.endpoint.$invalid && form.endpoint.$touched}">
<label class="control-label" for="endpoint">Cloud endpoint</label>
- <input ng-model="vm.endpoint" type="text" class="form-control" id="endpoint" name="endpoint" ng-disabled="vm.isEndpointDisabled()" placeholder="If using a private cloud, the URL to connect to it is required">
+ <input ng-model="vm.endpoint" type="text" class="form-control" id="endpoint" name="endpoint" ng-required="vm.isEndpointRequired()" ng-disabled="vm.isEndpointDisabled()" placeholder="If using a private cloud, the URL to connect to it is required">
+ <p class="help-block" ng-show="form.$submitted || form.endpoint.$touched">
+ <span ng-show="form.endpoint.$error.required">You must specify an endpoint with this provider</span>
+ </p>
</div>
<div class="form-group" ng-class="{'has-error': form.identity.$invalid && form.identity.$touched}">
[brooklyn-ui] 01/06: add relativePath to parent for release make
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 74ee1cb7047629474cad40eccbc6924ec1a2960e
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Thu Dec 19 23:19:02 2019 +0000
add relativePath to parent for release make
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2878d6d..4a223d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <!-- do not link to sibling directory as that breaks builds where this code is embedded, e.g. for branding;
- we require that brooklyn-server is built first (this is needed anyway for the modularity java code) -->
+ <relativePath>../brooklyn-server/parent/</relativePath>
</parent>
<groupId>org.apache.brooklyn.ui</groupId>