[1/5] brooklyn-server git commit: Add support for kubernetes helm
Repository: brooklyn-server
Updated Branches:
refs/heads/master 12e6b0045 -> 0debf391d
Add support for kubernetes helm
- bump microbean-helm version
- support default stable ChartRepository
- use auto-generated release name
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6ddc595d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6ddc595d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6ddc595d
Branch: refs/heads/master
Commit: 6ddc595dd549e13343fc4896fc05224c420ed136
Parents: 12e6b00
Author: Andrea Turli
Authored: Mon Aug 21 15:21:52 2017 +0200
Committer: andreaturli
Committed: Mon Mar 12 11:06:27 2018 +0100
--
locations/container/pom.xml | 88 ++-
.../entity/kubernetes/KubernetesHelmChart.java | 37 +++
.../kubernetes/KubernetesHelmChartImpl.java | 35 +++
.../location/kubernetes/KubernetesLocation.java | 258 ++-
.../container/supplier/TillerSupplier.java | 43
.../kubernetes/KubernetesLocationLiveTest.java | 2 +
.../KubernetesLocationYamlLiveTest.java | 24 ++
7 files changed, 417 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6ddc595d/locations/container/pom.xml
--
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 6bd4be1..da1434b 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -32,11 +32,43 @@
-1.4.27
+2.5.6
+org.microbean
+microbean-helm
+2.7.2.1.0.0
+
+
+com.google.api.grpc
+proto-google-common-protos
+
+
+com.google.errorprone
+error_prone_annotations
+
+
+io.grpc
+grpc-context
+
+
+
+
+
+
+com.google.errorprone
+error_prone_annotations
+2.0.19
+
+
+io.grpc
+grpc-context
+1.4.0
+
+
+
io.fabric8
kubernetes-client
${kubernetes-client.version}
@@ -69,6 +101,10 @@
javax.ws.rs
jsr311-api
+
+com.squareup.okio
+okio
+
@@ -88,7 +124,20 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${brooklyn.version}
+
+
+com.squareup.okio
+okio
+
+
+
+
+
+com.squareup.okio
+okio
+1.13.0
+
org.slf4j
slf4j-api
@@ -152,4 +201,41 @@
test
+
+
+
+
+
+kr.motd.maven
+os-maven-plugin
+1.5.0.Final
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+initialize
+
+true
+
+
+
+
+
+
+
+run
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6ddc595d/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java
--
diff --git
a/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java
b/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java
new file mode 100644
index 000..e44a4bc
--- /dev/null
+++
b/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache Licen
[5/5] brooklyn-server git commit: This closes #830
This closes #830 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0debf391 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0debf391 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0debf391 Branch: refs/heads/master Commit: 0debf391dea1f38ea1f1c629e005df625ea13651 Parents: 12e6b00 d091f82 Author: Thomas Bouron Authored: Wed Apr 11 14:40:39 2018 +0100 Committer: Thomas Bouron Committed: Wed Apr 11 14:40:39 2018 +0100 -- locations/container/README.md | 30 ++ locations/container/pom.xml | 92 +-- .../entity/kubernetes/KubernetesHelmChart.java | 37 +++ .../kubernetes/KubernetesHelmChartImpl.java | 35 +++ .../KubernetesClientRegistryImpl.java | 3 +- .../location/kubernetes/KubernetesLocation.java | 274 ++- .../container/supplier/TillerSupplier.java | 43 +++ .../kubernetes/KubernetesLocationLiveTest.java | 2 + .../KubernetesLocationYamlLiveTest.java | 24 ++ pom.xml | 2 +- 10 files changed, 442 insertions(+), 100 deletions(-) --
[4/5] brooklyn-server git commit: add .helm dir
add .helm dir
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d091f82a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d091f82a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d091f82a
Branch: refs/heads/master
Commit: d091f82a988fc6bad42bc8937a1e3a632aa7b4ae
Parents: d1b4941
Author: andreaturli
Authored: Wed Apr 11 15:02:56 2018 +0200
Committer: andreaturli
Committed: Wed Apr 11 15:02:56 2018 +0200
--
.../container/location/kubernetes/KubernetesLocation.java | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d091f82a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
--
diff --git
a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
index 3a10449..5450a1b 100644
---
a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
+++
b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
@@ -133,6 +133,8 @@ import java.io.InputStream;
import java.net.InetAddress;
import java.net.URI;
import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -550,6 +552,13 @@ public class KubernetesLocation extends AbstractLocation
implements MachineProvi
if (!isTillerInstalled("kube-system", podLabels)) {
installTillerPodAndService("kube-system", "tiller-deploy",
podLabels);
}
+// Create ${HOME}/.helm/{cache/archive,repository/cache}
+try {
+
Files.createDirectories(Paths.get(System.getProperty("user.home"),".helm",
"cache", "archive"));
+
Files.createDirectories(Paths.get(System.getProperty("user.home"),".helm",
"repository", "cache"));
+} catch (IOException e) {
+throw Throwables.propagate(e);
+}
tiller = Suppliers.memoize(new
TillerSupplier((DefaultKubernetesClient) client)).get();
String chartName = entity.config().get(KubernetesHelmChart.CHART_NAME);
String chartVersion =
entity.config().get(KubernetesHelmChart.CHART_VERSION);
[3/5] brooklyn-server git commit: fix dependencies
fix dependencies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d1b4941a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d1b4941a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d1b4941a
Branch: refs/heads/master
Commit: d1b4941aba8cb98367410dc0353d78a7ebcf58ef
Parents: 02b457d
Author: andreaturli
Authored: Mon Mar 26 10:48:24 2018 +0200
Committer: andreaturli
Committed: Mon Mar 26 10:48:24 2018 +0200
--
locations/container/README.md | 30
locations/container/pom.xml | 37 +++-
.../KubernetesClientRegistryImpl.java | 3 +-
.../location/kubernetes/KubernetesLocation.java | 9 -
pom.xml | 2 +-
5 files changed, 54 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1b4941a/locations/container/README.md
--
diff --git a/locations/container/README.md b/locations/container/README.md
new file mode 100644
index 000..5c62b01
--- /dev/null
+++ b/locations/container/README.md
@@ -0,0 +1,30 @@
+
+# Kubernetes Location
+
+Brooklyn Container Location has an extensive support for Kubernetes deployments
+In particular, it supports
+
+- KubernetesResource
+- KubernetesHelmChart
+- KubernetesContainer
+
+## Kubernets Helm Chart
+
+Here's an example of an Helm based blueprint
+
+```YAML
+location:
+ kubernetes:
+endpoint: https://localhost:6443
+kubeconfig: /home/user/.kube/config
+services:
+- type: org.apache.brooklyn.container.entity.kubernetes.KubernetesHelmChart
+ name: jenkins-helm
+ chartName: jenkins
+```
+
+Notice, in this case, it is pointing at a local k8s cluster (created using
Docker on Mac) and specify a `kubeconfig`
+file for connection details.
+
+The `KubernetesHelmChart` entity will install the latest version of the
`chart` named `jenkins` from the Chart repository `stable` at
`https://kubernetes-charts.storage.googleapis.com/`
+You can install a specific version of the chart by using `chartVersion` config
key.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1b4941a/locations/container/pom.xml
--
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 56f0bf4..cc24aea 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -31,53 +31,35 @@
../../parent/pom.xml
-
-2.5.6
-
-
+
org.microbean
microbean-helm
-2.7.2.1.0.0
+2.8.2.1.0.3
-
-com.google.api.grpc
-proto-google-common-protos
-
+
com.google.errorprone
error_prone_annotations
-
-io.grpc
-grpc-context
-
-io.grpc
-grpc-context
-1.4.0
+com.squareup.okio
+okio
+1.13.0
io.fabric8
kubernetes-client
${kubernetes-client.version}
-bundle
-
-
-com.squareup.okio
-okio
-
-
io.fabric8
openshift-client
${kubernetes-client.version}
-bundle
org.apache.brooklyn
@@ -95,6 +77,13 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${brooklyn.version}
+
+
+
+com.squareup.okio
+okio
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1b4941a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java
--
diff --git
a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java
b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java
index 8ac1c64..6878ac1 100644
---
a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java
+++
b/locations/container/src/main/java/org/apache/brooklyn/container/l
[2/5] brooklyn-server git commit: fix maven dependecies
fix maven dependecies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/02b457d4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/02b457d4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/02b457d4
Branch: refs/heads/master
Commit: 02b457d41a624d3f4bae53a61a9dcc72e5424bb7
Parents: 6ddc595
Author: andreaturli
Authored: Mon Mar 12 21:11:33 2018 +0100
Committer: andreaturli
Committed: Mon Mar 12 21:11:33 2018 +0100
--
locations/container/pom.xml | 41
1 file changed, 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/02b457d4/locations/container/pom.xml
--
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index da1434b..56f0bf4 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -55,13 +55,6 @@
-
-
-
-com.google.errorprone
-error_prone_annotations
-2.0.19
-
io.grpc
grpc-context
@@ -86,28 +79,6 @@
${kubernetes-client.version}
bundle
-
-
-
-${jclouds.groupId}.api
-docker
-${jclouds.version}
-
-
-
-javax.ws.rs
-jsr311-api
-
-
-com.squareup.okio
-okio
-
-
-
-
org.apache.brooklyn
brooklyn-core
@@ -124,18 +95,6 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${brooklyn.version}
-
-
-com.squareup.okio
-okio
-
-
-
-
-
-com.squareup.okio
-okio
-1.13.0
[1/2] brooklyn-dist git commit: [DO NOT COMMIT] fix dependencies for brooklyn-all
Repository: brooklyn-dist
Updated Branches:
refs/heads/master a93a3a36c -> 3f0944c1f
[DO NOT COMMIT] fix dependencies for brooklyn-all
- depends on https://github.com/apache/brooklyn-server/pull/830
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ecc05ab6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ecc05ab6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ecc05ab6
Branch: refs/heads/master
Commit: ecc05ab66c3de82303b14e3c1ba9e8cd91e4842d
Parents: a93a3a3
Author: andreaturli
Authored: Mon Mar 26 10:49:50 2018 +0200
Committer: andreaturli
Committed: Mon Mar 26 10:49:50 2018 +0200
--
all/pom.xml | 49 -
1 file changed, 44 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ecc05ab6/all/pom.xml
--
diff --git a/all/pom.xml b/all/pom.xml
index de1166e..6679083 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -51,6 +51,13 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${project.version}
+
+
+
+com.squareup.okio
+okio
+
+
org.apache.brooklyn
@@ -127,11 +134,43 @@
${project.version}
-
-
-${jclouds.groupId}
-jclouds-allcompute
-
+
+
+
+
+
+kr.motd.maven
+os-maven-plugin
+1.5.0.Final
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+initialize
+
+true
+
+
+
+
+
+
+
+run
+
+
+
+
+
+
+
[2/2] brooklyn-dist git commit: This closes #119
This closes #119 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3f0944c1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3f0944c1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3f0944c1 Branch: refs/heads/master Commit: 3f0944c1fcdda36f445e6a2b0485e443838a212c Parents: a93a3a3 ecc05ab Author: Thomas Bouron Authored: Wed Apr 11 14:41:58 2018 +0100 Committer: Thomas Bouron Committed: Wed Apr 11 14:41:58 2018 +0100 -- all/pom.xml | 49 - 1 file changed, 44 insertions(+), 5 deletions(-) --
[1/2] brooklyn-server git commit: Revert "Fix build issue due the the addition of k8s helm"
Repository: brooklyn-server
Updated Branches:
refs/heads/master dd9259a88 -> 4236ff272
Revert "Fix build issue due the the addition of k8s helm"
This reverts commit dd9259a881445fd016f33ba5d8a67b3f370f0eff.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f6d10f17
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f6d10f17
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f6d10f17
Branch: refs/heads/master
Commit: f6d10f173637fc4189e4fd6b3c69eb6a4127362e
Parents: dd9259a
Author: Thomas Bouron
Authored: Mon Apr 16 11:35:31 2018 +0100
Committer: Thomas Bouron
Committed: Mon Apr 16 11:35:31 2018 +0100
--
karaf/features/src/main/feature/feature.xml | 1 -
locations/container/pom.xml | 2 +-
pom.xml | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/karaf/features/src/main/feature/feature.xml
--
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 92c7cec..06d8963 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -272,7 +272,6 @@
-wrap:mvn:org.microbean/microbean-helm/${microbean-helm.version}
mvn:org.apache.brooklyn/brooklyn-locations-container/${project.version}
kubernetes-client
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/locations/container/pom.xml
--
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 158fe95..cc24aea 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -36,7 +36,7 @@
org.microbean
microbean-helm
-${microbean-helm.version}
+2.8.2.1.0.3
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/pom.xml
--
diff --git a/pom.xml b/pom.xml
index aaf50d0..22aff1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,6 @@
2.1.0
1.0.7
1.7.25
-2.8.2.1.0.3
18.0
[2/2] brooklyn-server git commit: Revert "This closes #830"
Revert "This closes #830"
This reverts commit 0debf391dea1f38ea1f1c629e005df625ea13651, reversing
changes made to 12e6b0045c05c5a56b2efa078171c69669b1.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4236ff27
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4236ff27
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4236ff27
Branch: refs/heads/master
Commit: 4236ff272903a8ffe77a06d9b146aea40b3f057e
Parents: f6d10f1
Author: Thomas Bouron
Authored: Mon Apr 16 11:35:42 2018 +0100
Committer: Thomas Bouron
Committed: Mon Apr 16 11:35:42 2018 +0100
--
locations/container/README.md | 30 --
locations/container/pom.xml | 92 ++-
.../entity/kubernetes/KubernetesHelmChart.java | 37 ---
.../kubernetes/KubernetesHelmChartImpl.java | 35 ---
.../KubernetesClientRegistryImpl.java | 3 +-
.../location/kubernetes/KubernetesLocation.java | 274 +--
.../container/supplier/TillerSupplier.java | 43 ---
.../kubernetes/KubernetesLocationLiveTest.java | 2 -
.../KubernetesLocationYamlLiveTest.java | 24 --
pom.xml | 2 +-
10 files changed, 100 insertions(+), 442 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4236ff27/locations/container/README.md
--
diff --git a/locations/container/README.md b/locations/container/README.md
deleted file mode 100644
index 5c62b01..000
--- a/locations/container/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# Kubernetes Location
-
-Brooklyn Container Location has an extensive support for Kubernetes deployments
-In particular, it supports
-
-- KubernetesResource
-- KubernetesHelmChart
-- KubernetesContainer
-
-## Kubernets Helm Chart
-
-Here's an example of an Helm based blueprint
-
-```YAML
-location:
- kubernetes:
-endpoint: https://localhost:6443
-kubeconfig: /home/user/.kube/config
-services:
-- type: org.apache.brooklyn.container.entity.kubernetes.KubernetesHelmChart
- name: jenkins-helm
- chartName: jenkins
-```
-
-Notice, in this case, it is pointing at a local k8s cluster (created using
Docker on Mac) and specify a `kubeconfig`
-file for connection details.
-
-The `KubernetesHelmChart` entity will install the latest version of the
`chart` named `jenkins` from the Chart repository `stable` at
`https://kubernetes-charts.storage.googleapis.com/`
-You can install a specific version of the chart by using `chartVersion` config
key.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4236ff27/locations/container/pom.xml
--
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index cc24aea..6bd4be1 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -31,36 +31,47 @@
../../parent/pom.xml
+
+1.4.27
+
+
-
-org.microbean
-microbean-helm
-2.8.2.1.0.3
+io.fabric8
+kubernetes-client
+${kubernetes-client.version}
+bundle
-
-com.google.errorprone
-error_prone_annotations
+com.squareup.okio
+okio
-com.squareup.okio
-okio
-1.13.0
-
-
-
-io.fabric8
-kubernetes-client
-${kubernetes-client.version}
-
-
io.fabric8
openshift-client
${kubernetes-client.version}
+bundle
+
+
+
+
+${jclouds.groupId}.api
+docker
+${jclouds.version}
+
+
+
+javax.ws.rs
+jsr311-api
+
+
+
org.apache.brooklyn
brooklyn-core
@@ -77,15 +88,7 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${brooklyn.version}
-
-
-
-com.squareup.okio
-okio
-
-
-
org.slf4j
slf4j-api
@@ -149,41 +152,4 @@
test
-
-
-
-
-
-kr.motd.maven
-os-maven-plugin
-1.5.0.Final
-
-
-
-
[1/2] brooklyn-dist git commit: Revert "Fix build issue due the the addition of k8s helm"
Repository: brooklyn-dist
Updated Branches:
refs/heads/master c7a737b98 -> 67e899490
Revert "Fix build issue due the the addition of k8s helm"
This reverts commit c7a737b98993e99f4c9a367994069d0649e0d647.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/0f567137
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/0f567137
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/0f567137
Branch: refs/heads/master
Commit: 0f567137fc087ae2995cdf25522d31382254f175
Parents: c7a737b
Author: Thomas Bouron
Authored: Mon Apr 16 11:56:49 2018 +0100
Committer: Thomas Bouron
Committed: Mon Apr 16 11:56:49 2018 +0100
--
.../quickstart/src/brooklyn-sample/pom.xml | 38 +---
1 file changed, 1 insertion(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0f567137/archetypes/quickstart/src/brooklyn-sample/pom.xml
--
diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml
b/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 68fd0e1..5b48002 100644
--- a/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -130,43 +130,7 @@
${brooklyn.version}
test
-
-
-
-
-
-
-kr.motd.maven
-os-maven-plugin
-1.5.0.Final
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-initialize
-
- true
-
-
-
-
-
-
-
- run
-
-
-
-
-
-
+
[2/2] brooklyn-dist git commit: Revert "This closes #119"
Revert "This closes #119"
This reverts commit 3f0944c1fcdda36f445e6a2b0485e443838a212c, reversing
changes made to a93a3a36c982adbddf9898ed067070afc12689cd.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/67e89949
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/67e89949
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/67e89949
Branch: refs/heads/master
Commit: 67e899490e70c8321921bc355783fed68c840928
Parents: 0f56713
Author: Thomas Bouron
Authored: Mon Apr 16 11:57:03 2018 +0100
Committer: Thomas Bouron
Committed: Mon Apr 16 11:57:03 2018 +0100
--
all/pom.xml | 49 +
1 file changed, 5 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/67e89949/all/pom.xml
--
diff --git a/all/pom.xml b/all/pom.xml
index 6679083..de1166e 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -51,13 +51,6 @@
org.apache.brooklyn
brooklyn-locations-jclouds
${project.version}
-
-
-
-com.squareup.okio
-okio
-
-
org.apache.brooklyn
@@ -134,43 +127,11 @@
${project.version}
+
+
+${jclouds.groupId}
+jclouds-allcompute
+
-
-
-
-
-
-kr.motd.maven
-os-maven-plugin
-1.5.0.Final
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-initialize
-
-true
-
-
-
-
-
-
-
-run
-
-
-
-
-
-
-
[2/2] brooklyn-docs git commit: This closes #251
This closes #251 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/5fe92f62 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/5fe92f62 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/5fe92f62 Branch: refs/heads/website Commit: 5fe92f62930417fbbde6d30ac7bc39bc296e22dc Parents: a8d735c aace9bf Author: Thomas Bouron Authored: Tue Apr 17 17:06:48 2018 +0100 Committer: Thomas Bouron Committed: Tue Apr 17 17:06:48 2018 +0100 -- _includes/apache-promo.html | 3 +++ community/gsoc.md | 17 + index.md| 2 ++ 3 files changed, 10 insertions(+), 12 deletions(-) --
[1/2] brooklyn-docs git commit: Add ApacheCon logo button to landing page
Repository: brooklyn-docs
Updated Branches:
refs/heads/website b8bbce907 -> 5fe92f629
Add ApacheCon logo button to landing page
As requested by Rich Bowen:
On Mon, 9 Apr 2018 at 14:07 Rich Bowen wrote:
Dear PMCs,
ApacheCon is our official community event, and is coming up in
September, in Montreal. We need your help getting the word out to your
user communities. (Details at http://apachecon.com/ )
We've made this as easy as possible - it's just a cut-and-paste
snippet that we ask you to add to your site to display the logo of the
nearest future event. That process is documented here:
http://apache.org/events/README.txt You can see it in action on, for
example, http://httpd.apache.org/
If you follow these steps, it will automatically update for the next
event, and the one after that. We have two other events planned for
this year, and are already working on 5 events for 2019.
Note: If you don't like the available image sizes, please pitch in and
help us define better sizes/dimensions. Patches welcome. We also have
these banners - http://apachecon.com/acna18/banners/ - which can be
used instead, and can also be used for other, non-ASF sites.
This is also a good time to remind you that we have general site
requirements. These are outlined at
https://www.apache.org/foundation/marks/pmcs#navigation and you can
check your project's compliance at https://whimsy.apache.org/site/
Thanks, and don't hesitate to get in touch if you have any questions,
comments, or concerns.
Rich Bowen, VP, Events
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/aace9bf9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/aace9bf9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/aace9bf9
Branch: refs/heads/website
Commit: aace9bf9bfdf726f315e70deaa0ceab2d1025618
Parents: b8bbce9
Author: Geoff Macartney
Authored: Wed Apr 11 21:57:33 2018 +0100
Committer: Geoff Macartney
Committed: Wed Apr 11 21:57:33 2018 +0100
--
_includes/apache-promo.html | 3 +++
index.md| 2 ++
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/aace9bf9/_includes/apache-promo.html
--
diff --git a/_includes/apache-promo.html b/_includes/apache-promo.html
new file mode 100644
index 000..976e343
--- /dev/null
+++ b/_includes/apache-promo.html
@@ -0,0 +1,3 @@
+https://www.apache.org/events/current-event.html";>
+https://www.apache.org/events/current-event-234x60.png"/>
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/aace9bf9/index.md
--
diff --git a/index.md b/index.md
index 2e4914e..f2d4eea 100644
--- a/index.md
+++ b/index.md
@@ -71,6 +71,8 @@ children:
---
+{% include apache-promo.html %}
+
# apache brooklyn
[1/3] brooklyn-server git commit: SshCommandSensor: no anonymous inner classes
Repository: brooklyn-server
Updated Branches:
refs/heads/master cd40893d1 -> 7e2b497cb
SshCommandSensor: no anonymous inner classes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d4901150
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d4901150
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d4901150
Branch: refs/heads/master
Commit: d490115023b6c53d3a79b72f8ec190f14e5eb949
Parents: 3afc8fe
Author: Aled Sage
Authored: Thu Apr 26 20:57:33 2018 +0100
Committer: Aled Sage
Committed: Fri Apr 27 10:09:31 2018 +0100
--
.../SshCommandSensorYamlRebindTest.java | 89 +
.../core/sensor/ssh/SshCommandSensor.java | 124 +++
.../brooklyn/util/core/flags/TypeCoercions.java | 15 ++-
.../core/mgmt/rebind/RebindTestFixture.java | 33 -
.../apache/brooklyn/util/guava/Functionals.java | 21 +++-
.../brooklyn/util/text/StringFunctions.java | 12 ++
6 files changed, 263 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4901150/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SshCommandSensorYamlRebindTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SshCommandSensorYamlRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SshCommandSensorYamlRebindTest.java
new file mode 100644
index 000..0c0730e
--- /dev/null
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SshCommandSensorYamlRebindTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.camp.brooklyn;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData;
+import org.apache.brooklyn.core.entity.EntityAsserts;
+import org.apache.brooklyn.core.entity.EntityInternal;
+import org.apache.brooklyn.core.entity.StartableApplication;
+import org.apache.brooklyn.core.sensor.Sensors;
+import org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess;
+import org.apache.brooklyn.feed.ssh.SshFeed;
+import org.apache.brooklyn.test.Asserts;
+import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool;
+import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool.ExecCmd;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterables;
+
+@Test
+public class SshCommandSensorYamlRebindTest extends AbstractYamlRebindTest {
+
+ @Test
+ public void testSshCommandSensorWithEffectorInEnv() throws Exception {
+ RecordingSshTool.setCustomResponse(".*myCommand.*", new
RecordingSshTool.CustomResponse(0, "myResponse", null));
+
+ createStartWaitAndLogApplication(
+ "location:",
+ " localhost:",
+ "sshToolClass: "+RecordingSshTool.class.getName(),
+ "services:",
+ "- type: " + VanillaSoftwareProcess.class.getName(),
+ " brooklyn.config:",
+ "onbox.base.dir.skipResolution: true",
+ " brooklyn.initializers:",
+ " - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor",
+ "brooklyn.config:",
+ " name: mySensor",
+ " command: myCommand",
+ " executionDir: '/path/to/myexecutiondir'",
+ " shell.env:",
+ "MY_ENV: myEnvVal",
+ " period: 10ms",
+ " onlyIfServiceUp: false");
+
+ StartableApplication newApp = rebind();
+ VanillaSoftwareProcess newEntity = (VanillaSoftwareProcess)
Iterables.getOnlyElement(newApp.getChildren());
+ SshFeed newFeed = (SshFeed)
Iterables.find(((EntityInternal)newEntity).feeds().getFeeds(),
Predicates.i
[3/3] brooklyn-server git commit: This closes #959
This closes #959 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7e2b497c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7e2b497c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7e2b497c Branch: refs/heads/master Commit: 7e2b497cbf82ca143fd2276f44aca256fc92ee3b Parents: cd40893 d490115 Author: Thomas Bouron Authored: Fri Apr 27 16:43:31 2018 +0100 Committer: Thomas Bouron Committed: Fri Apr 27 16:43:31 2018 +0100 -- .../SshCommandSensorYamlRebindTest.java | 89 +++ .../core/sensor/ssh/SshCommandSensor.java | 134 + .../brooklyn/util/core/flags/TypeCoercions.java | 15 +- .../RebindHistoricSshCommandSensorTest.java | 96 .../core/mgmt/rebind/RebindTestFixture.java | 33 +++- .../rebind/ssh-command-sensor-entity-dnlz7hpbdg | 150 +++ .../rebind/ssh-command-sensor-feed-a9ekg3cnu0 | 143 ++ .../apache/brooklyn/util/guava/Functionals.java | 21 ++- .../brooklyn/util/text/StringFunctions.java | 12 ++ 9 files changed, 661 insertions(+), 32 deletions(-) --
[2/3] brooklyn-server git commit: Fix SshCommandSensor rebind
Fix SshCommandSensor rebind
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3afc8fe3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3afc8fe3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3afc8fe3
Branch: refs/heads/master
Commit: 3afc8fe386dc1f6f4149143a7b205c96185a770e
Parents: cd40893
Author: Aled Sage
Authored: Thu Apr 26 19:36:30 2018 +0100
Committer: Aled Sage
Committed: Fri Apr 27 10:09:31 2018 +0100
--
.../core/sensor/ssh/SshCommandSensor.java | 10 +-
.../RebindHistoricSshCommandSensorTest.java | 96
.../rebind/ssh-command-sensor-entity-dnlz7hpbdg | 150 +++
.../rebind/ssh-command-sensor-feed-a9ekg3cnu0 | 143 ++
4 files changed, 398 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3afc8fe3/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
b/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
index 5ec9d22..b03b54f 100644
---
a/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
+++
b/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
@@ -74,7 +74,15 @@ public final class SshCommandSensor extends
AbstractAddSensorFeed {
"Value to be used if an error occurs whilst executing the ssh
command", null);
public static final MapConfigKey SENSOR_SHELL_ENVIRONMENT =
BrooklynConfigKeys.SHELL_ENVIRONMENT;
-
+// Fields are kept for deserialization purposes; however will rely on the
values being
+// re-computed from the config map, rather than being restored from
persistence.
+@SuppressWarnings("unused")
+private String command;
+@SuppressWarnings("unused")
+private String executionDir;
+@SuppressWarnings("unused")
+private Map sensorEnv;
+
public SshCommandSensor(final ConfigBag params) {
super(params);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3afc8fe3/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
new file mode 100644
index 000..f463d9e
--- /dev/null
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.mgmt.rebind;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.objs.BrooklynObjectType;
+import org.apache.brooklyn.core.entity.EntityInternal;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.test.Asserts;
+import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool;
+import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool.ExecCmd;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableList;
+
+public class RebindHistoricSshCommandSensorTest extends
AbstractRebindHistoricTest {
+
+private static final String BLACKHOLE_IP = "240.0.0.1";
+
+@Override
+@BeforeMethod(alwaysRun=true)
+public void setUp() throws Exception {
+super.setUp();
+}
+
+/**
+ * The persisted state was generated when SshCommandSensor used fields for
'command' etc, populating
+ * them during init. Now it populates them lazily (thus handling deferred
config supplier
[2/2] brooklyn-server git commit: This closes #960
This closes #960 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4ba79791 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4ba79791 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4ba79791 Branch: refs/heads/master Commit: 4ba79791b54fd70eca2b8befc43e14340457430d Parents: 60a7b91 27ca1cc Author: Thomas Bouron Authored: Thu May 3 16:51:00 2018 +0100 Committer: Thomas Bouron Committed: Thu May 3 16:51:00 2018 +0100 -- .../mgmt/rebind/RebindHistoricSshCommandSensorTest.java | 11 +++ .../group/SshCommandMembershipTrackingPolicyTest.java| 1 + 2 files changed, 12 insertions(+) --
[1/2] brooklyn-server git commit: Add RecordingSshTool clears to selected tests
Repository: brooklyn-server
Updated Branches:
refs/heads/master 60a7b9128 -> 4ba79791b
Add RecordingSshTool clears to selected tests
Noticed test output from SCMTPT failing with
the tool output referring to the commands from RHSCST in a
brooklyn-server build failure.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/27ca1cce
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/27ca1cce
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/27ca1cce
Branch: refs/heads/master
Commit: 27ca1ccec0578d4dd71560acfec70a3c58b82d99
Parents: 7e2b497
Author: Geoff Macartney
Authored: Mon Apr 30 11:45:35 2018 +0100
Committer: Geoff Macartney
Committed: Mon Apr 30 11:45:35 2018 +0100
--
.../mgmt/rebind/RebindHistoricSshCommandSensorTest.java | 11 +++
.../group/SshCommandMembershipTrackingPolicyTest.java| 1 +
2 files changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/27ca1cce/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
index f463d9e..9c92326 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindHistoricSshCommandSensorTest.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool;
import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool.ExecCmd;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -41,8 +42,18 @@ public class RebindHistoricSshCommandSensorTest extends
AbstractRebindHistoricTe
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
super.setUp();
+RecordingSshTool.clear();
}
+@AfterMethod(alwaysRun=true)
+@Override
+public void tearDown() throws Exception {
+try {
+super.tearDown();
+} finally {
+RecordingSshTool.clear();
+}
+}
/**
* The persisted state was generated when SshCommandSensor used fields for
'command' etc, populating
* them during init. Now it populates them lazily (thus handling deferred
config suppliers).
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/27ca1cce/core/src/test/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicyTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicyTest.java
b/core/src/test/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicyTest.java
index 9b444e3..e81da20 100644
---
a/core/src/test/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicyTest.java
+++
b/core/src/test/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicyTest.java
@@ -56,6 +56,7 @@ public class SshCommandMembershipTrackingPolicyTest extends
BrooklynAppUnitTestS
@Override
public void setUp() throws Exception {
super.setUp();
+RecordingSshTool.clear();
machine = LocationSpec.create(SshMachineLocation.class)
.configure("address", "1.2.3.4")
[1/2] brooklyn-docs git commit: Document Azure ad app password reset
Repository: brooklyn-docs Updated Branches: refs/heads/master 1a9220250 -> f9fb8284d Document Azure ad app password reset Provides the command used to change the Azure active directory application password used for API access Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/842b04ca Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/842b04ca Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/842b04ca Branch: refs/heads/master Commit: 842b04ca8e1a56c355218c4ec5888eb4be098676 Parents: 1a92202 Author: Martin Harris Authored: Wed May 23 12:23:44 2018 +0100 Committer: Martin Harris Committed: Wed May 23 12:23:44 2018 +0100 -- guide/locations/_azure-ARM.md | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/842b04ca/guide/locations/_azure-ARM.md -- diff --git a/guide/locations/_azure-ARM.md b/guide/locations/_azure-ARM.md index 7e97842..739e5e4 100644 --- a/guide/locations/_azure-ARM.md +++ b/guide/locations/_azure-ARM.md @@ -75,6 +75,10 @@ We can now verify this information that this information can be used to log in t az login --service-principal -u --password abcd --tenant +Should you need to change the password, you can use the following command: + +az ad app update --id --password MyNewPassword + Azure CLI 1.0 Firstly, install and configure Azure CLI following [these steps](https://docs.microsoft.com/en-us/azure/cli-install-nodejs).
[2/2] brooklyn-docs git commit: This closes #253
This closes #253 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/f9fb8284 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/f9fb8284 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/f9fb8284 Branch: refs/heads/master Commit: f9fb8284d92882230b9cfa8caac346aef96531ae Parents: 1a92202 842b04c Author: Thomas Bouron Authored: Wed May 23 13:52:18 2018 +0100 Committer: Thomas Bouron Committed: Wed May 23 13:52:18 2018 +0100 -- guide/locations/_azure-ARM.md | 4 1 file changed, 4 insertions(+) --
[2/2] brooklyn-server git commit: This closes #965
This closes #965 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/36cb70d2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/36cb70d2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/36cb70d2 Branch: refs/heads/master Commit: 36cb70d2d71e58d8e21396c1ad9220a01af5f8ee Parents: 59a0b91 233f3e6 Author: Thomas Bouron Authored: Thu May 24 17:15:55 2018 +0100 Committer: Thomas Bouron Committed: Thu May 24 17:15:55 2018 +0100 -- karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] brooklyn-server git commit: HA mode defaults to AUTO
Repository: brooklyn-server Updated Branches: refs/heads/master 59a0b9112 -> 36cb70d2d HA mode defaults to AUTO Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/233f3e69 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/233f3e69 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/233f3e69 Branch: refs/heads/master Commit: 233f3e69567bb57e2f44a8e40e7893bbcf156527 Parents: 59a0b91 Author: Aled Sage Authored: Thu May 24 16:35:29 2018 +0100 Committer: Aled Sage Committed: Thu May 24 16:35:29 2018 +0100 -- karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/233f3e69/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml -- diff --git a/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml index b4de9a0..76dce83 100644 --- a/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -37,7 +37,7 @@ limitations under the License. - +
[5/5] brooklyn-server git commit: This closes #964
This closes #964 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6f093c71 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6f093c71 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6f093c71 Branch: refs/heads/master Commit: 6f093c71f9d43c9832e5ecabd4ee0639a348422f Parents: 36cb70d 49ee11d Author: Thomas Bouron Authored: Fri Jun 1 10:59:33 2018 +0100 Committer: Thomas Bouron Committed: Fri Jun 1 10:59:33 2018 +0100 -- .../CatalogOsgiVersionMoreEntityRebindTest.java | 5 +- .../brooklyn/catalog/CatalogYamlRebindTest.java | 43 - .../core/BrooklynFeatureEnablement.java | 12 + .../mgmt/internal/EntityChangeListener.java | 1 + .../rebind/PeriodicDeltaChangeListener.java | 51 +--- .../core/mgmt/rebind/RebindFailuresTest.java| 6 +-- .../rebind/RebindLocalhostLocationTest.java | 10 ++-- .../RebindManagerExceptionHandlerTest.java | 7 ++- .../core/mgmt/rebind/RebindOptions.java | 6 ++- 9 files changed, 119 insertions(+), 22 deletions(-) --
[4/5] brooklyn-server git commit: PR #964: Incorporate review comments
PR #964: Incorporate review comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/49ee11d6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/49ee11d6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/49ee11d6
Branch: refs/heads/master
Commit: 49ee11d6c90620cf935330249b1c6d5ea9351d27
Parents: 492ebd5
Author: Aled Sage
Authored: Tue May 29 20:30:09 2018 +0100
Committer: Aled Sage
Committed: Tue May 29 20:30:09 2018 +0100
--
.../core/BrooklynFeatureEnablement.java | 4 ++--
.../rebind/PeriodicDeltaChangeListener.java | 24 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49ee11d6/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 8c142d8..2ff62d3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -68,7 +68,7 @@ public class BrooklynFeatureEnablement {
* still be persisted. For example, they could change 'state' without
telling the listener, and hope
* that the entity they were attached to would soon persist (thus
piggy-backing off it).
*/
-public static final String FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY
= FEATURE_PROPERTY_PREFIX+".referencedObjectsPersistence";
+public static final String
FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY =
FEATURE_PROPERTY_PREFIX+".referencedObjectsRepersistence";
/** whether feeds are automatically registered when set on entities, so
that they are persisted */
public static final String FEATURE_FEED_REGISTRATION_PROPERTY =
FEATURE_PROPERTY_PREFIX+".feedRegistration";
@@ -161,7 +161,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_FEED_REGISTRATION_PROPERTY, false);
setDefault(FEATURE_BUNDLE_PERSISTENCE_PROPERTY, true);
setDefault(FEATURE_CATALOG_PERSISTENCE_PROPERTY, true);
-setDefault(FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY, false);
+setDefault(FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY, false);
setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
setDefault(FEATURE_PERSIST_ENTITY_SPEC_AS_SUPPLIER, true);
setDefault(FEATURE_RENAME_THREADS, false);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49ee11d6/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
index 349f47f..56da64d 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
@@ -195,7 +195,7 @@ public class PeriodicDeltaChangeListener implements
ChangeListener {
private final boolean persistPoliciesEnabled;
private final boolean persistEnrichersEnabled;
private final boolean persistFeedsEnabled;
-private final boolean persistReferencedObjectsEnabled;
+private final boolean rePersistReferencedObjectsEnabled;
private final Semaphore persistingMutex = new Semaphore(1);
private final Object startStopMutex = new Object();
@@ -223,7 +223,7 @@ public class PeriodicDeltaChangeListener implements
ChangeListener {
this.persistPoliciesEnabled =
BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_POLICY_PERSISTENCE_PROPERTY);
this.persistEnrichersEnabled =
BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_ENRICHER_PERSISTENCE_PROPERTY);
this.persistFeedsEnabled =
BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_FEED_PERSISTENCE_PROPERTY);
-this.persistReferencedObjectsEnabled =
BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY);
+this.rePersistReferencedObjectsEnabled =
BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY);
}
public void start() {
@@ -450,16 +450,16 @@ public class PeriodicDeltaChangeListener implements
ChangeListener {
limitedCountString(prevDeltaCol
[1/5] brooklyn-server git commit: Persisting entity: donβt persist its adjuncts every time
Repository: brooklyn-server
Updated Branches:
refs/heads/master 36cb70d2d -> 6f093c71f
Persisting entity: donΓ’ΒΒt persist its adjuncts every time
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/492ebd58
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/492ebd58
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/492ebd58
Branch: refs/heads/master
Commit: 492ebd58552b8f691ee22e0dd76e535fea56ef2c
Parents: ff38a5c
Author: Aled Sage
Authored: Wed May 23 10:47:24 2018 +0100
Committer: Aled Sage
Committed: Thu May 24 12:24:13 2018 +0100
--
.../core/BrooklynFeatureEnablement.java | 12 ++
.../mgmt/internal/EntityChangeListener.java | 1 +
.../rebind/PeriodicDeltaChangeListener.java | 39 +++-
3 files changed, 51 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/492ebd58/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 939a15d..8c142d8 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -59,6 +59,17 @@ public class BrooklynFeatureEnablement {
public static final String FEATURE_FEED_PERSISTENCE_PROPERTY =
FEATURE_PROPERTY_PREFIX+".feedPersistence";
+/**
+ * When persisting an entity that changes, whether to persist its adjuncts
and locations
+ * (i.e. its enrichers, policies, feeds and locations).
+ *
+ * This was previously the default behaviour, which meant that (legacy)
java-based Brooklyn objects
+ * (e.g. entities, locations, policies, enrichers or feeds) could get away
with bad practices and
+ * still be persisted. For example, they could change 'state' without
telling the listener, and hope
+ * that the entity they were attached to would soon persist (thus
piggy-backing off it).
+ */
+public static final String FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY
= FEATURE_PROPERTY_PREFIX+".referencedObjectsPersistence";
+
/** whether feeds are automatically registered when set on entities, so
that they are persisted */
public static final String FEATURE_FEED_REGISTRATION_PROPERTY =
FEATURE_PROPERTY_PREFIX+".feedRegistration";
@@ -150,6 +161,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_FEED_REGISTRATION_PROPERTY, false);
setDefault(FEATURE_BUNDLE_PERSISTENCE_PROPERTY, true);
setDefault(FEATURE_CATALOG_PERSISTENCE_PROPERTY, true);
+setDefault(FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY, false);
setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
setDefault(FEATURE_PERSIST_ENTITY_SPEC_AS_SUPPLIER, true);
setDefault(FEATURE_RENAME_THREADS, false);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/492ebd58/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
index b7f53a4..a0f5d73 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
@@ -29,6 +29,7 @@ public interface EntityChangeListener {
// TODO for testing only!
public static final EntityChangeListener NOOP = new EntityChangeListener()
{
+@Override public String toString() { return
"EntityChangeListener.NOOP"; }
@Override public void onChanged() {}
@Override public void onAttributeChanged(AttributeSensor attribute)
{}
@Override public void onConfigChanged(ConfigKey key) {}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/492ebd58/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
index e4b2d7d..349f47f 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChan
[2/5] brooklyn-server git commit: Fix integration test in RebindLocalhostLocationTest
Fix integration test in RebindLocalhostLocationTest
(See the existing TODO in the code)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ff38a5c8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ff38a5c8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ff38a5c8
Branch: refs/heads/master
Commit: ff38a5c80c0d77b81316623d749b76bf3dd1a78e
Parents: 9539ccf
Author: Aled Sage
Authored: Wed May 23 10:46:21 2018 +0100
Committer: Aled Sage
Committed: Thu May 24 12:24:13 2018 +0100
--
.../core/mgmt/rebind/RebindLocalhostLocationTest.java | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ff38a5c8/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
index 381ec48..5bc6cc2 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
@@ -29,7 +29,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoManifest;
-import org.apache.brooklyn.core.test.entity.TestApplication;
import
org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
import org.apache.brooklyn.location.ssh.SshMachineLocation;
@@ -87,19 +86,18 @@ public class RebindLocalhostLocationTest extends
RebindTestFixtureWithApp {
testMachineUsableAfterRebind();
newApp.stop();
-switchOriginalToNewManagementContext();
-
// TODO how should we automatically unmanage these?
// (in this test, locations are created manually, so probably should
be destroyed manually,
// but in most cases we should probably unmanage the location as part
of the entity;
// could keep the entity ID only in the location, then safely
reverse-check usages?)
// see related non-integration test in RebindEntityTest
-origManagementContext.getLocationManager().unmanage(origLoc);
+newManagementContext.getLocationManager().unmanage(origLoc);
-RebindTestUtils.waitForPersisted(origManagementContext);
+RebindTestUtils.waitForPersisted(newManagementContext);
+
+switchOriginalToNewManagementContext();
BrooklynMementoManifest mf = loadMementoManifest();
Assert.assertTrue(mf.getLocationIdToType().isEmpty(), "Expected no
locations; had "+mf.getLocationIdToType());
}
-
}
[3/5] brooklyn-server git commit: Rebind tests: stricter (e.g. no dangling-references)
Rebind tests: stricter (e.g. no dangling-references)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9539ccf6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9539ccf6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9539ccf6
Branch: refs/heads/master
Commit: 9539ccf65fecf5abd944b371ee36fb5a265484e7
Parents: dedaffd
Author: Aled Sage
Authored: Wed May 23 10:45:33 2018 +0100
Committer: Aled Sage
Committed: Thu May 24 12:24:13 2018 +0100
--
.../CatalogOsgiVersionMoreEntityRebindTest.java | 5 ++-
.../brooklyn/catalog/CatalogYamlRebindTest.java | 43 +++-
.../core/mgmt/rebind/RebindFailuresTest.java| 6 +--
.../RebindManagerExceptionHandlerTest.java | 7 +++-
.../core/mgmt/rebind/RebindOptions.java | 6 ++-
5 files changed, 58 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9539ccf6/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
index 835609d..61245df 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
@@ -40,6 +40,7 @@ import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.core.mgmt.ha.OsgiBundleInstallationResult;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.core.mgmt.osgi.OsgiVersionMoreEntityTest;
+import org.apache.brooklyn.core.mgmt.rebind.RebindOptions;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.entity.group.DynamicCluster;
import org.apache.brooklyn.entity.stock.BasicApplication;
@@ -270,7 +271,9 @@ public class CatalogOsgiVersionMoreEntityRebindTest extends
AbstractYamlRebindTe
}
try {
-StartableApplication app2 = rebind();
+// Expect dangling reference(s) to catalog item from uninstalled
bundle
+RebindOptions rebindOptionsWithDefaultExceptionHandler =
RebindOptions.create().exceptionHandler(null);
+StartableApplication app2 =
rebind(rebindOptionsWithDefaultExceptionHandler);
Asserts.shouldHaveFailedPreviously("Expected deployment to fail
rebind; instead got "+app2);
} catch (Exception e) {
// should fail to rebind this entity
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9539ccf6/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
index 66e5663..7fec600 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
@@ -31,6 +31,7 @@ import java.util.List;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.mgmt.rebind.RebindManager.RebindFailureMode;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData;
import org.apache.brooklyn.api.objs.BrooklynObjectType;
@@ -46,6 +47,7 @@ import
org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectSto
import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore;
import
org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore.StoreObjectAccessor;
import org.apache.brooklyn.core.mgmt.rebind.RebindExceptionHandlerImpl;
+import org.apache.brooklyn.core.mgmt.rebind.RebindManagerImpl;
import org.apache.brooklyn.core.mgmt.rebind.RebindOptions;
import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer;
import org.apache.brooklyn.core.test.policy.TestEnricher;
@@ -53,6 +55,7 @@ import org.apache.brooklyn.core.test.policy.TestPolicy;
import org.apache.brooklyn.entity.stock.BasicEntity;
import org.apache.brooklyn.test.Asserts;
import org.apache.b
[4/4] brooklyn-docs git commit: This closes #256
This closes #256 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/9bf6a18b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/9bf6a18b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/9bf6a18b Branch: refs/heads/master Commit: 9bf6a18bca84003e634043024b2961379c301f99 Parents: e066c9c 4219028 Author: Thomas Bouron Authored: Tue Jun 5 09:20:38 2018 +0100 Committer: Thomas Bouron Committed: Tue Jun 5 09:20:38 2018 +0100 -- guide/ops/troubleshooting/connectivity.md| 4 ++-- guide/ops/troubleshooting/deployment.md | 24 +++ guide/ops/troubleshooting/softwareprocess.md | 5 +++-- 3 files changed, 29 insertions(+), 4 deletions(-) --
[3/4] brooklyn-docs git commit: PR #256: incorporate review comments
PR #256: incorporate review comments Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/42190285 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/42190285 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/42190285 Branch: refs/heads/master Commit: 4219028575474d5fc43b6f28e4b1ed5d0e3adfe9 Parents: 093f483 Author: Aled Sage Authored: Mon Jun 4 21:57:03 2018 +0100 Committer: Aled Sage Committed: Mon Jun 4 21:57:03 2018 +0100 -- guide/ops/troubleshooting/connectivity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/42190285/guide/ops/troubleshooting/connectivity.md -- diff --git a/guide/ops/troubleshooting/connectivity.md b/guide/ops/troubleshooting/connectivity.md index 7b0daf4..82917c2 100644 --- a/guide/ops/troubleshooting/connectivity.md +++ b/guide/ops/troubleshooting/connectivity.md @@ -105,7 +105,7 @@ example, execute `sudo iptables -n --list` and `iptables -t nat -n --list`. Some clouds offer a firewall service, where ports need to be explicitly listed to be reachable. For example, -[security groups for EC2-classic](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) +[security groups for AWS EC2](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) have rules for the protocols and ports to be reachable from specific CIDRs. Check these settings via the cloud provider's web-console (or API).
[1/4] brooklyn-docs git commit: Fix/improve links
Repository: brooklyn-docs
Updated Branches:
refs/heads/master e066c9cbd -> 9bf6a18bc
Fix/improve links
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/55055c33
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/55055c33
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/55055c33
Branch: refs/heads/master
Commit: 55055c33235b1ece629afb7e4d40fbd60a1e06b7
Parents: e066c9c
Author: Aled Sage
Authored: Mon Jun 4 09:52:40 2018 +0100
Committer: Aled Sage
Committed: Mon Jun 4 09:52:40 2018 +0100
--
guide/ops/troubleshooting/connectivity.md| 4 ++--
guide/ops/troubleshooting/softwareprocess.md | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/55055c33/guide/ops/troubleshooting/connectivity.md
--
diff --git a/guide/ops/troubleshooting/connectivity.md
b/guide/ops/troubleshooting/connectivity.md
index 6da18ec..7b0daf4 100644
--- a/guide/ops/troubleshooting/connectivity.md
+++ b/guide/ops/troubleshooting/connectivity.md
@@ -104,8 +104,8 @@ example, execute `sudo iptables -n --list` and `iptables -t
nat -n --list`.
## Cloud firewalls
Some clouds offer a firewall service, where ports need to be explicitly listed
to be reachable.
-For example, [security groups for EC2-classic]
-(http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html#ec2-classic-security-groups)
+For example,
+[security groups for
EC2-classic](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html)
have rules for the protocols and ports to be reachable from specific CIDRs.
Check these settings via the cloud provider's web-console (or API).
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/55055c33/guide/ops/troubleshooting/softwareprocess.md
--
diff --git a/guide/ops/troubleshooting/softwareprocess.md
b/guide/ops/troubleshooting/softwareprocess.md
index 976444b..0e93a70 100644
--- a/guide/ops/troubleshooting/softwareprocess.md
+++ b/guide/ops/troubleshooting/softwareprocess.md
@@ -40,8 +40,9 @@ in the run directory (such as console output).
It is worth checking that the process is running, e.g. using `ps aux` to look
for the desired process.
Some entities also write the pid of the process to `pid.txt` in the run
directory.
-It is also worth checking if the required port is accessible. This is
discussed in the guide
-"Troubleshooting Server Connectivity Issues in the Cloud", including listing
the ports in use:
+It is also worth checking if the required port is accessible. This is
discussed in the troubleshooting guide
+[Server Connectivity]({{book.path.docs}}/ops/troubleshooting/connectivity.md),
+including listing the ports in use:
execute `netstat -antp` (or on OS X `netstat -antp TCP`) to list the TCP ports
in use (or use
`-anup` for UDP).
[2/4] brooklyn-docs git commit: BROOKLYN-588: add to troubleshooting for curl failure
BROOKLYN-588: add to troubleshooting for curl failure See https://issues.apache.org/jira/browse/BROOKLYN-588 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/093f483c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/093f483c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/093f483c Branch: refs/heads/master Commit: 093f483c133b856369afc2f7a7a2cdd9b1a74e4f Parents: 55055c3 Author: Aled Sage Authored: Mon Jun 4 09:54:11 2018 +0100 Committer: Aled Sage Committed: Mon Jun 4 09:54:11 2018 +0100 -- guide/ops/troubleshooting/deployment.md | 24 1 file changed, 24 insertions(+) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/093f483c/guide/ops/troubleshooting/deployment.md -- diff --git a/guide/ops/troubleshooting/deployment.md b/guide/ops/troubleshooting/deployment.md index 75bd140..38121e2 100644 --- a/guide/ops/troubleshooting/deployment.md +++ b/guide/ops/troubleshooting/deployment.md @@ -189,3 +189,27 @@ traffic filtering such as child-safe type filtering: To resolve this try disabling traffic filtering and setting your DNS to a public server such as 8.8.8.8 to use google [DNS](https://www.wikiwand.com/en/Google_Public_DNS). [See here](https://developers.google.com/speed/public-dns/docs/using) for details on how to configure this. + + +## Download with Curl Fails on CentOS 7.0 due to TLS Negotiation + +When downloading an install artifact with Curl, using CentOS 7.0, one can get the failure shown below: + +curl: (35) Peer reports incompatible or unsupported protocol version. + +This can be caused by incompatible TLS negotiation with the web server (e.g. with github). For more details, see +[Red Hat bug 1170339, "use the default min/max TLS version provided by NSS [RHEL-7]"](https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=1170339). + +To confirm this is the issue, try running the failing curl command on the same machine with `curl -v` for verbose output. +You should see a more detailed error such as: + +NSS error -12286 (SSL_ERROR_NO_CYPHER_OVERLAP) +Cannot communicate securely with peer: no common encryption algorithm(s). +Closing connection 1 + +Possible workarounds include: + +1. Use a more recent version of CentOS. On AWS, a good choice is the most recent centos.org image from the +[AWS marketplace](https://aws.amazon.com/marketplace/pp/B00O7WM7QW). However, this involves first subscribing to it in the marketplace. The Amazon Linux AMI is another good choice, but this is not a normal CentOS image so it depends what distro(s) the entity was developed/tested against. + +2. Change your blueprint to first do `sudo yum update -y curl nss`, before the curl command is executed.
[2/2] brooklyn git commit: This closes #17
This closes #17 Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/1e39ed81 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/1e39ed81 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/1e39ed81 Branch: refs/heads/master Commit: 1e39ed81db662771ee045217d1dfb310378f Parents: 655cedb 6f9d19a Author: Thomas Bouron Authored: Fri Jul 27 11:01:08 2018 +0100 Committer: Thomas Bouron Committed: Fri Jul 27 11:01:08 2018 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] brooklyn git commit: switch order of build, so server before ui
Repository: brooklyn Updated Branches: refs/heads/master 655cedbca -> 1e39ed81d switch order of build, so server before ui needed because ui modularity server depends on brooklyn server java; fortunately ui is no longer needed for brooklyn server so this is safe. Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/6f9d19ae Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/6f9d19ae Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/6f9d19ae Branch: refs/heads/master Commit: 6f9d19aed4f0d7bd7c4271fd3cbd25427852f8c2 Parents: 9b36dfa Author: Alex Heneveld Authored: Fri Jul 27 10:58:03 2018 +0100 Committer: Alex Heneveld Committed: Fri Jul 27 10:58:03 2018 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn/blob/6f9d19ae/pom.xml -- diff --git a/pom.xml b/pom.xml index 4147b1d..49123c8 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,8 @@ -brooklyn-ui brooklyn-server +brooklyn-ui brooklyn-library
[3/4] brooklyn-ui git commit: Detect delete/backspace key in blueprint-composer
Detect delete/backspace key in blueprint-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/68ed4d93
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/68ed4d93
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/68ed4d93
Branch: refs/heads/master
Commit: 68ed4d93e32b24f1e79640dab6931bec579221fe
Parents: 44eccff
Author: Paul Campbell
Authored: Mon Aug 27 13:04:18 2018 +0100
Committer: Paul Campbell
Committed: Mon Aug 27 15:31:25 2018 +0100
--
.../app/components/util/d3-blueprint.js | 31
1 file changed, 31 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/68ed4d93/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
--
diff --git a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
index da3e090..4d5ff2d 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -314,6 +314,34 @@ export function D3Blueprint(container) {
}
/**
+ * Triggered when a key is release on the page.
+ *
+ * * Ignores where key press did not originate from the page body (i.e.
ignores input to text fields)
+ * * Fires a custom event "delete-entity" when the delete key is pressed.
+ */
+function onKeyUp() {
+d3.event.stopPropagation();
+if (d3.event.target.nodeName == 'BODY') {
+if (d3.event.key === "Delete" || d3.event.key === "Backspace") {
+console.log('-- DELETE/BACKSPACE key outside of text field
--');
+// the selected entity:
+var selected = _svg.selectAll('.entity.selected');
+var nItemsSelected = selected._groups[0].length;
+if (nItemsSelected > 0) {
+console.log('Dispatch event to remove node(s)');
+// entity = ...
+// let event = new CustomEvent("delete-entity", {
+// detail: {
+// entity: entity,
+// }
+// });
+// container.dispatchEvent(event);
+}
+}
+}
+}
+
+/**
* Handles the start of a drag operation. Note that this callback is to be
used with the internal D3 drag feature.
*
* @param node The node for the dragged entity
@@ -1011,6 +1039,9 @@ export function D3Blueprint(container) {
_dropZoneGroup.selectAll('.dropzone').classed('hidden', false);
}
+// register global key events
+d3.select('body').on('keyup.body', onKeyUp);
+
return {
draw: draw,
update: update,
[2/4] brooklyn-ui git commit: Remove Entity from graph when delete/backspace pressed
Remove Entity from graph when delete/backspace pressed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/aee74eff
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/aee74eff
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/aee74eff
Branch: refs/heads/master
Commit: aee74effbc79c203253c2a9cec464d7e65d98811
Parents: 68ed4d9
Author: Paul Campbell
Authored: Mon Aug 27 15:11:18 2018 +0100
Committer: Paul Campbell
Committed: Mon Aug 27 15:31:25 2018 +0100
--
.../app/components/designer/designer.directive.js| 5 +
.../app/components/util/d3-blueprint.js | 15 ++-
2 files changed, 11 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/aee74eff/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
b/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
index 240ea96..2f91745 100644
---
a/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
+++
b/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
@@ -173,6 +173,11 @@ export function designerDirective($log, $state, $q,
iconGenerator, catalogApi, b
});
});
+$element.bind('delete-entity', function (event) {
+$log.debug('delete-entity');
+$scope.$broadcast('d3.remove', event.detail.entity);
+});
+
$element.bind('drop-external-node', event => {
let draggedItem = paletteDragAndDropService.draggedItem();
let target = blueprintService.find(event.detail.parentId);
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/aee74eff/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
--
diff --git a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
index 4d5ff2d..c05ccf6 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -323,19 +323,16 @@ export function D3Blueprint(container) {
d3.event.stopPropagation();
if (d3.event.target.nodeName == 'BODY') {
if (d3.event.key === "Delete" || d3.event.key === "Backspace") {
-console.log('-- DELETE/BACKSPACE key outside of text field
--');
// the selected entity:
var selected = _svg.selectAll('.entity.selected');
var nItemsSelected = selected._groups[0].length;
if (nItemsSelected > 0) {
-console.log('Dispatch event to remove node(s)');
-// entity = ...
-// let event = new CustomEvent("delete-entity", {
-// detail: {
-// entity: entity,
-// }
-// });
-// container.dispatchEvent(event);
+let event = new CustomEvent("delete-entity", {
+ detail: {
+ entity: selected.data()[0].data,
+ }
+ });
+ container.dispatchEvent(event);
}
}
}
[4/4] brooklyn-ui git commit: This closes #65
This closes #65 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/de4c92b9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/de4c92b9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/de4c92b9 Branch: refs/heads/master Commit: de4c92b977f15c31d97546f682a6e005f7dde1b0 Parents: 44eccff 38936b5 Author: Thomas Bouron Authored: Tue Aug 28 09:45:25 2018 +0100 Committer: Thomas Bouron Committed: Tue Aug 28 09:45:25 2018 +0100 -- .../components/designer/designer.directive.js | 5 .../app/components/util/d3-blueprint.js | 27 2 files changed, 32 insertions(+) --
[1/4] brooklyn-ui git commit: Polish
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 44eccff45 -> de4c92b97
Polish
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/38936b59
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/38936b59
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/38936b59
Branch: refs/heads/master
Commit: 38936b594044051071e72b95955a2f486b567b65
Parents: aee74ef
Author: Paul Campbell
Authored: Mon Aug 27 15:13:29 2018 +0100
Committer: Paul Campbell
Committed: Mon Aug 27 15:31:25 2018 +0100
--
ui-modules/blueprint-composer/app/components/util/d3-blueprint.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/38936b59/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
--
diff --git a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
index c05ccf6..04e26b8 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -323,7 +323,6 @@ export function D3Blueprint(container) {
d3.event.stopPropagation();
if (d3.event.target.nodeName == 'BODY') {
if (d3.event.key === "Delete" || d3.event.key === "Backspace") {
-// the selected entity:
var selected = _svg.selectAll('.entity.selected');
var nItemsSelected = selected._groups[0].length;
if (nItemsSelected > 0) {
@@ -332,7 +331,7 @@ export function D3Blueprint(container) {
entity: selected.data()[0].data,
}
});
- container.dispatchEvent(event);
+container.dispatchEvent(event);
}
}
}
[01/10] brooklyn-docs git commit: example_yaml: netcat client closes connection after EOF
Repository: brooklyn-docs Updated Branches: refs/heads/master 740913fd6 -> 97515cbc7 example_yaml: netcat client closes connection after EOF >From the nc(1) man page: -N shutdown(2) the network socket after EOF on the input. Some servers require this to finish their work. Ubuntu would appear to be one such server. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/767a7160 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/767a7160 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/767a7160 Branch: refs/heads/master Commit: 767a7160e1a032f56034fd19766f24a7e90617a2 Parents: d66451f Author: Paul Campbell Authored: Wed Aug 22 15:32:10 2018 +0100 Committer: Paul Campbell Committed: Thu Aug 23 14:47:31 2018 +0100 -- guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/767a7160/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml -- diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml index 64377b2..3c65fc6 100644 --- a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml +++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml @@ -66,7 +66,7 @@ services: name: sayHiNetcat description: Echo a small hello string to the netcat entity command: | -echo $message | nc $TARGET_HOSTNAME 4321 +echo $message | nc -N $TARGET_HOSTNAME 4321 parameters: message: description: The string to pass to netcat
[05/10] brooklyn-docs git commit: Quote jdbc string format templates
Quote jdbc string format templates
Ampersand (&) in format wasn't being parsed properly.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/845339d8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/845339d8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/845339d8
Branch: refs/heads/master
Commit: 845339d8cd4398aaa0f8463c52a1835071899c03
Parents: e8274fd
Author: Paul Campbell
Authored: Fri Aug 24 12:55:59 2018 +0100
Committer: Paul Campbell
Committed: Fri Aug 24 12:55:59 2018 +0100
--
guide/blueprints/example_yaml/appserver-clustered-w-db.yaml| 2 +-
guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml | 2 +-
guide/blueprints/example_yaml/appserver-w-db.yaml | 2 +-
guide/blueprints/example_yaml/appserver-w-policy.yaml | 2 +-
guide/ops/externalized-configuration.md| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
index 46d55d6..8064a81 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
@@ -12,7 +12,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
-- jdbc:%s%s?user=%s\\&password=%s
+- "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
index 2132a7e..1538683 100644
--- a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
@@ -8,7 +8,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-w-db.yaml
b/guide/blueprints/example_yaml/appserver-w-db.yaml
index 3555fcd..a54d88c 100644
--- a/guide/blueprints/example_yaml/appserver-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db.yaml
@@ -8,7 +8,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-policy.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml
b/guide/blueprints/example_yaml/appserver-w-policy.yaml
index 7c5315f..5106d9a 100644
--- a/guide/blueprints/example_yaml/appserver-w-policy.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml
@@ -12,7 +12,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/ops/externalized-configuration.md
--
diff --git a/guide/ops/externalized-configuration.md
b/guide/ops/externalized-configuration.md
index 948c300..044b5ad 100644
--- a/guide/ops/externalized-configuration.md
+++ b/guide/ops/externalized-configuration.md
@@ -31,7 +31,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:postgresql://%s/mya
[06/10] brooklyn-docs git commit: Extract Entity Config example to YAML file
Extract Entity Config example to YAML file
Added a name for the deployed application.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/46fc3814
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/46fc3814
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/46fc3814
Branch: refs/heads/master
Commit: 46fc3814dcb634ebd34afd298554feae33c15309
Parents: 845339d
Author: Paul Campbell
Authored: Fri Aug 24 13:59:40 2018 +0100
Committer: Paul Campbell
Committed: Fri Aug 24 14:30:38 2018 +0100
--
guide/blueprints/entity-configuration.md| 28 ++--
.../example_yaml/entity-config-app.yaml | 4 +++
.../example_yaml/entity-config-catalog.yaml | 19 +
3 files changed, 25 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/entity-configuration.md
--
diff --git a/guide/blueprints/entity-configuration.md
b/guide/blueprints/entity-configuration.md
index 9b5dd2a..cefea27 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -41,37 +41,13 @@ blueprint (i.e. inside the `brooklyn.config` block).
It can also explicitly declare config keys, using the `brooklyn.parameters`
block. The example
below illustrates the principle:
-```yaml
-brooklyn.catalog:
- items:
- - id: entity-config-example
-itemType: entity
-name: Entity Config Example
-item:
- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
- brooklyn.parameters:
- - name: custom.message
-type: string
-description: Message to be displayed
-default: Hello
- brooklyn.config:
-shell.env:
- MESSAGE: $brooklyn:config("custom.message")
-launch.command: |
- echo "My example launch command: $MESSAGE"
-checkRunning.command: |
- echo "My example checkRunning command: $MESSAGE"
-```
+!CODEFILE "example_yaml/entity-config-catalog.yaml"
Once added to the catalog, it can be used with the simple blueprint below
(substituting the location
of your choice). Because no configuration has been overridden, this will use
the default value
for `custom.message`, and will use the given values for `launch.command` and
`checkRunning.command`:
-```yaml
-location: aws-ec2:us-east-1
-services:
-- type: entity-config-example
-```
+!CODEFILE "example_yaml/entity-config-app.yaml"
For details of how to write and add catalog items, see
[Catalog]({{book.path.docs}}/blueprints/catalog/index.md).
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/example_yaml/entity-config-app.yaml
--
diff --git a/guide/blueprints/example_yaml/entity-config-app.yaml
b/guide/blueprints/example_yaml/entity-config-app.yaml
new file mode 100644
index 000..526b3d3
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-config-app.yaml
@@ -0,0 +1,4 @@
+location: aws-ec2:us-east-1
+name: entity-config-example
+services:
+- type: entity-config-example
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/example_yaml/entity-config-catalog.yaml
--
diff --git a/guide/blueprints/example_yaml/entity-config-catalog.yaml
b/guide/blueprints/example_yaml/entity-config-catalog.yaml
new file mode 100644
index 000..fe726c2
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-config-catalog.yaml
@@ -0,0 +1,19 @@
+brooklyn.catalog:
+ items:
+ - id: entity-config-example
+itemType: entity
+name: Entity Config Example
+item:
+ type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
+ brooklyn.parameters:
+ - name: custom.message
+type: string
+description: Message to be displayed
+default: Hello
+ brooklyn.config:
+shell.env:
+ MESSAGE: $brooklyn:config("custom.message")
+launch.command: |
+ echo "My example launch command: $MESSAGE"
+checkRunning.command: |
+ echo "My example checkRunning command: $MESSAGE"
[10/10] brooklyn-docs git commit: This closes #266
This closes #266
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/97515cbc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/97515cbc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/97515cbc
Branch: refs/heads/master
Commit: 97515cbc7650e805042f6a515e80e5f80c6021b4
Parents: 740913f fbc27ca
Author: Thomas Bouron
Authored: Thu Aug 30 13:19:14 2018 +0100
Committer: Thomas Bouron
Committed: Thu Aug 30 13:19:14 2018 +0100
--
guide/blueprints/entity-configuration.md| 80 ++--
.../appserver-clustered-w-db-concise.yaml | 2 +-
.../example_yaml/appserver-clustered-w-db.yaml | 4 +-
.../appserver-w-db-other-flavor.yaml| 4 +-
.../blueprints/example_yaml/appserver-w-db.yaml | 4 +-
.../example_yaml/appserver-w-policy.yaml| 4 +-
.../example_yaml/entity-config-app.yaml | 4 +
.../example_yaml/entity-config-catalog.yaml | 19 +
.../entity-config-override-app.yaml | 8 ++
.../example_yaml/entity-constraint-app.yaml | 7 ++
.../example_yaml/entity-constraint-catalog.yaml | 29 +++
.../fabric-with-multiple-locations.yaml | 2 +-
.../example_yaml/vanilla-bash-netcat-file.yaml | 1 +
.../vanilla-bash-netcat-w-client.yaml | 6 +-
.../testcases/getting-started-test-example.yaml | 2 +-
guide/ops/cli/cli-usage-guide.md| 20 ++---
guide/ops/externalized-configuration.md | 2 +-
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/start/_my-web-cluster.yaml| 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
21 files changed, 104 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/97515cbc/guide/blueprints/entity-configuration.md
--
diff --cc guide/blueprints/entity-configuration.md
index cf38a1b,1b623c6..1bd1db1
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@@ -67,14 -47,9 +47,10 @@@ Once added to the catalog, it can be us
of your choice). Because no configuration has been overridden, this will use
the default value
for `custom.message`, and will use the given values for `launch.command` and
`checkRunning.command`:
- ```yaml
- location: aws-ec2:us-east-1
- services:
- - type: entity-config-example
- ```
+ !CODEFILE "example_yaml/entity-config-app.yaml"
-For details of how to write and add catalog items, see
[Catalog]({{book.path.docs}}/blueprints/catalog/index.md).
+For details of how to write and add catalog items, see
[Catalog]({{book.path.docs}}/blueprints/catalog/index.md),
+and for a complete reference on the syntax of `brooklyn.parameters` see that
section of the [YAML
Reference]({{book.path.docs}}/blueprints/yaml-reference.md).
Config Key Constraints
[09/10] brooklyn-docs git commit: Comment on netcat command for macos/linux compatibility
Comment on netcat command for macos/linux compatibility The version of netcat on MacOS doesn't support, or need, the `-N` parameter. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/fbc27ca5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/fbc27ca5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/fbc27ca5 Branch: refs/heads/master Commit: fbc27ca599179377e1710bdc5a0a7f15b1e13d1b Parents: ca1cd3f Author: Paul Campbell Authored: Thu Aug 30 11:18:56 2018 +0100 Committer: Paul Campbell Committed: Thu Aug 30 11:18:56 2018 +0100 -- .../blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/fbc27ca5/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml -- diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml index 3c65fc6..651e2b0 100644 --- a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml +++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml @@ -66,7 +66,11 @@ services: name: sayHiNetcat description: Echo a small hello string to the netcat entity command: | -echo $message | nc -N $TARGET_HOSTNAME 4321 +# Uncomment the appropriate command for your operating system +# for Linux: +# echo $message | nc -N $TARGET_HOSTNAME 4321 +# for MacOS: +# echo $message | nc $TARGET_HOSTNAME 4321 parameters: message: description: The string to pass to netcat
[08/10] brooklyn-docs git commit: Extract Entity Config Override example to YAML file
Extract Entity Config Override example to YAML file Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ca1cd3f6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ca1cd3f6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ca1cd3f6 Branch: refs/heads/master Commit: ca1cd3f6f52d752ec5cdf92af714050d14d8e4a0 Parents: 37d8433 Author: Paul Campbell Authored: Fri Aug 24 15:53:45 2018 +0100 Committer: Paul Campbell Committed: Fri Aug 24 15:53:45 2018 +0100 -- guide/blueprints/entity-configuration.md | 11 +-- .../example_yaml/entity-config-override-app.yaml | 8 2 files changed, 9 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ca1cd3f6/guide/blueprints/entity-configuration.md -- diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md index 96885ca..1b623c6 100644 --- a/guide/blueprints/entity-configuration.md +++ b/guide/blueprints/entity-configuration.md @@ -103,16 +103,7 @@ consider the `entity-config-example` added to the catalog in the section [Configuration in a Catalog Item](#configuration-in-a-catalog-item). We can override these values. If not overridden, then the existing values from the super-type will be used: -```yaml -location: aws-ec2:us-east-1 -services: -- type: entity-config-example - brooklyn.config: -custom.message: Goodbye -launch.command: | - echo "Sub-type launch command: $MESSAGE" -``` - +!CODEFILE "example_yaml/entity-config-override-app.yaml" In this example, the `custom.message` overrides the default defined on the config key. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ca1cd3f6/guide/blueprints/example_yaml/entity-config-override-app.yaml -- diff --git a/guide/blueprints/example_yaml/entity-config-override-app.yaml b/guide/blueprints/example_yaml/entity-config-override-app.yaml new file mode 100644 index 000..a1481f0 --- /dev/null +++ b/guide/blueprints/example_yaml/entity-config-override-app.yaml @@ -0,0 +1,8 @@ +location: aws-ec2:us-east-1 +name: entity-config-override-example +services: +- type: entity-config-example + brooklyn.config: +custom.message: Goodbye +launch.command: | + echo "Sub-type launch command: $MESSAGE"
[03/10] brooklyn-docs git commit: Update to use datastore.creation.script.template.url
Update to use datastore.creation.script.template.url
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c0aaf80f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c0aaf80f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c0aaf80f
Branch: refs/heads/master
Commit: c0aaf80f12e0c284c804eb618805221dc5d03d13
Parents: 767a716
Author: Paul Campbell
Authored: Fri Aug 24 12:50:16 2018 +0100
Committer: Paul Campbell
Committed: Fri Aug 24 12:50:16 2018 +0100
--
.../appserver-clustered-w-db-concise.yaml | 2 +-
.../example_yaml/appserver-clustered-w-db.yaml | 2 +-
.../appserver-w-db-other-flavor.yaml| 2 +-
.../blueprints/example_yaml/appserver-w-db.yaml | 2 +-
.../example_yaml/appserver-w-policy.yaml| 2 +-
.../testcases/getting-started-test-example.yaml | 2 +-
guide/ops/cli/cli-usage-guide.md| 20 ++--
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/start/_my-web-cluster.yaml| 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
--
diff --git
a/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
b/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
index f4176fa..24b3682 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
@@ -12,4 +12,4 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample",
"hidden-brooklyn-password")
-datastore.creation.script.url:
https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+datastore.creation.script.template.url:
https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
index 024cc4d..46d55d6 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
@@ -22,5 +22,5 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample",
"hidden-brooklyn-password")
-datastore.creation.script.url:
https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+datastore.creation.script.template.url:
https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
index fe4013c..2132a7e 100644
--- a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
@@ -18,6 +18,6 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample",
"hidden-brooklyn-password")
-datastore.creation.script.url:
https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+datastore.creation.script.template.url:
https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
provisioning.properties:
minRam: 8192
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-w-db.yaml
--
diff --git a/guide/blueprints/example_yaml/appserver-w-db.yaml
b/guide/blueprints/example_yaml/appserver-w-db.yaml
index 5510ba7..3555fcd 100644
--- a/guide/blueprints/example_yaml/appserver-w-db.yaml
+++ b/guide/blu
[02/10] brooklyn-docs git commit: example_yaml: make start.sh executable after extracting
example_yaml: make start.sh executable after extracting /tmp/brooklyn-...-launching_VanillaSoftwareProce.sh: line 9: ./start.sh: Permission denied Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/d66451f2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/d66451f2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/d66451f2 Branch: refs/heads/master Commit: d66451f2c534f7964f8aac1d5cfa149adbe61487 Parents: d210db3 Author: Paul Campbell Authored: Wed Aug 22 14:57:38 2018 +0100 Committer: Paul Campbell Committed: Thu Aug 23 14:47:31 2018 +0100 -- guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d66451f2/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml -- diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml index 1c4612b..af9cf11 100644 --- a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml +++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml @@ -6,5 +6,6 @@ services: brooklyn.config: download.url: file:///tmp/netcat-server.tgz launch.command: | + chmod +x start.sh ./start.sh & echo $! > $PID_FILE
[07/10] brooklyn-docs git commit: Extract Entity Constraint example to YAML file
Extract Entity Constraint example to YAML file
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/37d84333
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/37d84333
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/37d84333
Branch: refs/heads/master
Commit: 37d84333e40041c16efa64d14b47aac14eb0e071
Parents: 46fc381
Author: Paul Campbell
Authored: Fri Aug 24 14:30:58 2018 +0100
Committer: Paul Campbell
Committed: Fri Aug 24 14:33:06 2018 +0100
--
guide/blueprints/entity-configuration.md| 41 +---
.../example_yaml/entity-constraint-app.yaml | 7
.../example_yaml/entity-constraint-catalog.yaml | 29 ++
3 files changed, 38 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/entity-configuration.md
--
diff --git a/guide/blueprints/entity-configuration.md
b/guide/blueprints/entity-configuration.md
index cefea27..96885ca 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -64,48 +64,11 @@ can be any of:
This is illustrated in the example below:
-```yaml
-brooklyn.catalog:
- items:
- - id: entity-constraint-example
-itemType: entity
-name: Entity Config Example
-item:
- type: org.apache.brooklyn.entity.stock.BasicEntity
- brooklyn.parameters:
- - name: compulsoryExample
-type: string
-constraints:
-- required
- - name: addressExample
-type: string
-constraints:
-- regex: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$
- - name: numberExample
-type: double
-constraints:
-- $brooklyn:object:
-type: org.apache.brooklyn.util.math.MathPredicates
-factoryMethod.name: greaterThan
-factoryMethod.args:
-- 0.0
-- $brooklyn:object:
-type: org.apache.brooklyn.util.math.MathPredicates
-factoryMethod.name: lessThan
-factoryMethod.args:
-- 256.0
-```
+!CODEFILE "example_yaml/entity-constraint-catalog.yaml"
An example usage of this toy example, once added to the catalog, is shown
below:
-```yaml
-services:
-- type: entity-constraint-example
- brooklyn.config:
-compulsoryExample: foo
-addressExample: 1.1.1.1
-numberExample: 2.0
-```
+!CODEFILE "example_yaml/entity-constraint-app.yaml"
### Inheriting Configuration
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/example_yaml/entity-constraint-app.yaml
--
diff --git a/guide/blueprints/example_yaml/entity-constraint-app.yaml
b/guide/blueprints/example_yaml/entity-constraint-app.yaml
new file mode 100644
index 000..a75d2ca
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-constraint-app.yaml
@@ -0,0 +1,7 @@
+name: entity-constraint-example
+services:
+- type: entity-constraint-example
+ brooklyn.config:
+compulsoryExample: foo
+addressExample: 1.1.1.1
+numberExample: 2.0
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
--
diff --git a/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
b/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
new file mode 100644
index 000..d957a09
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
@@ -0,0 +1,29 @@
+brooklyn.catalog:
+ items:
+ - id: entity-constraint-example
+itemType: entity
+name: Entity Config Example
+item:
+ type: org.apache.brooklyn.entity.stock.BasicEntity
+ brooklyn.parameters:
+ - name: compulsoryExample
+type: string
+constraints:
+- required
+ - name: addressExample
+type: string
+constraints:
+- regex: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$
+ - name: numberExample
+type: double
+constraints:
+- $brooklyn:object:
+type: org.apache.brooklyn.util.math.MathPredicates
+factoryMethod.name: greaterThan
+factoryMethod.args:
+- 0.0
+- $brooklyn:object:
+type: org.apache.brooklyn.util.math.MathPredicates
+factoryMethod.name: lessThan
+factoryMethod.args:
+- 256.0
[04/10] brooklyn-docs git commit: Fix typo in example yaml for dynamicfabric
Fix typo in example yaml for dynamicfabric Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e8274fdd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e8274fdd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e8274fdd Branch: refs/heads/master Commit: e8274fddc603dadbba6cf7933d76eb6a0bfcdd4c Parents: c0aaf80 Author: Paul Campbell Authored: Fri Aug 24 12:51:56 2018 +0100 Committer: Paul Campbell Committed: Fri Aug 24 12:51:56 2018 +0100 -- guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e8274fdd/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml -- diff --git a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml index 7a2a14f..4fef1f8 100644 --- a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml +++ b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml @@ -5,7 +5,7 @@ locations: services: - type: org.apache.brooklyn.entity.group.DynamicFabric brooklyn.config: -dynamiccfabric.memberspec: +dynamicfabric.memberspec: $brooklyn:entitySpec: type: org.apache.brooklyn.entity.group.DynamicCluster brooklyn.config:
[1/2] brooklyn-docs git commit: Update web console screenshot
Repository: brooklyn-docs Updated Branches: refs/heads/website 97bd9c24d -> 181c6a984 Update web console screenshot Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ae53c49b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ae53c49b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ae53c49b Branch: refs/heads/website Commit: ae53c49b4903ecda6b6657e2761e85e9e185b426 Parents: 97bd9c2 Author: Thomas Bouron Authored: Fri Jul 27 09:58:44 2018 +0100 Committer: Thomas Bouron Committed: Thu Aug 30 13:22:45 2018 +0100 -- learnmore/features/ops-console.png | Bin 491417 -> 161315 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ae53c49b/learnmore/features/ops-console.png -- diff --git a/learnmore/features/ops-console.png b/learnmore/features/ops-console.png index 60a07b9..af997cc 100644 Binary files a/learnmore/features/ops-console.png and b/learnmore/features/ops-console.png differ
[2/2] brooklyn-docs git commit: This closes #264
This closes #264 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/181c6a98 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/181c6a98 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/181c6a98 Branch: refs/heads/website Commit: 181c6a984d4f449f34b5dd6b2710cf6e09540516 Parents: 97bd9c2 ae53c49 Author: Thomas Bouron Authored: Thu Aug 30 13:27:15 2018 +0100 Committer: Thomas Bouron Committed: Thu Aug 30 13:27:15 2018 +0100 -- learnmore/features/ops-console.png | Bin 491417 -> 161315 bytes 1 file changed, 0 insertions(+), 0 deletions(-) --
[2/2] brooklyn-server git commit: This closes #986
This closes #986 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e601350d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e601350d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e601350d Branch: refs/heads/master Commit: e601350d75eb61f0056f4900eca898426348ced9 Parents: 6dafb3f a87e669 Author: Thomas Bouron Authored: Thu Sep 6 16:50:20 2018 +0100 Committer: Thomas Bouron Committed: Thu Sep 6 16:50:20 2018 +0100 -- .../mgmt/internal/EntityManagerInternal.java| 8 ++ .../core/mgmt/internal/LocalEntityManager.java | 43 + .../internal/NonDeploymentEntityManager.java| 6 +- .../core/objs/proxy/InternalEntityFactory.java | 15 +++- .../core/entity/proxying/EntityManagerTest.java | 27 ++ .../brooklyn/core/mgmt/DeployFailureTest.java | 95 +++- 6 files changed, 191 insertions(+), 3 deletions(-) --
[1/2] brooklyn-server git commit: BROOKLYN-600: cleanup entities on deploy-failure
Repository: brooklyn-server
Updated Branches:
refs/heads/master 6dafb3fae -> e601350d7
BROOKLYN-600: cleanup entities on deploy-failure
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a87e6692
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a87e6692
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a87e6692
Branch: refs/heads/master
Commit: a87e6692a54a10d389165fd82c93b3fd2f4ccc03
Parents: 6dafb3f
Author: Aled Sage
Authored: Thu Sep 6 12:38:05 2018 +0100
Committer: Aled Sage
Committed: Thu Sep 6 12:38:05 2018 +0100
--
.../mgmt/internal/EntityManagerInternal.java| 8 ++
.../core/mgmt/internal/LocalEntityManager.java | 43 +
.../internal/NonDeploymentEntityManager.java| 6 +-
.../core/objs/proxy/InternalEntityFactory.java | 15 +++-
.../core/entity/proxying/EntityManagerTest.java | 27 ++
.../brooklyn/core/mgmt/DeployFailureTest.java | 95 +++-
6 files changed, 191 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a87e6692/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagerInternal.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagerInternal.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagerInternal.java
index 9d0ab49..4e6adb9 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagerInternal.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagerInternal.java
@@ -39,4 +39,12 @@ public interface EntityManagerInternal extends
EntityManager, BrooklynObjectMana
*/
@Beta
T createEntity(EntitySpec spec, Optional
entityId);
+
+/**
+ * Similar to {@link #unmanage(Entity)}, but used to discard partially
constructed entities.
+ *
+ * @throws IllegalStateException if the entity, or any of its descendents
are already managed.
+ */
+@Beta
+void discardPremanaged(Entity e);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a87e6692/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
index f09ddab..35ab40b 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
@@ -23,9 +23,11 @@ import static
com.google.common.base.Preconditions.checkNotNull;
import java.lang.reflect.Proxy;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Stack;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Pattern;
@@ -460,7 +462,48 @@ public class LocalEntityManager implements
EntityManagerInternal {
public void unmanage(final Entity e, final ManagementTransitionMode mode) {
unmanage(e, mode, false);
}
+
+@Override
+public void discardPremanaged(final Entity e) {
+if (e == null) return;
+if (!isRunning()) return;
+
+Set todiscard = new LinkedHashSet<>();
+Stack tovisit = new Stack<>();
+Set visited = new LinkedHashSet<>();
+
+tovisit.push(e);
+
+while (!tovisit.isEmpty()) {
+Entity next = tovisit.pop();
+visited.add(next);
+for (Entity child : next.getChildren()) {
+if (!visited.contains(child)) {
+tovisit.push(child);
+}
+}
+
+if (isManaged(next)) {
+throw new IllegalStateException("Cannot discard entity "+e+"
because it or a descendent is already managed ("+next+")");
+}
+Entity realNext = deproxyIfNecessary(next);
+String id = next.getId();
+Entity realFound = preRegisteredEntitiesById.get(id);
+if (realFound == null) preManagedEntitiesById.get(id);
+
+if (realFound != null && realFound != realNext) {
+throw new IllegalStateException("Cannot discard pre-managed
entity "+e+" because it or a descendent's id ("+id+") clashes with a different
entity (given "+next+" but found "+realFound+")");
+}
+todiscard.add(id);
+}
+
+for (String id : todiscard) {
+
[1/2] brooklyn-library git commit: Jenkins docker: use non-root user
Repository: brooklyn-library
Updated Branches:
refs/heads/master a94f7d84e -> 8ac59f977
Jenkins docker: use non-root user
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/5a9fc95a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/5a9fc95a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/5a9fc95a
Branch: refs/heads/master
Commit: 5a9fc95a99cd7b21fe2de9707e4a3286a358635f
Parents: a94f7d8
Author: Aled Sage
Authored: Mon Sep 24 13:32:07 2018 +0100
Committer: Aled Sage
Committed: Mon Sep 24 14:03:56 2018 +0100
--
Jenkinsfile | 10 +-
README.md | 7 +--
2 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5a9fc95a/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 42af8b3..76a41e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,16 +36,16 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/root/.m2 -v ${WORKSPACE}:/usr/build
-w /usr/build') {
-sh 'mvn clean install'
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -u 910:910 -v ${WORKSPACE}/.m2:/var/maven/.m2 -v
${WORKSPACE}:/usr/build -w /usr/build -e MAVEN_CONFIG=/var/maven/.m2') {
+sh 'mvn clean install -Duser.name=$(id -un 910)'
}
}
// Conditional stage to deploy artifacts, when not building a PR
if (env.CHANGE_ID == null) {
stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/root/.m2 -v ${WORKSPACE}:/usr/build
-w /usr/build') {
-sh 'mvn deploy -DskipTests'
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -u 910:910 -v ${WORKSPACE}/.m2:/var/maven/.m2 -v
${WORKSPACE}:/usr/build -w /usr/build -e MAVEN_CONFIG=/var/maven/.m2') {
+sh 'mvn deploy -DskipTests -Duser.name=$(id -un 910)'
}
}
@@ -79,4 +79,4 @@ node(label: 'ubuntu') {
])
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5a9fc95a/README.md
--
diff --git a/README.md b/README.md
index c046066..147295e 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,10 @@ docker build -t brooklyn:library .
Then run the build:
```bash
-docker run -i --rm --name brooklyn-library -v ${HOME}/.m2:/root/.m2 -v
${PWD}:/usr/build -w /usr/build brooklyn:library mvn clean install
+docker run -i --rm --name brooklyn-library -u $(id -u $(whoami)):$(id -g
$(whoami)) \
+-e MAVEN_CONFIG=/var/maven/.m2 \
+-v ${HOME}/.m2:/var/maven/.m2 -v ${PWD}:/usr/build -w /usr/build \
+brooklyn:library mvn clean install -Duser.home=/var/maven
-Duser.name=$(whoami)
```
### Using maven
@@ -32,4 +35,4 @@ Simply run:
```bash
mvn clean install
-```
\ No newline at end of file
+```
[2/2] brooklyn-library git commit: This closes #159
This closes #159 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8ac59f97 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8ac59f97 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8ac59f97 Branch: refs/heads/master Commit: 8ac59f977fff73d2fea559c47502b885887241e5 Parents: a94f7d8 5a9fc95 Author: Thomas Bouron Authored: Mon Sep 24 14:34:10 2018 +0100 Committer: Thomas Bouron Committed: Mon Sep 24 14:34:10 2018 +0100 -- Jenkinsfile | 10 +- README.md | 7 +-- 2 files changed, 10 insertions(+), 7 deletions(-) --
[2/2] brooklyn-ui git commit: This closes #76
This closes #76 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c4eb263f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c4eb263f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c4eb263f Branch: refs/heads/master Commit: c4eb263fa9778951b08324581791af1546e7e74e Parents: 6de1f67 0b09874 Author: Thomas Bouron Authored: Tue Oct 2 13:10:20 2018 +0100 Committer: Thomas Bouron Committed: Tue Oct 2 13:10:20 2018 +0100 -- .../app/components/catalog-selector/catalog-selector.directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] brooklyn-ui git commit: Composer palette: search entity tags
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 6de1f6730 -> c4eb263fa
Composer palette: search entity tags
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/0b098749
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/0b098749
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/0b098749
Branch: refs/heads/master
Commit: 0b098749f6ce1d1f055b4667c1bae1400b5edd54
Parents: 6de1f67
Author: Aled Sage
Authored: Fri Sep 28 13:25:19 2018 +0100
Committer: Aled Sage
Committed: Fri Sep 28 13:25:19 2018 +0100
--
.../app/components/catalog-selector/catalog-selector.directive.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/0b098749/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 733a2ce..32fdd1c 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -22,7 +22,7 @@ import template from './catalog-selector.template.html';
const ITEMS_PER_PAGE = 30;
// fields in either bundle or type record:
-const FIELDS_TO_SEARCH = ['name', 'displayName', 'symbolicName', 'version',
'type', 'supertypes', 'containingBundle', 'description', 'displayTags'];
+const FIELDS_TO_SEARCH = ['name', 'displayName', 'symbolicName', 'version',
'type', 'supertypes', 'containingBundle', 'description', 'displayTags', 'tags'];
export function catalogSelectorDirective() {
return {
[1/2] brooklyn-server git commit: Fix a bad-formatted title in readme
Repository: brooklyn-server
Updated Branches:
refs/heads/master c3d71a2e9 -> 187a9a03b
Fix a bad-formatted title in readme
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/83a63328
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/83a63328
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/83a63328
Branch: refs/heads/master
Commit: 83a63328ea1937b0f985afdabce88a6322828ab8
Parents: c3d71a2
Author: ClΓΒ©ment Collin
Authored: Mon Oct 8 16:59:19 2018 +0200
Committer: GitHub
Committed: Mon Oct 8 16:59:19 2018 +0200
--
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/83a63328/README.md
--
diff --git a/README.md b/README.md
index 4613948..c2b610d 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ Then run the build:
docker run -i --rm --name brooklyn-server -v ${HOME}/.m2:/root/.m2 -v
${PWD}:/usr/build -w /usr/build brooklyn:server mvn clean install
```
-### Using maven
+ Using maven
Simply run:
```bash
mvn clean install
-```
\ No newline at end of file
+```
[2/2] brooklyn-server git commit: This closes #1007
This closes #1007 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/187a9a03 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/187a9a03 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/187a9a03 Branch: refs/heads/master Commit: 187a9a03beea820c36fae1474e8f6657490fff47 Parents: c3d71a2 83a6332 Author: Thomas Bouron Authored: Tue Oct 9 15:09:33 2018 +0100 Committer: Thomas Bouron Committed: Tue Oct 9 15:09:33 2018 +0100 -- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[1/2] brooklyn-ui git commit: Correct firefox multi-lines issue on configuration text-area in the blueprint composer
Repository: brooklyn-ui
Updated Branches:
refs/heads/master c4eb263fa -> 536a6eb65
Correct firefox multi-lines issue on configuration text-area in the blueprint
composer
- replace white-space "nowrap" by "pre" otherwise firefox doesn't display new
lines
- handle shift+enter (in addition to ctrl+enter and option+enter) to create a
new line
- avoid javascript error when the input is empty and new line is inserted
Signed-off-by: Ludovic Plantin
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/df6b98dd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/df6b98dd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/df6b98dd
Branch: refs/heads/master
Commit: df6b98ddc954cc41a31aad4f513c950a31530b79
Parents: c4eb263
Author: Ludovic Plantin
Authored: Tue Oct 9 16:02:19 2018 +0200
Committer: Ludovic Plantin
Committed: Tue Oct 9 16:17:35 2018 +0200
--
.../app/components/spec-editor/spec-editor.less | 2 +-
ui-modules/utils/autogrow/index.js | 8 ++--
ui-modules/utils/on-enter/index.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
index 29bb911..4d8660a 100644
--- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
+++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
@@ -601,7 +601,7 @@ spec-editor {
}
textarea.auto-grow-multi-row {
// multi-line entries shouldn't wrap
-white-space: nowrap;
+white-space: pre;
}
.collapsing { transition: height 0.15s; }
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/utils/autogrow/index.js
--
diff --git a/ui-modules/utils/autogrow/index.js
b/ui-modules/utils/autogrow/index.js
index dfe3949..b95d800 100644
--- a/ui-modules/utils/autogrow/index.js
+++ b/ui-modules/utils/autogrow/index.js
@@ -54,11 +54,15 @@ export function autoGrowDirective() {
};
element.bind('keydown keypress', e => {
-if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
+if (e.which === 13 && (e.ctrlKey || e.shiftKey || e.metaKey)) {
e.preventDefault();
e.stopPropagation();
let cursorPosition = element[0].selectionStart;
-ctrl.$setViewValue(ctrl.$modelValue.substring(0,
cursorPosition) + "\n" + ctrl.$modelValue.substring(cursorPosition));
+if (ctrl.$modelValue === undefined) {
+ctrl.$setViewValue("\n");
+} else {
+ctrl.$setViewValue(ctrl.$modelValue.substring(0,
cursorPosition) + "\n" + ctrl.$modelValue.substring(cursorPosition));
+}
ctrl.$render();
scope.$apply(() => {
element[0].selectionEnd = cursorPosition + 1;
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/utils/on-enter/index.js
--
diff --git a/ui-modules/utils/on-enter/index.js
b/ui-modules/utils/on-enter/index.js
index d146af9..26f787a 100644
--- a/ui-modules/utils/on-enter/index.js
+++ b/ui-modules/utils/on-enter/index.js
@@ -36,7 +36,7 @@ export function onEnterDirective() {
function link(scope, element, attrs) {
element.bind("keydown keypress", event => {
-if (event.which === 13 && !event.ctrlKey && !event.metaKey) {
+if (event.which === 13 && !event.ctrlKey && !event.metaKey &&
!event.shiftKey) {
scope.onEnter(element, event);
}
});
[2/2] brooklyn-ui git commit: This closes #81
This closes #81 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/536a6eb6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/536a6eb6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/536a6eb6 Branch: refs/heads/master Commit: 536a6eb65e48c21880a3e65a7f0b033e24b83367 Parents: c4eb263 df6b98d Author: Thomas Bouron Authored: Wed Oct 10 06:17:05 2018 +0100 Committer: Thomas Bouron Committed: Wed Oct 10 06:17:05 2018 +0100 -- .../app/components/spec-editor/spec-editor.less | 2 +- ui-modules/utils/autogrow/index.js | 8 ++-- ui-modules/utils/on-enter/index.js | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) --
[1/2] brooklyn-ui git commit: Add binary requirement to README
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 536a6eb65 -> edf16c3c3
Add binary requirement to README
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b7b6665f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/b7b6665f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/b7b6665f
Branch: refs/heads/master
Commit: b7b6665f18f101a7f18764365a9306c5812a9fcd
Parents: c4eb263
Author: Thomas Bouron
Authored: Tue Oct 9 12:55:43 2018 +0100
Committer: Thomas Bouron
Committed: Wed Oct 10 06:14:23 2018 +0100
--
README.md | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b7b6665f/README.md
--
diff --git a/README.md b/README.md
index 2b5dc56..960bfb2 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,26 @@ docker run -i --rm --name brooklyn-ui -v
${HOME}/.m2:/root/.m2 -v ${PWD}:/usr/bu
### Using maven
-This requires maven 3.5.0 or later. With this, simply run:
+You will need the following binaries installed first:
+* `java`
+* `maven` (please note, you will need version 3.5.2 or later)
+* `git`
+* `bzip2`
+* `libpng`. This has different package names based on the distribution:
+ * `libpng-devel` for centos
+ * `libpng-dev` for debian/ubuntu (also requires `libpng12`)
+ * `libpng` for MacOS
+
+_Optional, only if the `libpng` cannot be found_
+* _`automake (opt)`_
+* _`autoconf`_
+* _`libtool`_
+* _`dpkg`_
+* _`pkgconfig`_
+* _`nasm`_
+* _`gcc`_
+
+With this, simply run:
```bash
mvn clean install
[2/2] brooklyn-ui git commit: This closes #80
This closes #80 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/edf16c3c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/edf16c3c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/edf16c3c Branch: refs/heads/master Commit: edf16c3c39db9f05be3a13014e20db918c1768dc Parents: 536a6eb b7b6665 Author: Thomas Bouron Authored: Wed Oct 10 06:21:38 2018 +0100 Committer: Thomas Bouron Committed: Wed Oct 10 06:21:38 2018 +0100 -- README.md | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) --
[2/8] brooklyn-ui git commit: Require that eclipse use karaf-maven-plugin 4.2.1 or later
Require that eclipse use karaf-maven-plugin 4.2.1 or later Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/5dd496e1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/5dd496e1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/5dd496e1 Branch: refs/heads/master Commit: 5dd496e168a7f9b6620064ec7182a9ad29bf5f03 Parents: 72dbeaa Author: Paul Campbell Authored: Wed Sep 26 11:16:04 2018 +0100 Committer: Paul Campbell Committed: Wed Sep 26 11:16:04 2018 +0100 -- modularity-server/features/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5dd496e1/modularity-server/features/pom.xml -- diff --git a/modularity-server/features/pom.xml b/modularity-server/features/pom.xml index 110e7d7..461b5d5 100644 --- a/modularity-server/features/pom.xml +++ b/modularity-server/features/pom.xml @@ -176,7 +176,7 @@ org.apache.karaf.tooling karaf-maven-plugin -[4.1.6,) +[4.2.1,) verify features-generate-descriptor
[7/8] brooklyn-ui git commit: Specify pax-web version - matches that in brooklyn-server and karaf
Specify pax-web version - matches that in brooklyn-server and karaf
Brooklyn-ui doesn't use a relativePath to it's sibling project,
../brooklyn-server, so, when built as part of the main brooklyn project, it
won't use the pax-web.version value from brooklyn-server, but from whatever was
in the ~/.m2 repository, or maven central.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/9c413438
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/9c413438
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/9c413438
Branch: refs/heads/master
Commit: 9c413438776a07eee40cca396b7ef1693c8630a1
Parents: 0d727d0
Author: Paul Campbell
Authored: Sat Sep 29 11:59:03 2018 +0100
Committer: Paul Campbell
Committed: Sat Sep 29 11:59:03 2018 +0100
--
pom.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/9c413438/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6cc7b87..5e2358f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
3.0.1
3.0.0
1.3
+7.2.3
${pax-web.version}
[4/8] brooklyn-ui git commit: Don't redeclare pax-web version from parent pom
Don't redeclare pax-web version from parent pom
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/5d96ad24
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/5d96ad24
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/5d96ad24
Branch: refs/heads/master
Commit: 5d96ad24c4a585bbd10b97b8e86e41cb40883d85
Parents: 01d2172
Author: Paul Campbell
Authored: Wed Sep 26 16:05:02 2018 +0100
Committer: Paul Campbell
Committed: Wed Sep 26 16:05:02 2018 +0100
--
pom.xml | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5d96ad24/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 15cb299..6cc7b87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@
3.0.1
3.0.0
1.3
-6.0.6
${pax-web.version}
[1/8] brooklyn-ui git commit: Remove deprecated/unsupported generic Service-Component
Repository: brooklyn-ui Updated Branches: refs/heads/master 2afc3acf8 -> 3c1ab28f5 Remove deprecated/unsupported generic Service-Component Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/72dbeaaa Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/72dbeaaa Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/72dbeaaa Branch: refs/heads/master Commit: 72dbeaaa1f861f82a04807b8ef6aa60e340d844e Parents: de857cf Author: Paul Campbell Authored: Wed Sep 19 13:18:23 2018 +0100 Committer: Paul Campbell Committed: Wed Sep 19 17:29:52 2018 +0100 -- modularity-server/external-modules/pom.xml | 1 - modularity-server/metadata-registry/pom.xml | 1 - modularity-server/proxy/pom.xml | 1 - 3 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/72dbeaaa/modularity-server/external-modules/pom.xml -- diff --git a/modularity-server/external-modules/pom.xml b/modularity-server/external-modules/pom.xml index fa3ecf6..9ff9aba 100644 --- a/modularity-server/external-modules/pom.xml +++ b/modularity-server/external-modules/pom.xml @@ -107,7 +107,6 @@ !* -* http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/72dbeaaa/modularity-server/metadata-registry/pom.xml -- diff --git a/modularity-server/metadata-registry/pom.xml b/modularity-server/metadata-registry/pom.xml index 008f1a3..714eaf1 100644 --- a/modularity-server/metadata-registry/pom.xml +++ b/modularity-server/metadata-registry/pom.xml @@ -107,7 +107,6 @@ !* -* http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/72dbeaaa/modularity-server/proxy/pom.xml -- diff --git a/modularity-server/proxy/pom.xml b/modularity-server/proxy/pom.xml index 76ff414..7a03f86 100644 --- a/modularity-server/proxy/pom.xml +++ b/modularity-server/proxy/pom.xml @@ -135,7 +135,6 @@ !* -*
[8/8] brooklyn-ui git commit: This closes #74
This closes #74 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/3c1ab28f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/3c1ab28f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/3c1ab28f Branch: refs/heads/master Commit: 3c1ab28f57761e6a906c4cdeedd0d629b56444a8 Parents: 2afc3ac 9c41343 Author: Thomas Bouron Authored: Thu Oct 11 08:54:35 2018 +0100 Committer: Thomas Bouron Committed: Thu Oct 11 08:54:35 2018 +0100 -- modularity-server/external-modules/pom.xml | 1 - modularity-server/features/pom.xml | 2 +- modularity-server/metadata-registry/pom.xml | 1 - modularity-server/module-api/pom.xml| 2 +- modularity-server/proxy/pom.xml | 1 - pom.xml | 3 ++- 6 files changed, 4 insertions(+), 6 deletions(-) --
[5/8] brooklyn-ui git commit: Delegate pax-web-spi version to dependencyManagement in parent pom
Delegate pax-web-spi version to dependencyManagement in parent pom
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c5692a2e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c5692a2e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c5692a2e
Branch: refs/heads/master
Commit: c5692a2ec5c0bb0409e0369776556e3794b09f5a
Parents: 5d96ad2
Author: Paul Campbell
Authored: Thu Sep 27 12:10:56 2018 +0100
Committer: Paul Campbell
Committed: Thu Sep 27 12:10:56 2018 +0100
--
modularity-server/module-api/pom.xml | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c5692a2e/modularity-server/module-api/pom.xml
--
diff --git a/modularity-server/module-api/pom.xml
b/modularity-server/module-api/pom.xml
index 60fadb3..b6ebd5a 100644
--- a/modularity-server/module-api/pom.xml
+++ b/modularity-server/module-api/pom.xml
@@ -72,7 +72,6 @@
org.ops4j.pax.web
pax-web-spi
-${pax-web.version}
provided
[6/8] brooklyn-ui git commit: Revert "Delegate pax-web-spi version to dependencyManagement in parent pom"
Revert "Delegate pax-web-spi version to dependencyManagement in parent pom"
This reverts commit c5692a2ec5c0bb0409e0369776556e3794b09f5a.
When building the base brooklyn project, i.e. that which contains
brooklyn-server and brooklyn-ui as submodules, then the maven project fails
validation. This is because the brooklyn-ui project doesn't include a
relativePath element pointing to the pom inside the brookly-server project.
A note in the brooklyn-ui pom explains why there should not be a relativePath
element to it's sibling (../brooklyn-server). Thus the maven reactor for
brooklyn-ui uses whatever brooklyn-parent is available in the reactor path (i.e.
~/.m2/repository, or maven central, etc). I will not use the 'current'
development copy in ../brooklyn-server/parent.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/0d727d0d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/0d727d0d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/0d727d0d
Branch: refs/heads/master
Commit: 0d727d0d4a1a6c04868d1264549e54e2a279b743
Parents: c5692a2
Author: Paul Campbell
Authored: Sat Sep 29 11:48:47 2018 +0100
Committer: Paul Campbell
Committed: Sat Sep 29 11:48:47 2018 +0100
--
modularity-server/module-api/pom.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/0d727d0d/modularity-server/module-api/pom.xml
--
diff --git a/modularity-server/module-api/pom.xml
b/modularity-server/module-api/pom.xml
index b6ebd5a..60fadb3 100644
--- a/modularity-server/module-api/pom.xml
+++ b/modularity-server/module-api/pom.xml
@@ -72,6 +72,7 @@
org.ops4j.pax.web
pax-web-spi
+${pax-web.version}
provided
[3/8] brooklyn-ui git commit: Specify pax-web component versions as a property
Specify pax-web component versions as a property
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/01d2172a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/01d2172a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/01d2172a
Branch: refs/heads/master
Commit: 01d2172ad43bf99135c4aecf8a187f7bf16de9ad
Parents: 5dd496e
Author: Paul Campbell
Authored: Wed Sep 26 11:16:50 2018 +0100
Committer: Paul Campbell
Committed: Wed Sep 26 11:16:50 2018 +0100
--
modularity-server/module-api/pom.xml | 2 +-
pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/01d2172a/modularity-server/module-api/pom.xml
--
diff --git a/modularity-server/module-api/pom.xml
b/modularity-server/module-api/pom.xml
index c05c5a9..60fadb3 100644
--- a/modularity-server/module-api/pom.xml
+++ b/modularity-server/module-api/pom.xml
@@ -72,7 +72,7 @@
org.ops4j.pax.web
pax-web-spi
-6.0.6
+${pax-web.version}
provided
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/01d2172a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3758a38..15cb299 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,8 @@
3.0.1
3.0.0
1.3
-
6.0.6
+6.0.6
+
${pax-web.version}
v8.4.0
[2/2] brooklyn-ui git commit: This closes #86
This closes #86 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/cdec21b6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/cdec21b6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/cdec21b6 Branch: refs/heads/master Commit: cdec21b6c902d4f12f4c0abcd3850bca0baf8d08 Parents: 3c1ab28 6a92ac2 Author: Thomas Bouron Authored: Fri Oct 19 10:23:27 2018 +0100 Committer: Thomas Bouron Committed: Fri Oct 19 10:23:27 2018 +0100 -- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) --
[1/2] brooklyn-ui git commit: Fix some typos and broken links in README
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 3c1ab28f5 -> cdec21b6c
Fix some typos and broken links in README
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/6a92ac24
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/6a92ac24
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/6a92ac24
Branch: refs/heads/master
Commit: 6a92ac24503199eebc8a099e6163403924ff7a94
Parents: 3c1ab28
Author: ClΓΒ©ment Collin
Authored: Fri Oct 19 11:13:30 2018 +0200
Committer: GitHub
Committed: Fri Oct 19 11:13:30 2018 +0200
--
README.md | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/6a92ac24/README.md
--
diff --git a/README.md b/README.md
index 960bfb2..e8117f7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
### Apache Brooklyn UI Sub-Project
-This repo contains the JavaSciprt UI for Apache Brooklyn plus server-side code
to enable module lookup and discovery.
+This repo contains the JavaScript UI for Apache Brooklyn plus server-side code
to enable module lookup and discovery.
Essential contents:
@@ -41,8 +41,8 @@ You will need the following binaries installed first:
* `git`
* `bzip2`
* `libpng`. This has different package names based on the distribution:
- * `libpng-devel` for centos
- * `libpng-dev` for debian/ubuntu (also requires `libpng12`)
+ * `libpng-devel` for CentOS
+ * `libpng-dev` for Debian/Ubuntu (also requires `libpng12`)
* `libpng` for MacOS
_Optional, only if the `libpng` cannot be found_
@@ -72,7 +72,7 @@ is to run `make` in the relevant module directory, with a
Brooklyn REST server o
For developers, the following links may be useful:
* [Overview and architecture of the project](docs/overview.md)
-* [Building individual module / Dev environment](ui-modules/home/README.md)
+* [Building individual module / Dev environment](ui-modules/README.md)
* [Skinning the UI with custom themes](docs/skinning.md)
* [Customizing and embedding the UI](docs/customizations.md)
@@ -125,7 +125,7 @@ find ./ -type d -name "node_modules" -exec rm -rf {} \+
### Test Failure (PhantomJS)
-Developers have experienced occassional test failures like:
+Developers have experienced occasional test failures like:
```
[INFO] 26 06 2018 09:33:31.658:INFO [karma]: Karma v1.7.1 server started at
http://0.0.0.0:9876/
@@ -151,7 +151,7 @@ Developers have experienced occassional test failures like:
[ERROR] mvn -rf :brooklyn-ui-utils
```
-This appears to be a non-deterministic environment issue. The workaround is to
rerun the test,
+This appears to be a non-deterministic environment issue. The workaround is to
run the test again,
resuming the build from the failed module. For example:
```bash
@@ -178,7 +178,7 @@ Developers have experienced build failures on OS X like:
This is Docker bug: https://github.com/docker/for-mac/issues/2296.
-Try rerunning the build from the failed module (but this will not always
work). For example:
+Try to run the build again from the failed module (but this will not always
work). For example:
```bash
pushd ui-modules/app-inspector
[1/3] brooklyn-ui git commit: Allow to resolve different virtual type according to the entity config
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 88c36c34e -> add0cd481
Allow to resolve different virtual type according to the entity config
- Add entity config as a third parameter of paletteApi.getType method
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/f0a3530a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/f0a3530a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/f0a3530a
Branch: refs/heads/master
Commit: f0a3530ad39fd4a7ef60979e18c838518d3fe2a6
Parents: bac67a0
Author: Ludovic Plantin
Authored: Mon Oct 22 10:32:20 2018 +0200
Committer: Ludovic Plantin
Committed: Mon Oct 22 15:28:00 2018 +0200
--
.../app/components/providers/blueprint-service.provider.js | 2 +-
.../blueprint-composer/app/components/providers/palette-api.js | 2 +-
.../app/components/providers/palette-api.provider.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f0a3530a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
index 4e5233c..391d983 100644
---
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
@@ -232,7 +232,7 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService)
let promise = entity.miscData.has('bundle')
?
paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName,
entity.miscData.get('bundle').version, entity.type, entity.version)
-: paletteApi.getType(entity.type, entity.version);
+: paletteApi.getType(entity.type, entity.version,
entity.config);
promise.then((data)=> {
deferred.resolve(populateEntityFromApiSuccess(entity, data));
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f0a3530a/ui-modules/blueprint-composer/app/components/providers/palette-api.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-api.js
b/ui-modules/blueprint-composer/app/components/providers/palette-api.js
index a0d5748..49f2be5 100644
--- a/ui-modules/blueprint-composer/app/components/providers/palette-api.js
+++ b/ui-modules/blueprint-composer/app/components/providers/palette-api.js
@@ -28,7 +28,7 @@ export class PaletteApi {
return Promise.resolve();
}
-getType(typeSymbolicName, typeVersion) {
+getType(typeSymbolicName, typeVersion, config) {
// no-op
return Promise.resolve();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f0a3530a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
index bb3960b..78d0be4 100644
---
a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
@@ -54,7 +54,7 @@ class PaletteApiProvider extends PaletteApi {
return this.catalogApi.getTypes(params);
}
-getType(typeSymbolicName, typeVersion) {
+getType(typeSymbolicName, typeVersion, config) {
return this.catalogApi.getType(typeSymbolicName, typeVersion);
}
[2/3] brooklyn-ui git commit: Allow to resolve different virtual type according to the entity config
Allow to resolve different virtual type according to the entity config
- Add entity config as a third parameter of paletteApi.getBundleType method for
consistency
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/77d0ce9d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/77d0ce9d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/77d0ce9d
Branch: refs/heads/master
Commit: 77d0ce9d8c8707734f274d4cc9bde5bdd275bc09
Parents: f0a3530
Author: Ludovic Plantin
Authored: Wed Oct 24 12:58:33 2018 +0200
Committer: Ludovic Plantin
Committed: Wed Oct 24 12:58:33 2018 +0200
--
.../app/components/providers/blueprint-service.provider.js | 2 +-
.../blueprint-composer/app/components/providers/palette-api.js | 2 +-
.../app/components/providers/palette-api.provider.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
index 391d983..ab06dff 100644
---
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
@@ -231,7 +231,7 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService)
entity.family = family;
let promise = entity.miscData.has('bundle')
-?
paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName,
entity.miscData.get('bundle').version, entity.type, entity.version)
+?
paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName,
entity.miscData.get('bundle').version, entity.type, entity.version,
entity.config)
: paletteApi.getType(entity.type, entity.version,
entity.config);
promise.then((data)=> {
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/palette-api.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-api.js
b/ui-modules/blueprint-composer/app/components/providers/palette-api.js
index 49f2be5..9fc4017 100644
--- a/ui-modules/blueprint-composer/app/components/providers/palette-api.js
+++ b/ui-modules/blueprint-composer/app/components/providers/palette-api.js
@@ -43,7 +43,7 @@ export class PaletteApi {
return Promise.resolve();
}
-getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName,
typeVersion) {
+getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName,
typeVersion, config) {
// no-op
return Promise.resolve();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
index 78d0be4..17bca9b 100644
---
a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js
@@ -66,7 +66,7 @@ class PaletteApiProvider extends PaletteApi {
return this.catalogApi.getBundle(bundleSymbolicName, bundleVersion);
}
-getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName,
typeVersion) {
+getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName,
typeVersion, config) {
return this.catalogApi.getBundleType(bundleSymbolicName,
bundleVersion, typeSymbolicName, typeVersion);
}
[3/3] brooklyn-ui git commit: This closes #88
This closes #88
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/add0cd48
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/add0cd48
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/add0cd48
Branch: refs/heads/master
Commit: add0cd48122c2e5aa55f8944554a49adc48ebb69
Parents: 88c36c3 77d0ce9
Author: Thomas Bouron
Authored: Wed Oct 24 15:11:11 2018 +0100
Committer: Thomas Bouron
Committed: Wed Oct 24 15:11:11 2018 +0100
--
.../app/components/providers/blueprint-service.provider.js | 4 ++--
.../blueprint-composer/app/components/providers/palette-api.js | 4 ++--
.../app/components/providers/palette-api.provider.js | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/add0cd48/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
--
diff --cc
ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
index c802d5e,ab06dff..9630303
---
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
@@@ -228,11 -228,11 +228,11 @@@ function BlueprintService($log, $q, $sc
let deferred = $q.defer();
if (entity.hasType()) {
-entity.family = family;
+entity.family = family.id;
let promise = entity.miscData.has('bundle')
- ?
paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName,
entity.miscData.get('bundle').version, entity.type, entity.version)
- : paletteApi.getType(entity.type, entity.version);
+ ?
paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName,
entity.miscData.get('bundle').version, entity.type, entity.version,
entity.config)
+ : paletteApi.getType(entity.type, entity.version,
entity.config);
promise.then((data)=> {
deferred.resolve(populateEntityFromApiSuccess(entity, data));
[1/2] brooklyn-ui git commit: DSL editor: allow ref to entity anywhere
Repository: brooklyn-ui
Updated Branches:
refs/heads/master add0cd481 -> fb77f723f
DSL editor: allow ref to entity anywhere
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/e8762af2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/e8762af2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/e8762af2
Branch: refs/heads/master
Commit: e8762af21c1567493d491a2e4a5ff26384026941
Parents: 88c36c3
Author: Aled Sage
Authored: Wed Oct 24 10:09:18 2018 +0100
Committer: Aled Sage
Committed: Wed Oct 24 10:09:18 2018 +0100
--
.../app/components/dsl-editor/dsl-editor.js | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e8762af2/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
index 3545ae5..707560b 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
@@ -319,15 +319,13 @@ export function dslEditorDirective($rootScope, $filter,
$log, brUtilsGeneral, bl
function getEntityItems(entity, type) {
let entities = [];
-if (entity.miscData.get('traits').some(trait => trait.match(type)) ||
!angular.isDefined(type)) {
-entities.push({
-id: entity._id,
-type: DSL_KINDS.ENTITY,
-entity: entity,
-name: entity.miscData.get('typeName') ||
$filter('entityName')(entity) || 'New application',
-description: entity.description
-});
-}
+entities.push({
+id: entity._id,
+type: DSL_KINDS.ENTITY,
+entity: entity,
+name: entity.miscData.get('typeName') ||
$filter('entityName')(entity) || 'New application',
+description: entity.description
+});
entities =
Object.values(entity.getClusterMemberspecEntities()).reduce((acc, spec) => {
return acc.concat(getEntityItems(spec, type));
[2/2] brooklyn-ui git commit: This closes #90
This closes #90 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/fb77f723 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/fb77f723 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/fb77f723 Branch: refs/heads/master Commit: fb77f723f6f0c4510c5cf715c72c46c276b670d8 Parents: add0cd4 e8762af Author: Thomas Bouron Authored: Wed Oct 24 15:12:21 2018 +0100 Committer: Thomas Bouron Committed: Wed Oct 24 15:12:21 2018 +0100 -- .../app/components/dsl-editor/dsl-editor.js | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) --
[3/4] brooklyn-ui git commit: component specific code moved downstream
component specific code moved downstream
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c5db2cb8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c5db2cb8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c5db2cb8
Branch: refs/heads/master
Commit: c5db2cb8c5bbb7e14b6842435ae72b263e4287d1
Parents: 2a4d31c
Author: frogfather
Authored: Fri Oct 26 10:02:04 2018 +0100
Committer: frogfather
Committed: Fri Oct 26 10:02:04 2018 +0100
--
.../spec-editor/spec-editor.directive.js| 108 +--
1 file changed, 52 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c5db2cb8/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
index df979d7..a5341b9 100644
---
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
+++
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
@@ -34,7 +34,7 @@ const ANY_MEMBERSPEC_REGEX = /(^.*[m,M]ember[s,S]pec$)/;
const REPLACED_DSL_ENTITYSPEC = '___brooklyn:entitySpec';
angular.module(MODULE_NAME, [onEnter, autoGrow, blurOnEnter,
brooklynDslEditor, brooklynDslViewer])
-.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'blueprintService', 'composerOverrides', specEditorDirective])
+.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'$compile', 'blueprintService', 'composerOverrides', specEditorDirective])
.filter('specEditorConfig', specEditorConfigFilter)
.filter('specEditorType', specEditorTypeFilter);
@@ -72,7 +72,7 @@ export const CONFIG_FILTERS = [
}
];
-export function specEditorDirective($rootScope, $templateCache, $injector,
$sanitize, $filter, $log, $sce, $timeout, $document, $state, blueprintService,
composerOverrides) {
+export function specEditorDirective($rootScope, $templateCache, $injector,
$sanitize, $filter, $log, $sce, $timeout, $document, $state, $compile,
blueprintService, composerOverrides) {
return {
restrict: 'E',
scope: {
@@ -83,7 +83,7 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
link: link,
controllerAs: 'specEditor',
};
-
+
function controller() {
// does very little currently, but link adds to this
return this;
@@ -95,7 +95,7 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
scope.FAMILIES = EntityFamily;
scope.RESERVED_KEYS = RESERVED_KEYS;
scope.REPLACED_DSL_ENTITYSPEC = REPLACED_DSL_ENTITYSPEC;
-
+
let defaultState = {
config: {
add: {
@@ -111,7 +111,7 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
// TODO would be nice to set null here, then have it go true
if there is filtered config
// but the collapsible widget doesn't seem to respond to
subsequent state changed
open: true,
-
+
dslViewerManualOverride: {},
codeModeActive: {},
codeModeForced: {},
@@ -131,12 +131,8 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
}
};
// allow downstream to configure this controller and/or scope
-(composerOverrides.configureSpecEditor || function() {})(this, $scope,
$element);
-var headerTemplate =
angular.element($templateCache.get('spec-editor/header.html'));
-if (headerTemplate){
-var compiledHTML = $compile(headerTemplate[0])(scope)
-
element[0].querySelector('.spec-type-header').append(compiledHTML[0]);
-}
+(composerOverrides.configureSpecEditor || function() {})(specEditor,
scope, element, $state, $compile, $templateCache);
+
scope.filters = {
config: CONFIG_FILTERS
};
@@ -144,7 +140,7 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
scope.onFilterClicked = (filter) => {
if (!scope.isFilterDisabled(filter))
scope.state.config.filter.values[ filter.id ] =
!scope.state.config.filter.values[ filter.id ];
};
-
+
scope.state = sessionStorage && sessionStorage.getItem(scope.model._id)
[1/4] brooklyn-ui git commit: spec editor hook
Repository: brooklyn-ui
Updated Branches:
refs/heads/master fb77f723f -> c2c63714d
spec editor hook
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/686369af
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/686369af
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/686369af
Branch: refs/heads/master
Commit: 686369afc97e52877caf4e6aed7513904759bca8
Parents: 88c36c3
Author: frogfather
Authored: Wed Oct 24 09:36:18 2018 +0100
Committer: frogfather
Committed: Wed Oct 24 09:47:52 2018 +0100
--
.../app/components/spec-editor/spec-editor.directive.js | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/686369af/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
index 7f2dcba..e1ef2b5 100644
---
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
+++
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
@@ -34,7 +34,7 @@ const ANY_MEMBERSPEC_REGEX = /(^.*[m,M]ember[s,S]pec$)/;
const REPLACED_DSL_ENTITYSPEC = '___brooklyn:entitySpec';
angular.module(MODULE_NAME, [onEnter, autoGrow, blurOnEnter,
brooklynDslEditor, brooklynDslViewer])
-.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'blueprintService', specEditorDirective])
+.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'blueprintService', composerOverrides, specEditorDirective])
.filter('specEditorConfig', specEditorConfigFilter)
.filter('specEditorType', specEditorTypeFilter);
@@ -72,7 +72,7 @@ export const CONFIG_FILTERS = [
}
];
-export function specEditorDirective($rootScope, $templateCache, $injector,
$sanitize, $filter, $log, $sce, $timeout, $document, $state, blueprintService) {
+export function specEditorDirective($rootScope, $templateCache, $injector,
$sanitize, $filter, $log, $sce, $timeout, $document, $state, blueprintService,
composerOverrides) {
return {
restrict: 'E',
scope: {
@@ -130,7 +130,13 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
open: false
}
};
-
+// allow downstream to configure this controller and/or scope
+(composerOverrides.configureSpecEditor || function() {})(this, $scope,
$element);
+var headerTemplate =
angular.element($templateCache.get('spec-editor/header.html'));
+if (headerTemplate){
+var compiledHTML = $compile(headerTemplate[0])(scope)
+
element[0].querySelector('.spec-type-header').append(compiledHTML[0]);
+}
scope.filters = {
config: CONFIG_FILTERS
};
[2/4] brooklyn-ui git commit: correct missing quotes
correct missing quotes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/2a4d31c6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/2a4d31c6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/2a4d31c6
Branch: refs/heads/master
Commit: 2a4d31c6345b653d7aa3aa7b669e5666e074ba9f
Parents: 686369a
Author: frogfather
Authored: Wed Oct 24 11:21:51 2018 +0100
Committer: frogfather
Committed: Wed Oct 24 11:21:51 2018 +0100
--
.../app/components/spec-editor/spec-editor.directive.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2a4d31c6/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
index e1ef2b5..df979d7 100644
---
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
+++
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
@@ -34,7 +34,7 @@ const ANY_MEMBERSPEC_REGEX = /(^.*[m,M]ember[s,S]pec$)/;
const REPLACED_DSL_ENTITYSPEC = '___brooklyn:entitySpec';
angular.module(MODULE_NAME, [onEnter, autoGrow, blurOnEnter,
brooklynDslEditor, brooklynDslViewer])
-.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'blueprintService', composerOverrides, specEditorDirective])
+.directive('specEditor', ['$rootScope', '$templateCache', '$injector',
'$sanitize', '$filter', '$log', '$sce', '$timeout', '$document', '$state',
'blueprintService', 'composerOverrides', specEditorDirective])
.filter('specEditorConfig', specEditorConfigFilter)
.filter('specEditorType', specEditorTypeFilter);
[4/4] brooklyn-ui git commit: This closes #89
This closes #89 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c2c63714 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c2c63714 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c2c63714 Branch: refs/heads/master Commit: c2c63714d6f3d883d2ebd3b4f008527a672eea2e Parents: fb77f72 c5db2cb Author: Thomas Bouron Authored: Mon Oct 29 12:13:36 2018 + Committer: Thomas Bouron Committed: Mon Oct 29 12:13:36 2018 + -- .../spec-editor/spec-editor.directive.js| 102 ++- 1 file changed, 52 insertions(+), 50 deletions(-) --
[1/2] brooklyn-ui git commit: Add callback for customising catalog save configuration
Repository: brooklyn-ui
Updated Branches:
refs/heads/master c2c63714d -> a359d463d
Add callback for customising catalog save configuration
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/39d3fbb3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/39d3fbb3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/39d3fbb3
Branch: refs/heads/master
Commit: 39d3fbb3c7f1ba541eda014706767bb50823155d
Parents: 88c36c3
Author: Andrew Donald Kennedy
Authored: Mon Oct 15 13:38:57 2018 +0100
Committer: Andrew Donald Kennedy
Committed: Wed Oct 24 14:02:52 2018 +0100
--
.../catalog-saver/catalog-saver.directive.js | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/39d3fbb3/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
index 5da6f77..cb6f0ea 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
@@ -23,8 +23,11 @@ import template from './catalog-saver.template.html';
import modalTemplate from './catalog-saver.modal.template.html';
import jsYaml from 'js-yaml';
import brUtils from 'brooklyn-ui-utils/utils/general';
+import {yamlState} from "../../views/main/yaml/yaml.state";
+import {graphicalState} from "../../views/main/graphical/graphical.state";
const MODULE_NAME = 'brooklyn.components.catalog-saver';
+
const REASONS = {
new: 0,
deploy: 1
@@ -39,12 +42,12 @@ const TYPES = [
];
angular.module(MODULE_NAME, [angularAnimate, uibModal, brUtils])
-.directive('catalogSaver', ['$rootScope', '$uibModal',
saveToCatalogModalDirective])
+.directive('catalogSaver', ['$rootScope', '$uibModal', '$injector',
'composerOverrides', saveToCatalogModalDirective])
.directive('catalogVersion', ['$parse', catalogVersionDirective]);
export default MODULE_NAME;
-export function saveToCatalogModalDirective($rootScope, $uibModal) {
+export function saveToCatalogModalDirective($rootScope, $uibModal, $injector,
composerOverrides) {
return {
restrict: 'E',
template: template,
@@ -54,11 +57,17 @@ export function saveToCatalogModalDirective($rootScope,
$uibModal) {
link: link
};
-function link($scope) {
+function link($scope, $element) {
$scope.buttonText = $scope.config.label || ($scope.config.itemType ?
`Update ${$scope.config.name || $scope.config.symbolicName}` : 'Add to
catalog');
+
+
$injector.get('$templateCache').put('catalog-saver.modal.template.html',
modalTemplate);
+
$scope.activateModal = () => {
+// Override callback to update catalog configuration data in other
applications
+$scope.config = (composerOverrides.updateCatalogConfig ||
(($scope, $element) => $scope.config))($scope, $element);
+
let modalInstance = $uibModal.open({
-template: modalTemplate,
+templateUrl: 'catalog-saver.modal.template.html',
size: 'save',
controller: ['$scope', 'blueprintService', 'paletteApi',
'brUtilsGeneral', CatalogItemModalController],
scope: $scope,
[2/2] brooklyn-ui git commit: This closes #91
This closes #91 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/a359d463 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/a359d463 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/a359d463 Branch: refs/heads/master Commit: a359d463d8d01b0840a128889ddd40b7f1f8579e Parents: c2c6371 39d3fbb Author: Thomas Bouron Authored: Tue Oct 30 13:28:00 2018 + Committer: Thomas Bouron Committed: Tue Oct 30 13:28:00 2018 + -- .../catalog-saver/catalog-saver.directive.js | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) --
[02/10] brooklyn-ui git commit: dynamically compute pagination limit for palette based on height
dynamically compute pagination limit for palette based on height
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/63031129
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/63031129
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/63031129
Branch: refs/heads/master
Commit: 63031129ce1a972bda8c049f9518c6c17e232f85
Parents: 5ea0aae
Author: Alex Heneveld
Authored: Wed Oct 24 13:37:39 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 13:37:39 2018 +0100
--
.../catalog-selector.directive.js | 39 +---
.../catalog-selector/catalog-selector.less | 3 +-
.../catalog-selector.template.html | 15 +---
.../views/main/graphical/graphical.state.html | 5 ++-
.../app/views/main/graphical/graphical.state.js | 1 -
.../views/main/graphical/graphical.state.less | 11 ++
6 files changed, 59 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/63031129/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 32fdd1c..a2a2948 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -20,7 +20,7 @@ import angular from 'angular';
import {EntityFamily} from '../util/model/entity.model';
import template from './catalog-selector.template.html';
-const ITEMS_PER_PAGE = 30;
+const MIN_ITEMS_PER_PAGE = 16;
// fields in either bundle or type record:
const FIELDS_TO_SEARCH = ['name', 'displayName', 'symbolicName', 'version',
'type', 'supertypes', 'containingBundle', 'description', 'displayTags', 'tags'];
@@ -35,10 +35,38 @@ export function catalogSelectorDirective() {
mode: '@?', // for use by downstream projects to pass in special
modes
},
template: template,
-controller: ['$scope', '$element', '$q', '$uibModal', '$log',
'$templateCache', 'paletteApi', 'paletteDragAndDropService', 'iconGenerator',
'composerOverrides', controller]
+controller: ['$scope', '$element', '$timeout', '$q', '$uibModal',
'$log', '$templateCache', 'paletteApi', 'paletteDragAndDropService',
'iconGenerator', 'composerOverrides', controller],
+link: link,
};
}
+function link($scope, $element, attrs, controller) {
+let main =
angular.element($element[0].querySelector(".catalog-palette-main"));
+
+// repaginate when load completes (and items are shown), or it is resized
+$scope.$watchGroup([ () => $scope.isLoading, () => main[0].offsetHeight ],
+(values) => controller.$timeout( () => {
+//console.log("WATCHED RESIZE TIMEOUT", new Date(), main,
main[0].offsetHeight, $scope.isLoading);
+repaginate($scope, $element);
+} )
+);
+// also repaginate on window resize
+angular.element(window).bind('resize', () => repaginate($scope, $element));
+
+}
+
+function repaginate($scope, $element) {
+let main =
angular.element($element[0].querySelector(".catalog-palette-main"));
+if (!main || main[0].offsetHeight==0 || $scope.itemsPerPage) {
+// console.log("no main or hidden or items per page fixed");
+return;
+}
+let header =
angular.element(main[0].querySelector(".catalog-palette-header"));
+let footer =
angular.element(main[0].querySelector(".catalog-palette-footer"));
+$scope.$apply( () =>
+$scope.pagination.itemsPerPage = Math.max(MIN_ITEMS_PER_PAGE,
Math.floor( (main[0].offsetHeight - header[0].offsetHeight -
footer[0].offsetHeight - 4) / 96) * 4) );
+}
+
export function catalogSelectorSearchFilter() {
return function (items, search) {
if (search) {
@@ -108,10 +136,11 @@ export function catalogSelectorSortFilter($filter) {
}
}
-function controller($scope, $element, $q, $uibModal, $log, $templateCache,
paletteApi, paletteDragAndDropService, iconGenerator, composerOverrides) {
+function controller($scope, $element, $timeout, $q, $uibModal, $log,
$templateCache, paletteApi, paletteDragAndDropService, iconGenerator,
composerOverrides) {
+this.$timeout = $timeout;
$scope.pagination = {
page: 1,
-itemsPerPage: $scope.itemsPerPage || ITEMS_PER_PAGE
+itemsPerPage: $scope.itemsPerPage || MIN_ITEMS_PER_PAGE
};
$scope.state = {
orders: ['name', 'type', 'id'],
@@ -127,7 +156,7 @@ function
[05/10] brooklyn-ui git commit: share palette view state among all palettes
share palette view state among all palettes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/6ccc2b1a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/6ccc2b1a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/6ccc2b1a
Branch: refs/heads/master
Commit: 6ccc2b1af2c7c9953a113fb0e6346c60b8ae3fee
Parents: 7670595
Author: Alex Heneveld
Authored: Wed Oct 24 16:08:57 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 16:13:22 2018 +0100
--
.../catalog-selector/catalog-selector.directive.js | 13 +++--
.../catalog-selector/catalog-selector.template.html| 2 +-
.../app/views/main/graphical/graphical.state.html | 2 +-
.../app/views/main/graphical/graphical.state.js| 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/6ccc2b1a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index df0c739..7c9a16d 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -39,6 +39,7 @@ export function catalogSelectorDirective() {
onSelect: '&',
rowsPerPage: '<', // if unset then fill
reservedKeys: 'http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/6ccc2b1a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
index 7159b80..0b87153 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
@@ -46,7 +46,7 @@
Sort
-
+
{{order | capitalize}}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/6ccc2b1a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
index 5ee0f88..7dc0d79 100644
---
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
+++
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
@@ -42,7 +42,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/6ccc2b1a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.js
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.js
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.js
index 40a123d..d4fe313 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.js
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.js
@@ -40,6 +40,7 @@ function graphicalController($scope, $state,
blueprintService, paletteService) {
this.sections = paletteService.getSections();
this.selectedSection = Object.values(this.sections).find(section =>
section.type === EntityFamily.ENTITY);
+$scope.state = {}; // share state among all sections
this.onTypeSelected = (selectedType)=> {
let rootEntity = blueprintService.get();
[01/10] brooklyn-ui git commit: rename btn-ouline to btn-outline
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 80a07759b -> 3226dbbb8
rename btn-ouline to btn-outline
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/5ea0aae0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/5ea0aae0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/5ea0aae0
Branch: refs/heads/master
Commit: 5ea0aae0c29fa37f8efd61363d5a04c343b7bf01
Parents: 88c36c3
Author: Alex Heneveld
Authored: Wed Oct 24 10:25:29 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 10:25:29 2018 +0100
--
.../app/components/catalog-saver/catalog-saver.template.html | 2 +-
ui-modules/blueprint-composer/app/index.js | 2 +-
ui-modules/utils/br-core/style/buttons.less | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5ea0aae0/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.template.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.template.html
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.template.html
index 5191472..4ba6309 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.template.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.template.html
@@ -16,4 +16,4 @@
specific language governing permissions and limitations
under the License.
-->
-{{buttonText}}
\ No newline at end of file
+{{buttonText}}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5ea0aae0/ui-modules/blueprint-composer/app/index.js
--
diff --git a/ui-modules/blueprint-composer/app/index.js
b/ui-modules/blueprint-composer/app/index.js
index d7eb860..9f0472d 100755
--- a/ui-modules/blueprint-composer/app/index.js
+++ b/ui-modules/blueprint-composer/app/index.js
@@ -130,7 +130,7 @@ function composerOverridesProvider() {
}
function actionConfig(actionServiceProvider) {
-actionServiceProvider.addAction("deploy", {html: 'Deploy'});
+actionServiceProvider.addAction("deploy", {html: 'Deploy'});
actionServiceProvider.addAction("add", {html: ''});
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5ea0aae0/ui-modules/utils/br-core/style/buttons.less
--
diff --git a/ui-modules/utils/br-core/style/buttons.less
b/ui-modules/utils/br-core/style/buttons.less
index a74ef32..e87dbc3 100644
--- a/ui-modules/utils/br-core/style/buttons.less
+++ b/ui-modules/utils/br-core/style/buttons.less
@@ -24,7 +24,7 @@
.button-variant(@btn-accent-color; @btn-accent-bg; @btn-accent-border);
}
-.btn-ouline {
+.btn-outline {
&.btn-primary:not(:hover) {
background-color: transparent;
color: @brand-primary;
@@ -49,4 +49,4 @@
background-color: transparent;
color: @brand-danger;
}
-}
\ No newline at end of file
+}
[09/10] brooklyn-ui git commit: css so add member spec use of palette can share format
css so add member spec use of palette can share format
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/046c6560
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/046c6560
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/046c6560
Branch: refs/heads/master
Commit: 046c65601e1ed314db55ce96fc6de8d6bc9e44e6
Parents: fb275c6
Author: Alex Heneveld
Authored: Thu Oct 25 10:54:57 2018 +0100
Committer: Alex Heneveld
Committed: Thu Oct 25 10:54:57 2018 +0100
--
.../app/views/main/graphical/edit/add/add.html | 16 +++-
.../views/main/graphical/graphical.state.html | 16 +++-
.../views/main/graphical/graphical.state.less | 27 +---
3 files changed, 43 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/046c6560/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
index 89c2978..dfabeaf 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
@@ -16,11 +16,13 @@
specific language governing permissions and limitations
under the License.
-->
+
+
{{getParentLinkLabel()}}
-
+
-
-
-
-
+
@@ -46,6 +45,9 @@
-
+
-
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/046c6560/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
index e78b273..fd69c55 100644
---
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
+++
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
@@ -17,7 +17,9 @@
under the License.
-->
-
+
+
+
-
+
-
+
@@ -44,8 +46,10 @@
-
+
-
+
-
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/046c6560/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
index 92ae74e..543b229 100644
---
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
+++
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
@@ -19,7 +19,12 @@
.layout {
display: flex;
+ designer {
+flex-grow: 1;
+ }
+}
+.palette-and-or-toolbar {
.toolbar {
position: relative;
height: calc(~"100vh - 105px");
@@ -59,9 +64,6 @@
}
}
- designer {
-flex-grow: 1;
- }
}
.pane {
@@ -118,6 +120,25 @@
padding: 0;
}
+.add-panel {
+display: flex;
+flex-direction: column;
+> .spec-parent {
+flex: 0 0 auto;
+}
+> .add-panel-main {
+flex: 1 1 auto;
+display: flex;
+flex-direction: row;
+.toolbar {
+flex: 0 0 auto;
+}
+.pane-palette {
+flex: 1 1 auto;
+}
+}
+}
+
.spec-parent {
a {
background-color: @gray-lighter;
[07/10] brooklyn-ui git commit: make member spec selector act like main catalog palette, filtered for type
make member spec selector act like main catalog palette, filtered for type
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/ca6d09c3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/ca6d09c3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/ca6d09c3
Branch: refs/heads/master
Commit: ca6d09c32e5ffedc2291aa7bfbb2b8b4af2cf8ef
Parents: 977e6a3
Author: Alex Heneveld
Authored: Wed Oct 24 17:37:24 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 17:37:24 2018 +0100
--
.../catalog-selector.directive.js | 2 +-
.../app/views/main/graphical/edit/add/add.html | 30 ++--
.../app/views/main/graphical/edit/add/add.js| 14 +
.../views/main/graphical/graphical.state.html | 2 +-
.../app/views/main/graphical/graphical.state.js | 2 +-
.../views/main/graphical/graphical.state.less | 7 -
6 files changed, 45 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/ca6d09c3/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index d1d2e8c..b8ec6df 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -70,7 +70,7 @@ function repaginate($scope, $element) {
}
let header =
angular.element(main[0].querySelector(".catalog-palette-header"));
let footer =
angular.element(main[0].querySelector(".catalog-palette-footer"));
-rowsPerPage = Math.max(MIN_ROWS_PER_PAGE, Math.floor(
(main[0].offsetHeight - header[0].offsetHeight - footer[0].offsetHeight) /
($scope.state.viewMode.rowHeightPx || 96)) );
+rowsPerPage = Math.max(MIN_ROWS_PER_PAGE, Math.floor(
(main[0].offsetHeight - header[0].offsetHeight - footer[0].offsetHeight - 16) /
($scope.state.viewMode.rowHeightPx || 96)) );
}
$scope.$apply( () => $scope.pagination.itemsPerPage = rowsPerPage *
$scope.state.viewMode.itemsPerRow );
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/ca6d09c3/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
index 4e74a85..89c2978 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.html
@@ -20,8 +20,32 @@
{{getParentLinkLabel()}}
-
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+{{section.title}}
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/ca6d09c3/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
index efe8a02..c1f2e5b 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
@@ -27,17 +27,18 @@ export const graphicalEditAddState = {
name: 'main.graphical.edit.add',
url: '/add/:family?configKey',
template: template,
-controller: ['$scope', '$filter', '$state', '$stateParams',
'blueprintService', GraphicalEditAddController],
+controller: ['$scope', '$filter', '$state', '$stateParams',
'blueprintService', 'paletteService', GraphicalEditAddController],
controllerAs: 'vm',
};
-export function GraphicalEditAddController($scope, $filter, $state,
$stateParams, blueprintService) {
+export function GraphicalEditAddController($scope, $filter, $state,
$stateParams, blueprintService, paletteService) {
switch ($stateParams.family) {
case EntityFamily.ENTITY.id.toLowerCase():
$scope.family = EntityFamily.ENTITY;
break;
case EntityFamily.SPEC.id.toLowerCase():
$scope.family = EntityFamily.SPEC;
+$scope.familiesToShow = [ EntityFamily.ENTITY, EntityFamily.SPEC ];
$scope.configKey = $stateParams.config
[03/10] brooklyn-ui git commit: minor styling changes to make palette nicer
minor styling changes to make palette nicer
esp for drag and to work with multi-width
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/3db686cf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/3db686cf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/3db686cf
Branch: refs/heads/master
Commit: 3db686cf3da05948d781c25ce2bb12ecac53232b
Parents: 6303112
Author: Alex Heneveld
Authored: Wed Oct 24 14:45:34 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 14:45:34 2018 +0100
--
.../catalog-selector.directive.js | 2 +-
.../catalog-selector/catalog-selector.less | 22
2 files changed, 19 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/3db686cf/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index a2a2948..b717213 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -64,7 +64,7 @@ function repaginate($scope, $element) {
let header =
angular.element(main[0].querySelector(".catalog-palette-header"));
let footer =
angular.element(main[0].querySelector(".catalog-palette-footer"));
$scope.$apply( () =>
-$scope.pagination.itemsPerPage = Math.max(MIN_ITEMS_PER_PAGE,
Math.floor( (main[0].offsetHeight - header[0].offsetHeight -
footer[0].offsetHeight - 4) / 96) * 4) );
+$scope.pagination.itemsPerPage = Math.max(MIN_ITEMS_PER_PAGE,
Math.floor( (main[0].offsetHeight - header[0].offsetHeight -
footer[0].offsetHeight) / 96) * 4) );
}
export function catalogSelectorSearchFilter() {
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/3db686cf/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
index 53ec6e2..7a0b188 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
@@ -26,6 +26,8 @@ catalog-selector {
.grid {
margin-bottom: 15px;
+padding-left: 10px;
+padding-right: 10px;
}
.pagination {
margin-top: 0;
@@ -39,6 +41,10 @@ catalog-selector {
.catalog-palette-item {
padding-left: 5px;
padding-right: 5px;
+height: 96px;
+ }
+ .catalog-palette-footer {
+padding-bottom: 5px;
}
.item {
@@ -48,10 +54,17 @@ catalog-selector {
transition: all @duration-item ease;
position: relative;
background: white; //useful when dragging
-box-shadow: 0 0 rgba(0, 0, 0, 0.1), 0 1px 2px 1px rgba(0, 0, 0, 0.2);
+box-shadow: 0 0 rgba(0, 0, 0, 0.1), 0 0 2px 1px rgba(0, 0, 0, 0.2);
&:hover {
- box-shadow: 0 0 rgba(0, 0, 0, 0.2), 0 2px 4px 1px rgba(0, 0, 0, 0.2);
- transform: scale(1.1);
+ box-shadow: 0 0 rgba(0, 0, 0, 0.2), 0 0 4px 1px rgba(0, 0, 0, 0.5);
+ margin: -2px;
+ padding: 5px;
+
+ margin-top: 7px;
+ margin-bottom: -2px;
+ padding-top: 3px;
+ padding-bottom: 7px;
+ // transform: scaleY(1.1);
.fa-info-circle {
opacity: 1;
@@ -61,9 +74,10 @@ catalog-selector {
position: absolute;
top: 0;
left: 0;
+margin: 0;
+border: 3px solid @brand-primary;
width: 100%;
height: 100%;
-transform: scale(1.15);
}
.fa-info-circle {
[08/10] brooklyn-ui git commit: support 'mode' parameter for sections
support 'mode' parameter for sections
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/fb275c64
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/fb275c64
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/fb275c64
Branch: refs/heads/master
Commit: fb275c64f693fd9fcf2c1c83e26a65e96a3ee6aa
Parents: ca6d09c
Author: Alex Heneveld
Authored: Thu Oct 25 10:28:09 2018 +0100
Committer: Alex Heneveld
Committed: Thu Oct 25 10:28:09 2018 +0100
--
.../app/components/providers/palette-service.provider.js | 1 +
.../app/views/main/graphical/graphical.state.html | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/fb275c64/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
index 6062a2c..20f29ef 100644
---
a/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
@@ -48,6 +48,7 @@ class PaletteService {
constructor(sectionsToAdd) {
this.sections = {};
this.requiredFields = ['title', 'type', 'icon'];
+// 'mode' is optional
for (const [id, section] of Object.entries(sectionsToAdd)) {
this.addSection(id, section);
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/fb275c64/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
index dcb5060..e78b273 100644
---
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
+++
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.html
@@ -42,7 +42,7 @@
-
+
[06/10] brooklyn-ui git commit: tidy dropdown and other composer styling
tidy dropdown and other composer styling
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/977e6a3d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/977e6a3d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/977e6a3d
Branch: refs/heads/master
Commit: 977e6a3dcecaa9f3df338c5b4a8b7cc5e6efb2e0
Parents: 6ccc2b1
Author: Alex Heneveld
Authored: Wed Oct 24 16:43:23 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 16:43:23 2018 +0100
--
.../catalog-selector.directive.js | 2 +-
.../providers/palette-service.provider.js | 2 ++
.../blueprint-composer/app/views/main/main.less | 20 ++--
.../app/views/main/main.template.html | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/977e6a3d/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 7c9a16d..d1d2e8c 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -177,7 +177,7 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
symbolicName: $scope.search,
name: $scope.search,
displayName: $scope.search,
-supertypes: [$scope.family.superType]
+supertypes: ($scope.family ? [ $scope.family.superType ] : []),
};
});
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/977e6a3d/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
index 8529888..6062a2c 100644
---
a/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/palette-service.provider.js
@@ -37,7 +37,9 @@ export function paletteServiceProvider() {
sections[id] = section;
},
deleteSection(id) {
+let old = sections[id];
delete sections[id];
+return old;
}
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/977e6a3d/ui-modules/blueprint-composer/app/views/main/main.less
--
diff --git a/ui-modules/blueprint-composer/app/views/main/main.less
b/ui-modules/blueprint-composer/app/views/main/main.less
index 9a539b8..06e390b 100644
--- a/ui-modules/blueprint-composer/app/views/main/main.less
+++ b/ui-modules/blueprint-composer/app/views/main/main.less
@@ -24,6 +24,10 @@
border-radius: 0;
border-color: @navbar-default-border;
z-index: 50;
+
+ .container-fluid.flush-left {
+padding-left: 0;
+ }
.navbar-nav > li > a {
color: @gray-lighter;
@@ -35,11 +39,16 @@
.navbar-nav-mode > .active > a:hover,
.navbar-nav-mode > .active > a:focus {
border-bottom: 5px solid @brand-primary;
+background-color: #66;
& > i.fa {
color: @brand-primary;
}
}
+
+ custom-action {
+margin-left: 8px;
+ }
}
.page-main-area {
@@ -59,10 +68,10 @@
}
.layer a {
cursor: pointer;
-color: @gray-lighter;
+color: @gray-light;
transition: color 0.3s ease;
&:hover {
- color: @gray-light;
+ color: @gray-dark;
}
}
.layer.active a {
@@ -71,6 +80,13 @@
color: @brand-primary;
}
}
+ .dropdown-header {
+background: @gray;
+color: @gray-lighter;
+font-weight: bold;
+text-align: center;
+padding-top: 7px;
+ }
.tab-content {
width: 100%;
background: transparent;
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/977e6a3d/ui-modules/blueprint-composer/app/views/main/main.template.html
--
diff --git a/ui-modules/blueprint-composer/app/views/main/main.template.html
b/ui-modules/blueprint-composer/app/views/main/main.template.html
index 3fa92b4..c1c241b 100644
--- a/ui-modules/blueprint-composer/app/views/main/main.template.html
+++ b/ui-modules/blueprint-composer/app/views/main/main.template.html
@@ -19,7 +19,7 @@
-
+
[04/10] brooklyn-ui git commit: allow palette to have view mode customised to show 6, 4, 3, or 1 item per row
allow palette to have view mode customised to show 6, 4, 3, or 1 item per row
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/76705958
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/76705958
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/76705958
Branch: refs/heads/master
Commit: 7670595878a6eb46701c45c67bce1327e443960b
Parents: 3db686c
Author: Alex Heneveld
Authored: Wed Oct 24 15:45:34 2018 +0100
Committer: Alex Heneveld
Committed: Wed Oct 24 15:48:44 2018 +0100
--
.../catalog-selector.directive.js | 56
.../catalog-selector/catalog-selector.less | 33 +++-
.../catalog-selector.template.html | 17 --
.../views/main/graphical/graphical.state.less | 2 +
4 files changed, 80 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/76705958/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index b717213..df0c739 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -20,7 +20,14 @@ import angular from 'angular';
import {EntityFamily} from '../util/model/entity.model';
import template from './catalog-selector.template.html';
-const MIN_ITEMS_PER_PAGE = 16;
+const MIN_ROWS_PER_PAGE = 4;
+
+const PALETTE_VIEW_MODES = {
+ compact: { name: "Compact", classes: "col-xs-2 item-compact", itemsPerRow:
6, rowHeightPx: 75, hideName: true },
+ normal: { name: "Normal", classes: "col-xs-3", itemsPerRow: 4 },
+ large: { name: "Large", classes: "col-xs-4", itemsPerRow: 3 },
+ list: { name: "List", classes: "col-xs-12 item-full-width", itemsPerRow: 1 }
};
+
// fields in either bundle or type record:
const FIELDS_TO_SEARCH = ['name', 'displayName', 'symbolicName', 'version',
'type', 'supertypes', 'containingBundle', 'description', 'displayTags', 'tags'];
@@ -30,7 +37,7 @@ export function catalogSelectorDirective() {
scope: {
family: '<',
onSelect: '&',
-itemsPerPage: '<',
+rowsPerPage: '<', // if unset then fill
reservedKeys: ' $scope.isLoading, () => main[0].offsetHeight ],
-(values) => controller.$timeout( () => {
-//console.log("WATCHED RESIZE TIMEOUT", new Date(), main,
main[0].offsetHeight, $scope.isLoading);
-repaginate($scope, $element);
-} )
-);
+$scope.$watchGroup(
+[ () => $scope.isLoading, () => main[0].offsetHeight, () =>
$scope.state.viewMode.itemsPerRow ],
+(values) => controller.$timeout( () => repaginate($scope, $element) )
);
// also repaginate on window resize
angular.element(window).bind('resize', () => repaginate($scope, $element));
}
function repaginate($scope, $element) {
-let main =
angular.element($element[0].querySelector(".catalog-palette-main"));
-if (!main || main[0].offsetHeight==0 || $scope.itemsPerPage) {
-// console.log("no main or hidden or items per page fixed");
-return;
+let rowsPerPage = $scope.rowsPerPage;
+if (!rowsPerPage) {
+let main =
angular.element($element[0].querySelector(".catalog-palette-main"));
+if (!main || main[0].offsetHeight==0) {
+// console.log("no main or hidden or items per page fixed");
+return;
+}
+let header =
angular.element(main[0].querySelector(".catalog-palette-header"));
+let footer =
angular.element(main[0].querySelector(".catalog-palette-footer"));
+rowsPerPage = Math.max(MIN_ROWS_PER_PAGE, Math.floor(
(main[0].offsetHeight - header[0].offsetHeight - footer[0].offsetHeight) /
($scope.state.viewMode.rowHeightPx || 96)) );
}
-let header =
angular.element(main[0].querySelector(".catalog-palette-header"));
-let footer =
angular.element(main[0].querySelector(".catalog-palette-footer"));
-$scope.$apply( () =>
-$scope.pagination.itemsPerPage = Math.max(MIN_ITEMS_PER_PAGE,
Math.floor( (main[0].offsetHeight - header[0].offsetHeight -
footer[0].offsetHeight) / 96) * 4) );
+$scope.$apply( () => $scope.pagination.itemsPerPage = rowsPerPage *
$scope.state.viewMode.itemsPerRow );
}
export function catalogSelectorSearchFilter() {
@@ -138,14 +145,19 @@ export function catalogSelectorSortFilter($filter) {
function controller($sc
[10/10] brooklyn-ui git commit: This closes #93
This closes #93 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/3226dbbb Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/3226dbbb Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/3226dbbb Branch: refs/heads/master Commit: 3226dbbb88ede5bd5756af4a6bd203d76f9fa3f1 Parents: 80a0775 046c656 Author: Thomas Bouron Authored: Tue Oct 30 17:33:36 2018 + Committer: Thomas Bouron Committed: Tue Oct 30 17:33:36 2018 + -- .../catalog-saver/catalog-saver.template.html | 2 +- .../catalog-selector.directive.js | 66 .../catalog-selector/catalog-selector.less | 56 +++-- .../catalog-selector.template.html | 34 ++ .../providers/palette-service.provider.js | 3 + ui-modules/blueprint-composer/app/index.js | 2 +- .../app/views/main/graphical/edit/add/add.html | 32 +- .../app/views/main/graphical/edit/add/add.js| 14 +++-- .../views/main/graphical/graphical.state.html | 21 --- .../app/views/main/graphical/graphical.state.js | 2 +- .../views/main/graphical/graphical.state.less | 47 -- .../blueprint-composer/app/views/main/main.less | 20 +- .../app/views/main/main.template.html | 2 +- ui-modules/utils/br-core/style/buttons.less | 4 +- 14 files changed, 248 insertions(+), 57 deletions(-) --
[08/11] brooklyn-ui git commit: use pluralize, tidy messages and formatting for palette filter esp when empty
use pluralize, tidy messages and formatting for palette filter esp when empty
(no more lemon, now use null symbol)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/9a22b64c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/9a22b64c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/9a22b64c
Branch: refs/heads/master
Commit: 9a22b64cb731b8721bfcc901d9de742e16c2db2e
Parents: e878847
Author: Alex Heneveld
Authored: Tue Oct 30 13:18:25 2018 +
Committer: Alex Heneveld
Committed: Tue Oct 30 13:18:25 2018 +
--
.../catalog-selector-palette-footer.html| 22 +---
.../catalog-selector/catalog-selector.less | 11 +-
2 files changed, 19 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/9a22b64c/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector-palette-footer.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector-palette-footer.html
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector-palette-footer.html
index 7ae9cc0..fd13c2a 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector-palette-footer.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector-palette-footer.html
@@ -17,14 +17,15 @@
under the License.
-->
-
-
+
+ΓΈ
-
+
-{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }} item{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length > 1 ? 's' : ''}}
+{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }}
+
matching search but excluded by filters.
Clear filters
@@ -34,23 +35,28 @@
-No matches with selected filters.
+No matches with selected filters.
Showing matches ignoring filters.
-{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }} more item{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length > 1 ? 's' : ''}}
+{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }} more
+
matching search but excluded by filters.
Clear filters
+
+Nothing available.
+
-Nothing available in selected filters.
+Nothing available in selected
filters.
Ignoring filters.
-{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }} more item{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length > 1 ? 's' : ''}}
+{{ itemsBeforeActiveFilters.length -
itemsAfterActiveFilters.length }} more
+
excluded by filters.
Clear filters
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/9a22b64c/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
index 969ac1f..d22ef1f 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
@@ -166,10 +166,6 @@ catalog-selector {
margin-top: 3px;
margin-bottom: 3px;
}
- .no-match {
-margin-top: 12px;
-font-style: italic;
- }
.spinner-area {
height: 300px;
@@ -224,10 +220,13 @@ catalog-selector {
margin-left: 1em;
}
.no-match {
+ text-align: center;
+ font-size: 120%;
+}
+.no-match.icon {
font-size: 8em;
margin-top: 24px;
- margin-bottom: 36px;
- text-align: center;
+ margin-bottom: 6px;
color: @gray-lighter;
}
}
[11/11] brooklyn-ui git commit: This closes #94
This closes #94 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/a0cddab1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/a0cddab1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/a0cddab1 Branch: refs/heads/master Commit: a0cddab1767345035c24ec6e9b68bd06d1a7a629 Parents: 3226dbb 5f24789 Author: Thomas Bouron Authored: Tue Oct 30 17:35:47 2018 + Committer: Thomas Bouron Committed: Tue Oct 30 17:35:47 2018 + -- docs/customizations.md | 5 +- .../catalog-selector-palette-footer.html| 66 +++ .../catalog-selector.directive.js | 171 --- .../catalog-selector/catalog-selector.less | 37 +++- .../catalog-selector.template.html | 74 +--- .../providers/recently-used-service.provider.js | 63 +++ ui-modules/blueprint-composer/app/index.js | 6 +- .../app/views/main/graphical/edit/add/add.js| 4 +- .../views/main/graphical/graphical.state.less | 60 +++ ui-modules/blueprint-composer/package.json | 1 + 10 files changed, 401 insertions(+), 86 deletions(-) --
[10/11] brooklyn-ui git commit: address PR comments on #93
address PR comments on #93
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/5f24789f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/5f24789f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/5f24789f
Branch: refs/heads/master
Commit: 5f24789f50093784c5db7a4db55f06e8340b731d
Parents: 0af5dc4
Author: Alex Heneveld
Authored: Tue Oct 30 14:34:05 2018 +
Committer: Alex Heneveld
Committed: Tue Oct 30 14:34:05 2018 +
--
.../components/catalog-selector/catalog-selector.directive.js| 4 ++--
.../blueprint-composer/app/views/main/graphical/edit/add/add.js | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5f24789f/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 2959103..60f7beb 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -47,7 +47,7 @@ export function catalogSelectorDirective() {
scope: {
family: '<',
onSelect: '&',
-rowsPerPage: '<', // if unset then fill
+rowsPerPage: 'http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/5f24789f/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
index c1f2e5b..e409655 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/edit/add/add.js
@@ -52,7 +52,9 @@ export function GraphicalEditAddController($scope, $filter,
$state, $stateParams
break;
}
-if (!$scope.familiesToShow) $scope.familiesToShow = [ $scope.family ];
+if (!$scope.familiesToShow) {
+$scope.familiesToShow = [ $scope.family ];
+}
this.sections = paletteService.getSections();
this.selectedSection = Object.values(this.sections).find(section =>
$scope.familiesToShow.indexOf(section.type) >= 0);
[01/11] brooklyn-ui git commit: palette allows filters to be specified, with placeholder for recent
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 3226dbbb8 -> a0cddab17
palette allows filters to be specified, with placeholder for recent
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b4a13961
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/b4a13961
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/b4a13961
Branch: refs/heads/master
Commit: b4a13961dd8bffc169363cf936ef694e256237af
Parents: 046c656
Author: Alex Heneveld
Authored: Thu Oct 25 14:25:23 2018 +0100
Committer: Alex Heneveld
Committed: Thu Oct 25 15:47:20 2018 +0100
--
.../catalog-selector.directive.js | 28 -
.../catalog-selector.template.html | 65 +++-
.../views/main/graphical/graphical.state.less | 60 ++
3 files changed, 136 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4a13961/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index b8ec6df..3e9097c 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -57,7 +57,6 @@ function link($scope, $element, attrs, controller) {
(values) => controller.$timeout( () => repaginate($scope, $element) )
);
// also repaginate on window resize
angular.element(window).bind('resize', () => repaginate($scope, $element));
-
}
function repaginate($scope, $element) {
@@ -272,6 +271,32 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
});
$scope.items = items;
});
+$scope.showPaletteControls = false;
+$scope.onFiltersShown = () => {
+ $timeout( () => {
+// check do we need to show the multiline
+let filters = angular.element($element[0].querySelector(".filters"));
+$scope.$apply( () => $scope.filterSettings.filtersMultilineAvailable =
filters[0].scrollHeight > filters[0].offsetHeight );
+
+repaginate($scope, $element);
+ } );
+};
+$scope.togglePaletteControls = () => {
+$scope.showPaletteControls = !$scope.showPaletteControls;
+$timeout( () => repaginate($scope, $element) );
+}
+$scope.toggleShowAllFilters = () => {
+$scope.filterSettings.showAllFilters =
!$scope.filterSettings.showAllFilters;
+$timeout( () => repaginate($scope, $element) );
+};
+$scope.filterSettings = {};
+
+$scope.filters = [
+// TODO determine recent ones, set some default recent ones
+{ label: 'Recent', icon: 'clock-o', title: "Recently used and standard
favorites", filterFn: item => item.displayTags.includes("RECENT"), enabled:
false },
+];
+$scope.disableFilters = () => $scope.filters.forEach( f => f.enabled =
false );
+
// this can be overridden for third-party filters.
// it receives result of filtering based on search so filters can adjust
based on number of search resullts
$scope.filterPaletteItems = (items) => items;
@@ -286,5 +311,4 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
// allow downstream to configure this controller and/or scope
(composerOverrides.configurePaletteController || function() {})(this,
$scope, $element);
-$scope.paletteItemClasses = "col-xs-3";
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4a13961/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
index 0b87153..db3e188 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
@@ -34,22 +34,11 @@
-
-
-
+
+
+
-{{filters | json}}
-
-View
-
- {{view.name}}
-
[07/11] brooklyn-ui git commit: height can vary by a few px depending on pads etc so be slightly more generous with max to prevent multiline from kicking in
height can vary by a few px depending on pads etc so be slightly more generous
with max to prevent multiline from kicking in
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/e8788475
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/e8788475
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/e8788475
Branch: refs/heads/master
Commit: e8788475e371f6af5da76bf9774f0a144dc1b176
Parents: ee8bc89
Author: Alex Heneveld
Authored: Tue Oct 30 13:00:42 2018 +
Committer: Alex Heneveld
Committed: Tue Oct 30 13:01:42 2018 +
--
.../app/components/catalog-selector/catalog-selector.directive.js | 2 +-
.../app/views/main/graphical/graphical.state.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e8788475/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index efe0861..109bf45 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -259,7 +259,7 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
$timeout( () => {
// check do we need to show the multiline
let filters = angular.element($element[0].querySelector(".filters"));
-$scope.$apply( () => $scope.filterSettings.filtersMultilineAvailable =
filters[0].scrollHeight > filters[0].offsetHeight );
+$scope.$apply( () => $scope.filterSettings.filtersMultilineAvailable =
filters[0].scrollHeight > filters[0].offsetHeight + 6 );
repaginate($scope, $element);
} );
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e8788475/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
--
diff --git
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
index 2d71564..3e5c5b8 100644
---
a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
+++
b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
@@ -82,7 +82,7 @@
display: flex;
flex-wrap: wrap;
-max-height: 24px; // if things wrap hide them
+max-height: 27px; // if things wrap hide them
&.multiline { // unless toggled multiline
max-height: max-content;
}
[03/11] brooklyn-ui git commit: "Recent" filter shows a page-full of most recent items
"Recent" filter shows a page-full of most recent items
last used shown in popup, and a tag can be used to preselect items for
inclusion in the "recent" view
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/44262c88
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/44262c88
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/44262c88
Branch: refs/heads/master
Commit: 44262c886c3125c261cd58217d66fea4e498d63b
Parents: 17e120c
Author: Alex Heneveld
Authored: Fri Oct 26 10:05:16 2018 +0100
Committer: Alex Heneveld
Committed: Fri Oct 26 10:46:54 2018 +0100
--
docs/customizations.md | 5 +-
.../catalog-selector.directive.js | 55 +---
.../catalog-selector/catalog-selector.less | 6 ++-
.../catalog-selector.template.html | 6 ++-
.../providers/recently-used-service.provider.js | 9 ++--
ui-modules/blueprint-composer/package.json | 3 +-
6 files changed, 70 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/44262c88/docs/customizations.md
--
diff --git a/docs/customizations.md b/docs/customizations.md
index 24f0a47..77599a1 100644
--- a/docs/customizations.md
+++ b/docs/customizations.md
@@ -4,7 +4,7 @@ and widgets cherry-picked as needed.
There are a number of points where UI default choices can be overridden:
-* Actions on Composer: by changing the config value for
`'actionServiceProvider'` in `ui-modules/blueprint-composer/app/index.js`,
+* Actions on Composer: by changing the config value for
`'actionServiceProvider'` from `ui-modules/blueprint-composer/app/index.js`,
a different set of actions can be displayed on the composer screen
* Composer - Virtual palette items and alternate catalog endpoints: by
registering a different `blueprintServiceProvider`
@@ -20,6 +20,9 @@ There are a number of points where UI default choices can be
overridden:
widgets should be registered as angular directives using the standard
Angular naming conventions
(e.g. suggestionDropdownDirective), as done for that directive in
app/index.js and app/index.less.
+* Composer - Identify entities and other items to be preselected when "Recent"
is applied by adding a tag of the form
+ `{ ui-composer-recent-preselect: 100 }` (where the number `100` determines
its sort order)
+
@@ -155,8 +155,10 @@
{{item.description}}
+ {{ lastUsedText(item) }}
-{{ tag }}
+{{ tag }}
+
{{item.containingBundle}}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/44262c88/ui-modules/blueprint-composer/app/components/providers/recently-used-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/recently-used-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/recently-used-service.provider.js
index 7596ce7..f29fb4e 100644
---
a/ui-modules/blueprint-composer/app/components/providers/recently-used-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/recently-used-service.provider.js
@@ -47,12 +47,15 @@ function RecentlyUsedService($log) {
};
service.getLastUsed = (item) => {
let id = service.getId(item);
-let s = sessionStorage.getItem(PREFIX+id);
-return s ? ((Number)(s)) : -1;
+let s = sessionStorage.getItem(PREFIX+id);
+if (s) return ((Number)(s));
+let tag = item.tags && item.tags.find(t =>
t['ui-composer-recent-preselect']);
+if (tag) return tag['ui-composer-recent-preselect'];
+return -1;
};
service.embellish = (item) => {
-item.lastUsed = service.getLastUsed(service.getId(item));
+item.lastUsed = service.getLastUsed(item);
};
service.markUsed('io.cloudsoft.demo.bank.threetier:0.1.0-SNAPSHOT::db:0.1.0-SNAPSHOT',
100);
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/44262c88/ui-modules/blueprint-composer/package.json
--
diff --git a/ui-modules/blueprint-composer/package.json
b/ui-modules/blueprint-composer/package.json
index c6ad804..d0accd1 100644
--- a/ui-modules/blueprint-composer/package.json
+++ b/ui-modules/blueprint-composer/package.json
@@ -60,7 +60,8 @@
"lodash": "^4.16.4",
"ngclipboard": "^1.1.1",
"normalizr": "^2.2.1",
-"underscore": "^1.8.3"
+"underscore": "^1.8.3",
+"moment": "^2.15.1"
},
"devD
[09/11] brooklyn-ui git commit: address PR comments
address PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/0af5dc4a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/0af5dc4a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/0af5dc4a
Branch: refs/heads/master
Commit: 0af5dc4a08fdab95819a214cf1b5ba17b8abc938
Parents: 9a22b64
Author: Alex Heneveld
Authored: Tue Oct 30 14:20:30 2018 +
Committer: Alex Heneveld
Committed: Tue Oct 30 14:20:30 2018 +
--
.../catalog-selector.directive.js | 82
.../catalog-selector.template.html | 2 +-
.../providers/recently-used-service.provider.js | 1 +
ui-modules/blueprint-composer/app/index.js | 2 +
4 files changed, 52 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/0af5dc4a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 109bf45..2959103 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -110,6 +110,38 @@ export function catalogSelectorSearchFilter() {
}
}
+export function catalogSelectorFiltersFilter() {
+// compute counts and apply active filters;
+// this is called by the view after filtering based on search,
+// so filters can adjust based on number of search results
+return function (items, $scope) {
+ $scope.itemsBeforeActiveFilters = items;
+ $scope.skippingFilters = false;
+ let filters = $scope.filters.filter(f => f.enabled);
+ let filtersWithFn = filters.filter(f => f.filterFn);
+ if (!filters.length) {
+$scope.itemsAfterActiveFilters = items;
+return items;
+ }
+ filters.forEach(filter => { if (filter.filterInit) items =
filter.filterInit(items); });
+ if (filtersWithFn.length) {
+items = items.filter( item => filtersWithFn.some(filter =>
filter.filterFn(item)) );
+ }
+ if (!items || !items.length) {
+// if search matches nothing then disable filters
+items = $scope.itemsAfterActiveFilters =
$scope.itemsBeforeActiveFilters;
+$scope.skippingFilters = true;
+ } else {
+if (filters.find(filter => filter.limitToOnePage)) {
+items = items.splice(0, $scope.pagination.itemsPerPage);
+}
+$scope.itemsAfterActiveFilters = items;
+ }
+ return items;
+
+}
+}
+
function controller($scope, $element, $timeout, $q, $uibModal, $log,
$templateCache, paletteApi, paletteDragAndDropService, iconGenerator,
composerOverrides, recentlyUsedService) {
this.$timeout = $timeout;
@@ -177,9 +209,18 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
$scope.isLoading = false;
});
};
+function tryMarkUsed(item) {
+try {
+recentlyUsedService.markUsed(item);
+} catch (e) {
+// session storage can get full; usually the culprit is icons not
this,
+// but we may wish to clear out old items to ensure we don't bleed
here
+$log.warn("Could not mark item as used: "+item, e);
+}
+}
$scope.onSelectItem = function (item) {
if (angular.isFunction($scope.onSelect)) {
-recentlyUsedService.markUsed(item);
+tryMarkUsed(item);
$scope.onSelect({item: item});
}
$scope.search = '';
@@ -204,7 +245,7 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
};
$scope.onDragEnd = function (item, event) {
paletteDragAndDropService.dragEnd();
-recentlyUsedService.markUsed(item);
+tryMarkUsed(item);
};
$scope.sortBy = function (order) {
let newOrder = [].concat($scope.state.currentOrder);
@@ -277,50 +318,23 @@ function controller($scope, $element, $timeout, $q,
$uibModal, $log, $templateCa
$scope.filters = [
{ label: 'Recent', icon: 'clock-o', title: "Recently used and standard
favorites", limitToOnePage: true,
filterInit: items => {
-$scope.recentItems = items.filter( i => i.lastUsed &&
i.lastUsed > 0 );
+$scope.recentItems = items.filter( i => i.lastUsed &&
i.lastUsed>0 );
$scope.recentItems.sort( (a,b) => b.lastUsed - a.lastUsed );
return $scope.recentItems;
[02/11] brooklyn-ui git commit: improve sort by, including sort-by recency
improve sort by, including sort-by recency
next need to enable recent filter (shows one page of recent items),
set defaults,
and add a tidied footer to disable categories when needed
could also show last used in popup, and in catalog, and allow clearing in
catalog
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/17e120c2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/17e120c2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/17e120c2
Branch: refs/heads/master
Commit: 17e120c2f341703064f0121e5a77fe8cc6b85b29
Parents: b4a1396
Author: Alex Heneveld
Authored: Thu Oct 25 17:31:07 2018 +0100
Committer: Alex Heneveld
Committed: Thu Oct 25 17:32:39 2018 +0100
--
.../catalog-selector.directive.js | 76 +++-
.../catalog-selector.template.html | 6 +-
.../providers/recently-used-service.provider.js | 61
ui-modules/blueprint-composer/app/index.js | 4 +-
4 files changed, 90 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/17e120c2/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 3e9097c..8279bf4 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -22,11 +22,19 @@ import template from './catalog-selector.template.html';
const MIN_ROWS_PER_PAGE = 4;
+const PALETTE_VIEW_ORDERS = {
+name: { label: "Name", field: "displayName" },
+lastUsed: { label: "Last Used", field: "-lastUsed" },
+bundle: { label: "Bundle", field: "containingBundle" },
+id: { label: "ID", field: "symbolicName" },
+};
+
const PALETTE_VIEW_MODES = {
- compact: { name: "Compact", classes: "col-xs-2 item-compact", itemsPerRow:
6, rowHeightPx: 75, hideName: true },
- normal: { name: "Normal", classes: "col-xs-3", itemsPerRow: 4 },
- large: { name: "Large", classes: "col-xs-4", itemsPerRow: 3 },
- list: { name: "List", classes: "col-xs-12 item-full-width", itemsPerRow: 1 }
};
+compact: { name: "Compact", classes: "col-xs-2 item-compact",
itemsPerRow: 6, rowHeightPx: 75, hideName: true },
+normal: { name: "Normal", classes: "col-xs-3", itemsPerRow: 4 },
+large: { name: "Large", classes: "col-xs-4", itemsPerRow: 3 },
+list: { name: "List", classes: "col-xs-12 item-full-width",
itemsPerRow: 1 },
+};
// fields in either bundle or type record:
const FIELDS_TO_SEARCH = ['name', 'displayName', 'symbolicName', 'version',
'type', 'supertypes', 'containingBundle', 'description', 'displayTags', 'tags'];
@@ -43,7 +51,7 @@ export function catalogSelectorDirective() {
mode: '@?', // for use by downstream projects to pass in special
modes
},
template: template,
-controller: ['$scope', '$element', '$timeout', '$q', '$uibModal',
'$log', '$templateCache', 'paletteApi', 'paletteDragAndDropService',
'iconGenerator', 'composerOverrides', controller],
+controller: ['$scope', '$element', '$timeout', '$q', '$uibModal',
'$log', '$templateCache', 'paletteApi', 'paletteDragAndDropService',
'iconGenerator', 'composerOverrides', 'recentlyUsedService', controller],
link: link,
};
}
@@ -100,58 +108,15 @@ export function catalogSelectorSearchFilter() {
}
}
-export function catalogSelectorSortFilter($filter) {
-return function (items, family) {
-return items.sort(function (left, right) {
-let nameLeft;
-let nameRight;
-if (family) {
-switch (family) {
-case EntityFamily.ENTITY:
-case EntityFamily.SPEC:
-case EntityFamily.POLICY:
-case EntityFamily.ENRICHER:
-case EntityFamily.LOCATION:
-nameLeft = $filter('entityName')(left);
-nameRight = $filter('entityName')(right);
-break;
-}
-}
-
-if (!nameLeft || !nameRight) {
-return 0;
-}
-let nameCompare = nameLeft.localeCompare(nameRight);
-if (nameCompare !== 0) {
-return nameCompare;
-}
-let versionCompare = right.version.localeCompare(left.version);
-if (versionCompare !== 0) {
