[brooklyn-ui] branch master updated (e1bb4911 -> d432ed1a)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git from e1bb4911 Merge pull request #315 from algairim/build/Jenkinsfile add 474e6f90 Update node and npm add af6d70e3 Fix (as in with glue) version of expose-loader new d432ed1a Merge pull request #317 from apache/feature/update-node-16 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: package.json | 5 + pom.xml| 4 +- ui-modules/app-inspector/package.json | 2 +- ui-modules/blueprint-composer/package.json | 2 +- ui-modules/blueprint-importer/package.json | 2 +- ui-modules/catalog/package.json| 2 +- ui-modules/groovy-console/package.json | 2 +- ui-modules/home/package.json | 2 +- ui-modules/location-manager/package.json | 2 +- ui-modules/login/package-lock.json | 22163 ++- ui-modules/login/package.json | 2 +- ui-modules/logout/package.json | 2 +- ui-modules/rest-api-docs/package.json | 2 +- 13 files changed, 21872 insertions(+), 320 deletions(-) create mode 100644 package.json
[brooklyn-ui] 01/01: Merge pull request #317 from apache/feature/update-node-16
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git commit d432ed1a42e3a4c9b888c0c4c09bb557e310c0b9 Merge: e1bb4911 af6d70e3 Author: Thomas Bouron AuthorDate: Thu Apr 14 18:02:47 2022 +0100 Merge pull request #317 from apache/feature/update-node-16 Update node and npm package.json | 5 + pom.xml| 4 +- ui-modules/app-inspector/package.json | 2 +- ui-modules/blueprint-composer/package.json | 2 +- ui-modules/blueprint-importer/package.json | 2 +- ui-modules/catalog/package.json| 2 +- ui-modules/groovy-console/package.json | 2 +- ui-modules/home/package.json | 2 +- ui-modules/location-manager/package.json | 2 +- ui-modules/login/package-lock.json | 22163 ++- ui-modules/login/package.json | 2 +- ui-modules/logout/package.json | 2 +- ui-modules/rest-api-docs/package.json | 2 +- 13 files changed, 21872 insertions(+), 320 deletions(-)
[brooklyn-docs] branch master updated (4494721 -> af3fd31)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from 4494721 Merge pull request #12 from cloudsoft/fix/brooklyn-logging-integration new d2f5482 Logbook locations update new 74d02e4 consistent prepositions new af3fd31 Merge pull request #346 from jathanasiou/patch-1 The 1861 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: guide/ops/logging/logbook.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
[brooklyn-ui] branch master updated (a8609e4 -> 4126b77)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from a8609e4 This closes #302 new 10d9b63 hiding Blueprint Importer from homepage tiles new 32c7b17 add Logbook widget to console page + refine code/style new 1e2ce73 hiding importer via config instead of controller logic new 4126b77 Merge pull request #305 from jathanasiou/enhancement/home-visuals The 2275 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/ui-module/config.yaml | 2 - ui-modules/groovy-console/app/index.js | 6 ++- ui-modules/groovy-console/app/index.less | 3 ++ .../app/views/main/main.controller.js | 36 +--- ui-modules/groovy-console/app/views/main/main.less | 25 +-- .../app/views/main/main.template.html | 49 ++ ui-modules/home/app/views/main/main.controller.js | 2 +- 7 files changed, 69 insertions(+), 54 deletions(-)
[brooklyn-server] branch master updated (1ff1ea8 -> 8906243)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 1ff1ea8 Merge pull request #1220 from tbouron/feature/aggregation-deprecation new 862a891 more comments on deprecated REST methods new 536dae0 Add missing alternative usage for deprecated method new 9e954d2 Update deprecated since to use the right version new 8906243 Merge pull request #1215 from ahgittin/more-deprecation The 13152 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/brooklyn/rest/api/ActivityApi.java | 3 ++- .../main/java/org/apache/brooklyn/rest/api/BundleApi.java| 12 +--- .../main/java/org/apache/brooklyn/rest/api/CatalogApi.java | 12 +--- .../main/java/org/apache/brooklyn/rest/api/LocationApi.java | 6 +++--- .../main/java/org/apache/brooklyn/rest/api/LogoutApi.java| 2 +- .../org/apache/brooklyn/rest/resources/BundleResource.java | 2 +- 6 files changed, 21 insertions(+), 16 deletions(-)
[brooklyn-server] branch master updated: bumps Jetty and Xstreams based on Snyk suggestions
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new e6e29a3 bumps Jetty and Xstreams based on Snyk suggestions
new 349ba81 Merge pull request #1216 from
jcabrerizo/feature/bump-vulnerable-version-2108
e6e29a3 is described below
commit e6e29a3e80aa7f5171174b02ca16aa7ac83600c0
Author: Juan Cabrerizo
AuthorDate: Tue Aug 3 11:12:57 2021 +0100
bumps Jetty and Xstreams based on Snyk suggestions
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6e68fc..8fd6e50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
1.0.1
-1.4.15
+1.4.17
1.1.4c_7
2.3.0_3
@@ -180,7 +180,7 @@
4.3.0
${karaf.version}
-9.4.35.v20201120
+9.4.39.v20210325
3.2.2
7.3.9
2.3.3
[brooklyn-ui] branch master updated (f3625cd -> c536347)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from f3625cd Merge pull request #254 from iuliana/fix/skip-resolution new b67a85e Support multiple labels on the same relationship path new 8fa7e4d Use Set to collect unique labels on path new 49f0dff Use POJO intead of Map to group relationships per path direction new f80b71f Draw every path, even in there are multiple in the same direction. Each path can be under different filtering group new d2bc866 Fix relationship layers filter in composer: use more specific ID for filter element new bc8a0ad Refactor drawing of relationships: split the logic for arcs and labels, draw them in a separate SVG group new b7ceb44 Re-apply filters when selected filters changed or graph is changed new 8b26b3f Use a better event name to re-apply filters new 21da4ee This is addressed now, see previous commits. new 51765b6 Improve collection of data for relationship arcs and labels to draw new 08ddd4c Limit amount of labels to 1 per relationship type, display others in tolltip on hover new 7cee32f Fix label typo new 7f2f610 remove path and label selectors from the relationship data new 2ba548c Split relationship layer into arcs and labels: turning on labels turns on arcs and turning off arcs turns off labels new eb51175 Do not support multiple relationship types for arcs and lebels; draw up to 3 labels per path with 3rd to indicate count of 'others' new 934aa72 Display canvas tooltip as a pannel; relationship tooltip to follow cursor when displayed new 94485d2 Group constants under _configHolder new 7044c7f Re-name 'selector' config items 'class' new c536347 Merge pull request #255 from algairim/draw-relationship-path-label The 2102 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../app/components/designer/designer.directive.js | 2 + .../providers/blueprint-service.provider.js| 4 +- .../app/components/util/d3-blueprint.js| 170 - .../app/views/main/main.controller.js | 50 +- 4 files changed, 177 insertions(+), 49 deletions(-)
[brooklyn-ui] branch master updated: Make the timeAgoFilter stateful so it keeps updating the display
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 7462da7 Make the timeAgoFilter stateful so it keeps updating the
display
new fdadc17 Merge pull request #250 from tbouron/fix/timeago-filter
7462da7 is described below
commit 7462da72170e99057e228258c95af99cc1e71b43
Author: Thomas Bouron
AuthorDate: Fri Jul 16 11:34:09 2021 +0100
Make the timeAgoFilter stateful so it keeps updating the display
---
.../app-inspector/app/components/task-list/task-list.directive.js | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
index a67690d..dd6d807 100644
--- a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
+++ b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
@@ -84,11 +84,15 @@ export function taskListDirective() {
}
export function timeAgoFilter() {
-return function (input) {
+function timeAgo(input) {
if (input) {
return moment(input).fromNow();
}
}
+
+timeAgo.$stateful = true;
+
+return timeAgo;
}
export function durationFilter() {
return function (input) {
[brooklyn-server] branch feature/default-initializers updated (930e2d5 -> 535e2cc)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch feature/default-initializers in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. discard 930e2d5 Check the `TypeRegistry` first for global initializers, then move on to the class loader (which now uses the canonical way to load the class) discard be2a015 Update constant and function names to retrieve global initializers discard 93619b4 Apply global initializers before the ones given by the entity spec discard b08387d Add support setup default initializers for all deployment add d57a259 node removal add b2ad29a node removal pt2 add ce5c84f node removal pt3 add e954f0c node removal pt4 add ffa842d node removal pt5 add 6fce09d node removal pt6 - fix for failed tests add 2031d5b Merge pull request #1183 from zan-mateusz/feature/smart-158 add 50432e3 Csrf-Token mark as secure when https is used add b4d4a26 Merge pull request #1198 from jcabrerizo/feature/csrf-cookie-secure add ea63534 Remove reverse order from logbook API, use 'tail' instead to get latest log lines. Query 'head' by default. add ffd3988 Fix logbook resource unit-tests to match tail filed in logbook REST API add 6938065 Merge pull request #1197 from algairim/logbook-search-improvements add 626c8d2 fix/secure-vault-values add 8cf2753 Added Alex's recommended fix add 7ec2705 expand REST API to have clearer options for suppressing secrets add e61f9c8 Merge pull request #3 from ahgittin/suppress-secrets-in-api add 180d075 Added fixes for the tests add 09c2b44 Made all the tests pass but this implementation is deffective, raw and useDisplayHints are quite the opposite of each other and since thya have default values theya re always set add 0190d7f This closes #1199 add d610116 better fix for raw compatibility add 377effe Add support setup default initializers for all deployment add fec8a4f Apply global initializers before the ones given by the entity spec add da1cec4 Update constant and function names to retrieve global initializers add d7d980d Check the `TypeRegistry` first for global initializers, then move on to the class loader (which now uses the canonical way to load the class) add 535e2cc Make the sensor a map instead of a string representation of a map This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (930e2d5) \ N -- N -- N refs/heads/feature/default-initializers (535e2cc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../ha/ManagementPlaneSyncRecordPersister.java | 3 + .../org/apache/brooklyn/core/config/Sanitizer.java | 21 +++ .../core/effector/AddDeploySensorsInitializer.java | 24 .../brooklyn/core/mgmt/BrooklynTaskTags.java | 5 +- .../core/mgmt/ha/HighAvailabilityManagerImpl.java | 7 ++- ...ementPlaneSyncRecordPersisterToObjectStore.java | 28 ++ .../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 2 +- .../util/core/logbook/LogBookQueryParams.java | 12 ++-- .../util/core/logbook/file/FileLogStore.java | 33 +++ .../logbook/opensearch/OpenSearchLogStore.java | 22 ++-- .../util/core/logbook/file/FileLogStoreTest.java | 51 +++-- .../logbook/opensearch/OpenSearchLogStoreTest.java | 35 +--- .../brooklyn/util/core/logbook/file/log-sample.txt | 2 +- .../apache/brooklyn/rest/api/EntityConfigApi.java | 33 ++- .../org/apache/brooklyn/rest/api/SensorApi.java| 21 +-- .../brooklyn/rest/filter/CsrfTokenFilter.java | 9 +-- .../resources/AbstractBrooklynRestResource.java| 64 -- .../rest/resources/ApplicationResource.java| 6 +- .../rest/resources/EntityConfigResource.java | 56 +++ .../brooklyn/rest/resources/SensorResource.java| 17 +++--- .../brooklyn/rest/util/WebResourceUtils.java | 5 +- .../rest/resources/LogbookResourceTest.java| 4 +- .../rest/resources/SensorResourceTest.java | 33 +++ 23 files changed, 357 insertions(+), 136 deletions(-)
[brooklyn-server] branch feature/default-initializers updated (b08387d -> 930e2d5)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch feature/default-initializers in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from b08387d Add support setup default initializers for all deployment add 93619b4 Apply global initializers before the ones given by the entity spec add be2a015 Update constant and function names to retrieve global initializers add 930e2d5 Check the `TypeRegistry` first for global initializers, then move on to the class loader (which now uses the canonical way to load the class) No new revisions were added by this update. Summary of changes: .../core/objs/proxy/InternalEntityFactory.java | 43 +++--- 1 file changed, 21 insertions(+), 22 deletions(-)
[brooklyn-server] branch feature/default-initializers updated (856f033 -> b08387d)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch feature/default-initializers in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. discard 856f033 Add support setup default initializers for all deployment add b08387d Add support setup default initializers for all deployment This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (856f033) \ N -- N -- N refs/heads/feature/default-initializers (b08387d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../brooklyn/core/objs/proxy/InternalEntityFactory.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-)
[brooklyn-server] 01/01: Add support setup default initializers for all deployment
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch feature/default-initializers
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 856f033034f5f39006844c599c46a3cc1b6f0406
Author: Thomas Bouron
AuthorDate: Wed Jul 14 13:41:19 2021 +0100
Add support setup default initializers for all deployment
This looks up a new configuration options called
`brooklyn.deployment.initializers` (comma separated list). If specified on a
Brooklyn instance, all deployments will load and execute these initializers.
Theses classes are expected to be `EntityInitializer`, if an error occur
(either cast or anything else) then the deployment will fail.
The code will try to:
1. load the class from the default class loader.
2. if (1) fails, it will try to load the class from the `TypeRegistry`.
This is to allow execution of custom initializers that might be installed in
the catalog later on.
3. if (1) and (2) fails, then the deployment is aborted.
---
.../core/effector/AddDeploySensorsInitializer.java | 54
.../core/objs/proxy/InternalEntityFactory.java | 97 +++---
2 files changed, 121 insertions(+), 30 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/core/effector/AddDeploySensorsInitializer.java
b/core/src/main/java/org/apache/brooklyn/core/effector/AddDeploySensorsInitializer.java
new file mode 100644
index 000..0285cd0
--- /dev/null
+++
b/core/src/main/java/org/apache/brooklyn/core/effector/AddDeploySensorsInitializer.java
@@ -0,0 +1,54 @@
+/*
+ * 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.effector;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
+import org.apache.brooklyn.api.entity.EntityInitializer;
+import org.apache.brooklyn.api.entity.EntityLocal;
+import org.apache.brooklyn.api.mgmt.entitlement.EntitlementContext;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.core.entity.EntityInternal;
+import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;
+import org.apache.brooklyn.core.sensor.Sensors;
+
+public class AddDeploySensorsInitializer implements EntityInitializer {
+@Override
+public void apply(EntityLocal entity) {
+// We want to set the metadata only on the root node of an application
+if (entity.getParent() != null) {
+return;
+}
+EntitlementContext entitlementContext =
Entitlements.getEntitlementContext();
+AttributeSensor sensor = Sensors.newSensor(
+String.class,
+"deployment.metadata",
+"Metadata information about this particular deployment.
Contains at least who triggered it and when.");
+((EntityInternal) entity).getMutableEntityType().addSensor(sensor);
+try {
+entity.sensors().set(sensor, new
ObjectMapper().writeValueAsString(ImmutableMap.of(
+"user", entitlementContext != null ?
entitlementContext.user() : "Unknown",
+"deploy_time", System.currentTimeMillis()
+)));
+} catch (JsonProcessingException e) {
+throw new IllegalStateException(e);
+}
+}
+}
diff --git
a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
index cf8821b..7b92138 100644
---
a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
+++
b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
@@ -31,8 +31,10 @@ import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.objs.SpecParameter;
import org.apache.brooklyn.api.policy.PolicySpec;
import org.apache.brooklyn.api.sensor.EnricherSpec;
+import org.apache.brooklyn.api.typereg.RegisteredType;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigCo
[brooklyn-server] branch feature/default-initializers created (now 856f033)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch feature/default-initializers in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. at 856f033 Add support setup default initializers for all deployment This branch includes the following new commits: new 856f033 Add support setup default initializers for all deployment The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-client] branch master updated (fd31f7f -> f58d2f8)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git. from fd31f7f Merge pull request #85 from grkvlt/fix/deprecated-api-test new a35e9c5 update to go modules - remove vendor files new 57bd93a update to Go modules - add go.mod and fix compilation new c94374f tidy maven build and remove unneeded files new 74799e5 remove GOPATH from build script new 522ebf3 fix mvn clean to make it work with module cache new 4492058 adjust docker file to use Go 1.15 new 9f30bc1 update README according to latest changes new 2462083 Set GOPATH in build script for Go module cache new 2cedf79 set GOCACHE to avoid permission denied on CI builds new f58d2f8 Merge pull request #86 from geomacy/update-go The 457 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Dockerfile | 17 +- cli/Gopkg.lock | 48 -- cli/Gopkg.toml | 32 - cli/README.md | 60 +- cli/README.md.bak | 138 cli/app/app.go | 54 +- cli/app/app.go.bak | 185 - cli/build.xml | 8 + cli/command/command.go | 2 +- cli/command_metadata/command_metadata.go | 2 +- cli/command_runner/runner.go | 2 +- cli/commands/access.go | 2 +- cli/commands/activity-stream.go| 2 +- cli/commands/activity.go | 4 +- cli/commands/add-catalog.go| 2 +- cli/commands/add-children.go | 2 +- cli/commands/add-policy.go | 2 +- cli/commands/application.go| 2 +- cli/commands/catalog-add.go| 8 +- cli/commands/catalog-delete.go | 30 +- cli/commands/catalog-list.go | 10 +- cli/commands/catalog-show.go | 4 +- cli/commands/catalog-show_test.go | 9 +- cli/commands/catalog.go| 23 +- cli/commands/config.go | 2 +- cli/commands/delete.go | 2 +- cli/commands/deploy.go | 2 +- cli/commands/destroy-policy.go | 2 +- cli/commands/effector.go | 2 +- cli/commands/entity.go | 4 +- cli/commands/invoke.go | 10 +- cli/commands/list.go | 10 +- cli/commands/locations.go | 2 +- cli/commands/login.go | 6 +- cli/commands/logout.go | 2 +- cli/commands/policy.go | 2 +- cli/commands/rename.go | 2 +- cli/commands/sensor.go | 2 +- cli/commands/server.go | 4 +- cli/commands/set.go| 2 +- cli/commands/spec.go | 2 +- cli/commands/start-policy.go | 2 +- cli/commands/stop-policy.go| 2 +- cli/commands/tree.go | 2 +- cli/commands/version.go| 2 +- cli/go.mod | 27 + cli/go.sum | 31 + cli/models/catalog.go | 10 +- cli/pom.xml| 17 +- cli/pom.xml.bak| 112 --- cli/release/build.sh | 45 +- cli/vendor/github.com/matryer/is/.gitignore| 24 - cli/vendor/github.com/matryer/is/.travis.yml | 19 - cli/vendor/github.com/matryer/is/LICENSE | 21 - cli/vendor/github.com/matryer/is/README.md | 38 - cli/vendor/github.com/matryer/is/is.go | 401 - cli/vendor/github.com/urfave/cli/.travis.yml | 19 - cli/vendor/github.com/urfave/cli/LICENSE | 21 - cli/vendor/github.com/urfave/cli/README.md | 352 cli/vendor/github.com/urfave/cli/app.go| 349 cli/vendor/github.com/urfave/cli/appveyor.yml | 16 - cli/vendor/github.com/urfave/cli/cli.go| 40 - cli/vendor/github.com/urfave/cli/com
[brooklyn-ui] 01/01: Use the correct AngularJs module name for blueprint importer
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch tbouron-patch-2
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 598a958e57e457e5a85e145a6e0132df37dbf19e
Author: Thomas Bouron
AuthorDate: Tue Jan 12 14:01:41 2021 +
Use the correct AngularJs module name for blueprint importer
Currently, it will throw an error when the module is started, making it
unusable.
---
ui-modules/blueprint-importer/app/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui-modules/blueprint-importer/app/index.html
b/ui-modules/blueprint-importer/app/index.html
index bb58eee..be5fd2f 100644
--- a/ui-modules/blueprint-importer/app/index.html
+++ b/ui-modules/blueprint-importer/app/index.html
@@ -25,7 +25,7 @@
<%= getBrandedText('product.name') %> - <%= app.appname
%>
-
+
${require('ejs-html!brooklyn-shared/partials/header.html')}
[brooklyn-ui] branch tbouron-patch-2 created (now 598a958)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-2 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at 598a958 Use the correct AngularJs module name for blueprint importer This branch includes the following new commits: new 598a958 Use the correct AngularJs module name for blueprint importer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-ui] branch tbouron-patch-3 created (now c515522)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-3 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at c515522 Delete .travis.yml No new revisions were added by this update.
[brooklyn-ui] branch tbouron-patch-2 created (now b54c3a6)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-2 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at b54c3a6 Use `===` to not only check the value but type This branch includes the following new commits: new b54c3a6 Use `===` to not only check the value but type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-ui] 01/01: Use `===` to not only check the value but type
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch tbouron-patch-2 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git commit b54c3a6a22fad2279a92861f789848cd9a8b1a7c Author: Thomas Bouron AuthorDate: Wed Dec 2 14:09:23 2020 + Use `===` to not only check the value but type On the spec editor, if an entity has a configuration key of type `integer`, with a `defaultValue` of `0`, then the `Configuration` section displayed `(empty)` because `defaultValue == ''` is true, whereas `defaultValue === ''` is false, which is what we want --- .../app/components/spec-editor/spec-editor.template.html| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html index 0ed851c..c09efa8 100644 --- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html +++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html @@ -507,7 +507,7 @@
[brooklyn-server] branch master updated: update comment to note potential vulnerabilities for JmxmpAgent
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new 7266ec2 update comment to note potential vulnerabilities for JmxmpAgent new c59b75a Merge pull request #1088 from geomacy/jmxmp-update-comment 7266ec2 is described below commit 7266ec2e5ccd9fee163fd5aa8217814b3841b876 Author: Geoff Macartney AuthorDate: Mon Mar 9 23:32:45 2020 + update comment to note potential vulnerabilities for JmxmpAgent --- .../src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java b/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java index 488e7f5..1dccbc4 100644 --- a/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java +++ b/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java @@ -47,8 +47,11 @@ import org.apache.brooklyn.util.jmx.jmxmp.JmxmpAgent; /** - * This exposes JMX access over JMXMP, suitable for high-security environments, + * This exposes JMX access over JMXMP. This is intended to be suitable for high-security environments, * with support for going through firewalls as well as encrypting and authenticating securely. + * Note, however, that implementations of JMX/RMI are potentially vulnerable to java + * deserialization attacks. Users should attend to the security of these components in line with their best + * practices, and verify that JMXMP is suitable for their requirements before using this class. * * Listens on 11099 unless overridden by system property brooklyn.jmxmp.port. *
[brooklyn-dist] branch master updated (4ae23b9 -> 14e50a6)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. from 4ae23b9 Merge pull request #156 from iuliana/vagrant-fix new 7187405 Added fix for broken templates and OS recommendation new 4022502 Added more explicit message regarding machine recommendation new e8e0440 modified comment regarding OS recommendation new 14e50a6 Merge pull request #158 from iuliana/template-fix The 827 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/dist/conf/brooklyn/default.catalog.bom| 30 -- .../main/resources/catalog/catalog-templates.bom | 28 ++-- 2 files changed, 31 insertions(+), 27 deletions(-)
[brooklyn] branch master updated: Fix docker build by reverting to docker image maven:3.5.4-jdk-8
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git The following commit(s) were added to refs/heads/master by this push: new 667083e Fix docker build by reverting to docker image maven:3.5.4-jdk-8 new bd1da8d Merge pull request #43 from tbouron/fix/dockerfile-2 667083e is described below commit 667083e648d52c0aba7f4da600ff17e5510d9b1b Author: Thomas Bouron AuthorDate: Tue Feb 11 11:13:12 2020 + Fix docker build by reverting to docker image maven:3.5.4-jdk-8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4744ca4..08d43ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # For all Brooklyn, we use a debian distribution instead of alpine as there are some libgcc incompatibilities with GO # and PhantomJS -FROM maven:3.6.3-jdk-8 +FROM maven:3.5.4-jdk-8 # Install the non-headless JRE as some tests requires them RUN apt-get update && apt-get install -y openjdk-8-jre
[brooklyn-dist] branch master updated: Fix for: script starting Brooklyn Vagrant instance checks for non-existing message and ends up hangging.
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git The following commit(s) were added to refs/heads/master by this push: new 539459f Fix for: script starting Brooklyn Vagrant instance checks for non-existing message and ends up hangging. new 4ae23b9 Merge pull request #156 from iuliana/vagrant-fix 539459f is described below commit 539459fc9a969af2d137c52422c4e91582c0aa42 Author: iuliana AuthorDate: Fri Feb 7 15:16:12 2020 + Fix for: script starting Brooklyn Vagrant instance checks for non-existing message and ends up hangging. --- vagrant/src/main/vagrant/files/install_brooklyn.sh | 24 -- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/vagrant/src/main/vagrant/files/install_brooklyn.sh b/vagrant/src/main/vagrant/files/install_brooklyn.sh index eb88d66..3cb6f89 100755 --- a/vagrant/src/main/vagrant/files/install_brooklyn.sh +++ b/vagrant/src/main/vagrant/files/install_brooklyn.sh @@ -92,9 +92,29 @@ sudo systemctl start brooklyn echo "Waiting for Apache Brooklyn to start..." sleep 10 -while ! (sudo grep "BundleEvent STARTED - org.apache.brooklyn.karaf-init" /var/log/brooklyn/brooklyn.debug.log) > /dev/null ; do +while ! (sudo grep "Brooklyn initialisation (part two) complete" /var/log/brooklyn/brooklyn.debug.log) > /dev/null ; do sleep 10 echo " waiting for Apache Brooklyn to start at `date`" done -echo "Apache Brooklyn started!" \ No newline at end of file +echo "=" +echo "== SSS\SS\ SS\ ==" +echo "== SS __SS\ SS | SS | ==" +echo "== SS | SS | SS\ SS\ SS\ SS | SS\ SS |SS\ SS\ SSS\ ==" +echo "== SSS\ |SS __SS\ SS __SS\ SS __SS\ SS | SS |SS |SS | SS |SS __SS\ ==" +echo "== SS __SS\ SS | \__|SS / SS |SS / SS |SS / SS |SS | SS |SS | SS |==" +echo "== SS | SS |SS | SS | SS |SS | SS |SS _SS< SS |SS | SS |SS | SS |==" +echo "== SSS |SS | \SS |\SS |SS | \SS\ SS |\SSS |SS | SS |==" +echo "== \___/ \__| \__/ \__/ \__| \__|\__| \SS |\__| \__|==" +echo "== SS\ SS | ==" +echo "== \SS | ==" +echo "== \__/==" +echo "== SS\SS\ SS\ SS\==" +echo "==SS __SS\ SS | SS | SS | ==" +echo "==SS / \__|SS\SS\ SS\ SS\ SS\ SSS | ==" +echo "==\SS\ \_SS _| \SS\ SS __SS\\_SS _| SS __SS\ SS __SS | ==" +echo "== \SS\ SS | SSS |SS | \__| SS | |SS / SS | ==" +echo "==SS\ SS | SS |SS\ SS __SS |SS | SS |SS\ SS |SS | SS | ==" +echo "==\SS | \ |\SSS |SS | \ |\SSS\ \SSS | ==" +echo "== \__/\/ \___|\__|\/ \___| \___| ==" +echo "" \ No newline at end of file
[brooklyn-library] branch master updated: Use HTTPS instead of HTTP to resolve dependencies
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git The following commit(s) were added to refs/heads/master by this push: new e71139e Use HTTPS instead of HTTP to resolve dependencies new f6e0512 Merge pull request #179 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies e71139e is described below commit e71139e8ee9533f908ff5464ec0241eda2f92d83 Author: Jonathan Leitschuh AuthorDate: Mon Feb 10 19:05:17 2020 -0500 Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- pom.xml| 2 +- software/messaging/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7ae47dc..18540bb 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ apache.snapshots Apache Snapshot Repository -http://repository.apache.org/snapshots +https://repository.apache.org/snapshots false diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml index 6a27cde..8c37367 100644 --- a/software/messaging/pom.xml +++ b/software/messaging/pom.xml @@ -36,7 +36,7 @@ clojars.org - http://clojars.org/repo + https://clojars.org/repo
[brooklyn-server] branch master updated: Use HTTPS instead of HTTP to resolve dependencies
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new dc2cff6 Use HTTPS instead of HTTP to resolve dependencies new fd87f86 Merge pull request #1086 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies dc2cff6 is described below commit dc2cff61101fc25b6a68d7caa49b3d5b637bdaeb Author: Jonathan Leitschuh AuthorDate: Mon Feb 10 19:05:39 2020 -0500 Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- karaf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/pom.xml b/karaf/pom.xml index cd26a10..e0a3328 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -163,7 +163,7 @@ servicemix Apache ServiceMix Repository - http://svn.apache.org/repos/asf/servicemix/m2-repo + https://svn.apache.org/repos/asf/servicemix/m2-repo true
[brooklyn-dist] branch master updated (de65aa7 -> 75ca10d)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. from de65aa7 Merge pull request #155 from nakomis/change-packaging-to-pom new 4689f43 Don’t prompt for confirmation with apt-get new 84fce02 Merge commit 'de65aa7e1b2a7d946cb175e0003401849dd51c26' into apt-get-no-prompt new 75ca10d Merge pull request #157 from kemitix/apt-get-no-prompt The 821 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dist/src/main/dist/conf/brooklyn/default.catalog.bom | 2 +- karaf/config/src/main/resources/catalog/catalog-templates.bom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[brooklyn-server] branch master updated: Don’t prompt for confirmation with apt-get
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new f3776b9 Don’t prompt for confirmation with apt-get
new b227b46 Merge pull request #1085 from kemitix/apt-get-no-prompt
f3776b9 is described below
commit f3776b97cc551bc98e76347bb5029ee77bd4b8ad
Author: Paul Campbell
AuthorDate: Mon Feb 10 13:44:37 2020 +
Don’t prompt for confirmation with apt-get
`apt-get install` will try to prompt the user for confirmation when
installing a package unless the `-y` parameter is provided. This causes the
install to abort is there is no attached terminal.
---
camp/camp-brooklyn/src/test/yaml/python-webserver.bom | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camp/camp-brooklyn/src/test/yaml/python-webserver.bom
b/camp/camp-brooklyn/src/test/yaml/python-webserver.bom
index 5fb5261..1c8c080 100644
--- a/camp/camp-brooklyn/src/test/yaml/python-webserver.bom
+++ b/camp/camp-brooklyn/src/test/yaml/python-webserver.bom
@@ -33,7 +33,7 @@ brooklyn.catalog:
install.command: |
# install python if not present
which python || \
-{ sudo apt-get update && sudo apt-get install python ; } || \
+{ sudo apt-get update && sudo apt-get install -y python ; } || \
{ sudo yum update && sudo yum install python ; } || \
{ echo WARNING: cannot install python && exit 1 ; }
[brooklyn-docs] branch website updated: remove references to MD5/SHA1 from release process description
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch website
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
The following commit(s) were added to refs/heads/website by this push:
new d60e892 remove references to MD5/SHA1 from release process description
new 9a9090a Merge pull request #303 from geomacy/website
d60e892 is described below
commit d60e892b5ba67516d052ddb4894e9295493b1f31
Author: Geoff Macartney
AuthorDate: Sat Jan 25 22:02:31 2020 +
remove references to MD5/SHA1 from release process description
Meant to do this after https://github.com/apache/brooklyn-dist/pull/150
---
.../committers/release-process/make-release-artifacts.md | 2 +-
developers/committers/release-process/prerequisites.md | 2 --
developers/committers/release-process/publish-temp.md | 2 +-
developers/committers/release-process/publish.md | 10 --
.../committers/release-process/verify-release-artifacts.md | 8 +++-
5 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/developers/committers/release-process/make-release-artifacts.md
b/developers/committers/release-process/make-release-artifacts.md
index 730a7cb..a408cb7 100644
--- a/developers/committers/release-process/make-release-artifacts.md
+++ b/developers/committers/release-process/make-release-artifacts.md
@@ -46,6 +46,6 @@ The release script will:
3. Invoke Maven to build the source code (including running unit tests), and
deploy artifacts to a Maven remote
repository
4. Save the .tar.gz and .zip artifacts produced by the build of `brooklyn-dist`
-5. For each of the produced files, produce MD5, SHA1, SHA256 and GnuPG
signatures
+5. For each of the produced files, produce SHA256 and GnuPG signatures
At the end of the script, it will show you the files it has produced and their
location.
diff --git a/developers/committers/release-process/prerequisites.md
b/developers/committers/release-process/prerequisites.md
index 0323428..399416d 100644
--- a/developers/committers/release-process/prerequisites.md
+++ b/developers/committers/release-process/prerequisites.md
@@ -44,8 +44,6 @@ The following software packages are required during the
build. Make sure you hav
- `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu
Linux)
- `pinentry` for secure entry of GPG passphrases. If you are building remotely
on a Linux machine, `pinentry-curses` is
recommended; building on a mac, `port install pinentry-mac` is recommended.
-- `md5sum` and `sha1sum` - these are often present by default on Linux, but
not on Mac;
- `port install md5sha1sum` should remedy that.
- if `gpg` does not resolve (it is needed for maven), create an alias or
script pointing at `gpg2 "$@"`
- the `mmv` command (usually in a package named `mmv`) will help with the
final steps of the release process
diff --git a/developers/committers/release-process/publish-temp.md
b/developers/committers/release-process/publish-temp.md
index 278ce73..a0fe07b 100644
--- a/developers/committers/release-process/publish-temp.md
+++ b/developers/committers/release-process/publish-temp.md
@@ -34,7 +34,7 @@ mkdir apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
{% endhighlight %}
Copy into this directory all of the artifacts from the previous step - `-src`
and `-bin`, `.tar.gz`, `.zip` and `.rpm`,
-and all associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then
commit:
+and all associated `.sha256` and `.asc` signatures. Then commit:
{% highlight bash %}
svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
diff --git a/developers/committers/release-process/publish.md
b/developers/committers/release-process/publish.md
index 86211e8..fa865c8 100644
--- a/developers/committers/release-process/publish.md
+++ b/developers/committers/release-process/publish.md
@@ -33,7 +33,7 @@ mkdir apache-brooklyn-${VERSION_NAME}
{% endhighlight %}
Refer back to the pre-release area Subversion (see [Publish to the staging
area](publish-temp.html)), and copy all of
-the release candidate artifacts - `-src` and `-bin`, `.tar.gz` and `.zip`, and
all associated `.md5`, `.sha1`, `.sha256`
+the release candidate artifacts - `-src` and `-bin`, `.tar.gz` and `.zip`, and
all associated `.sha256`
and `.asc` signatures - into this new folder.
Rename all of the files to remove the `-rcN` designation:
@@ -45,7 +45,7 @@ for f in *; do mv $f ${f//-rc${RC_NUMBER}/}; done
The hash files will need patching to refer to the filenames without the `-rcN`
designation:
{% highlight bash %}
-sed -i.bak 's/-rc'$RC_NUMBER'-/-/' *.md5 *.sha1 *.sha256
+sed -i.bak 's/-rc'$RC_NUMBER'-/-/' *.sha256
rm -f *.bak
{% endhighlight %}
@@ -54,9 +54,7 @@ Note that the PGP signatures do not embed the filename so
they do not need to be
As a final check, re-test the hashes and signatures:
{% highlight bash %}
-for artifact in $(fi
[brooklyn-ui] branch 1.0.0 updated (81f7617 -> 5f5f481)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch 1.0.0 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 81f7617 use the flattened pom so that revision is set correctly new 4d84e4b Bumps npm, node, and webpack versions new c9a9026 Merge remote-tracking branch 'nakomis/fix-build' into 1.0.0 new 3897503 use the flattened pom so that revision is set correctly new 11588d8 Merge pull request #168 from nakomis/1.0.0-cherry-picks new 395e21f Revert "allow relative path to parent to be configured" new 4fa5a09 Merge pull request #169 from nakomis/1.0.0-cherry-picks new 5f5f481 Merge pull request #170 from nakomis/1.0.0-cherry-picks The 1747 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
[brooklyn-ui] branch 1.0.0 updated: Revert "allow relative path to parent to be configured"
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/1.0.0 by this push:
new 395e21f Revert "allow relative path to parent to be configured"
new 4fa5a09 Merge pull request #169 from nakomis/1.0.0-cherry-picks
395e21f is described below
commit 395e21f63574f446d6d27ccbd5e866a83719d52b
Author: Alex Heneveld
AuthorDate: Mon Jan 20 13:12:15 2020 +
Revert "allow relative path to parent to be configured"
This reverts commit e8dec48eae0b07d1d2918c7315b1090e5c856345.
Seems maven doesn't actually respect a variable in relative path. I must
have been taking some cached or downloaded item when i tested, as when we
change the version it breaks.
Also irritating, seems maven won't look in the local reactor model so we
need either relative path to work or the upstream item to have been built.
---
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 303c9e9..223f950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
org.apache.brooklyn
brooklyn-parent
1.0.0
-
${brooklyn.ui.relativePath.to.brooklyn.server.parent}
+../brooklyn-server/parent/
org.apache.brooklyn.ui
@@ -84,8 +84,6 @@
1.0.0
${revision}
Apache Brooklyn
-
../brooklyn-server/parent/
-
1.4
[brooklyn] branch master updated: Fixes instructions for building Brooklyn
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn.git
The following commit(s) were added to refs/heads/master by this push:
new 5ad540b Fixes instructions for building Brooklyn
new 7071bdc Merge pull request #36 from nakomis/fix/README
5ad540b is described below
commit 5ad540b36d59744df0a505ec43d8ae403dea1a10
Author: Martin Harris
AuthorDate: Mon Jan 20 15:06:25 2020 +
Fixes instructions for building Brooklyn
---
README.md | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index e345bf6..696b082 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@ get this project and its sub-modules:
And then, with jdk 1.8+ and maven 3.1+ installed:
-mvn clean install -Dno-go-client -Dno-rpm -Dno-deb -DskipDocker
+mvn clean install
-However, you won't be able to build the RPM/DEB packages, as well as the CLI.
That's why we would recommand to use the
+However, this will not build the RPM/DEB packages, as well as the CLI. That's
why we would recommand to use the
alternative: a docker container to build this project:
```bash
@@ -36,7 +36,7 @@ docker run -i --rm --name brooklyn -u $(id -u):$(id -g) \
--mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
\
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${PWD}:/usr/build -w /usr/build \
- brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
+ brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
-Drpm -Ddeb -Dclient -Ddocker
```
You can speed this up by using your local .m2 cache:
@@ -45,7 +45,7 @@ docker run -i --rm --name brooklyn -u $(id -u):$(id -g) \
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${HOME}/.m2:/var/maven/.m2 \
-v ${PWD}:/usr/build -w /usr/build \
- brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
+ brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
-Drpm -Ddeb -Dclient -Ddocker
```
The results are in `brooklyn-dist/dist/target/`, including a tar and a zip.
[brooklyn] branch 1.0.0 updated: Bumps maven version in Dockerfile
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch 1.0.0 in repository https://gitbox.apache.org/repos/asf/brooklyn.git The following commit(s) were added to refs/heads/1.0.0 by this push: new b667823 Bumps maven version in Dockerfile new a2e9c53 Merge pull request #38 from nakomis/1.0.0-cherry-picks b667823 is described below commit b667823831fa134d4d5fcbb870c051c99193e3f7 Author: Martin Harris AuthorDate: Mon Jan 20 13:12:49 2020 + Bumps maven version in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f8f2b5..5f71a42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # For all Brooklyn, we use a debian distribution instead of alpine as there are some libgcc incompatibilities with GO # and PhantomJS -FROM maven:3.5.4-jdk-8 +FROM maven:3.6.3-jdk-8 # Install the non-headless JRE as some tests requires them RUN apt-get update && apt-get install -y openjdk-8-jre
[brooklyn-ui] branch 1.0.0 updated: use the flattened pom so that revision is set correctly
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch 1.0.0 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git The following commit(s) were added to refs/heads/1.0.0 by this push: new 3897503 use the flattened pom so that revision is set correctly new 11588d8 Merge pull request #168 from nakomis/1.0.0-cherry-picks 3897503 is described below commit 3897503406dda610a04954422e56cf25b9ff90d2 Author: Alex Heneveld AuthorDate: Mon Jan 20 12:32:20 2020 + use the flattened pom so that revision is set correctly --- pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19fbbae..303c9e9 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,11 @@ org.codehaus.mojo flatten-maven-plugin -1.0.1 +1.1.0 + +true +resolveCiFriendliesOnly +
[brooklyn-ui] branch master updated: Revert "allow relative path to parent to be configured"
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new a0e2e1e Revert "allow relative path to parent to be configured"
new c9510f9 Merge pull request #167 from ahgittin/relative-path-no-var
a0e2e1e is described below
commit a0e2e1e474c61f36bb1bb7f27f0b27fde5c12a3d
Author: Alex Heneveld
AuthorDate: Mon Jan 20 13:12:15 2020 +
Revert "allow relative path to parent to be configured"
This reverts commit e8dec48eae0b07d1d2918c7315b1090e5c856345.
Seems maven doesn't actually respect a variable in relative path. I must
have been taking some cached or downloaded item when i tested, as when we
change the version it breaks.
Also irritating, seems maven won't look in the local reactor model so we
need either relative path to work or the upstream item to have been built.
---
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 538b55f..3114d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
org.apache.brooklyn
brooklyn-parent
1.0.0-SNAPSHOT
-
${brooklyn.ui.relativePath.to.brooklyn.server.parent}
+../brooklyn-server/parent/
org.apache.brooklyn.ui
@@ -84,8 +84,6 @@
1.0.0-SNAPSHOT
${revision}
Apache Brooklyn
-
../brooklyn-server/parent/
-
1.4
[brooklyn-ui] branch master updated: use the flattened pom so that revision is set correctly
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git The following commit(s) were added to refs/heads/master by this push: new 6f90dab use the flattened pom so that revision is set correctly new b623b86 Merge pull request #166 from ahgittin/better-flattening 6f90dab is described below commit 6f90dab8c9d27fcdb866bcaa19ae5c11ea5d2d5b Author: Alex Heneveld AuthorDate: Mon Jan 20 12:32:20 2020 + use the flattened pom so that revision is set correctly --- pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 538b55f..140e5f3 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,11 @@ org.codehaus.mojo flatten-maven-plugin -1.0.1 +1.1.0 + +true +resolveCiFriendliesOnly +
[brooklyn-docs] branch master updated (acc3e6c -> 92a24f2)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from acc3e6c Merge pull request #299 from ahgittin/more-on-quick-launch new 9c14d08 session expiring configuration doc new 6e5ce7a Added more detail new b5cbb1f Fix typos new 92a24f2 Merge pull request #300 from jcabrerizo/feature/session-doc The 1668 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: guide/ops/configuration/brooklyn_cfg.md | 27 ++- 1 file changed, 26 insertions(+), 1 deletion(-)
[brooklyn-server] branch master updated (2427be0 -> 00a8f27)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 2427be0 Merge pull request #1066 from alasdairhodge/remove-identity-from-location-tostring new 03c9197 Adding logic to manage a max session age new de0dfe1 manage SessionExpired on filter new f9b1d24 Set defaul housekeeper sessionScavengeInterval new eb6e6d9 Manage errors for UI for expiring session new df418e3 Removed unneeded function and tidied code new c88b5c1 fix test error new e930a37 replaced star import new 00a8f27 Merge pull request #1079 from jcabrerizo/feature/session-timeout The 12465 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: karaf/jetty-config/src/main/resources/jetty.xml| 12 -- .../BrooklynSecurityProviderFilterHelper.java | 38 +++- .../rest/util/MultiSessionAttributeAdapter.java| 196 ++--- 3 files changed, 197 insertions(+), 49 deletions(-)
[brooklyn-docs] branch master updated (3ba088a -> acc3e6c)
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git.
from 3ba088a Merge pull request #298 from iuliana/feature/quick-launch
new 0ed7f7d combine the quick-launch tag message with info on templates
new 4df37ef doc that "create location" suppressed
new acc3e6c Merge pull request #299 from ahgittin/more-on-quick-launch
The 1664 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
guide/SUMMARY.md | 3 +-
...log-w700.png => quick-launch-template-w700.png} | Bin
...ql-in-catalog.png => quick-launch-template.png} | Bin
guide/blueprints/catalog/quick-launch.md | 23 --
guide/blueprints/catalog/templates.md | 79 +++--
5 files changed, 73 insertions(+), 32 deletions(-)
rename guide/blueprints/catalog/{mysql-in-catalog-w700.png =>
quick-launch-template-w700.png} (100%)
rename guide/blueprints/catalog/{mysql-in-catalog.png =>
quick-launch-template.png} (100%)
delete mode 100644 guide/blueprints/catalog/quick-launch.md
[brooklyn-ui] branch master updated (1a2a0d7 -> b86b869)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 1a2a0d7 This closes #163 new 764db17 auto-set a name for the app in quick-launch, and new 3723efc addressed review comments new b86b869 Merge pull request #164 from ahgittin/quick-launch-auto-name The 1728 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../app/views/main/deploy/deploy.controller.js | 22 +++- ui-modules/home/app/views/main/main.controller.js | 30 ++ ui-modules/utils/quick-launch/quick-launch.html| 5 ++-- ui-modules/utils/quick-launch/quick-launch.js | 14 -- 4 files changed, 51 insertions(+), 20 deletions(-)
[brooklyn-server] branch master updated: JcloudsLocation: don’t expose cloud identity in toString()
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new ee9970b JcloudsLocation: don’t expose cloud identity in toString()
new 2427be0 Merge pull request #1066 from
alasdairhodge/remove-identity-from-location-tostring
ee9970b is described below
commit ee9970b02b9bf9692b8a8f80ba55e812263998a3
Author: Alasdair Hodge
AuthorDate: Wed Oct 2 22:31:02 2019 +0100
JcloudsLocation: don’t expose cloud identity in toString()
---
.../brooklyn/location/jclouds/JcloudsLocation.java | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 8d9a889..7cf9f0d 100644
---
a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -312,12 +312,21 @@ public class JcloudsLocation extends
AbstractCloudMachineProvisioningLocation im
@Override
public String toString() {
-Object identity = getIdentity();
+String className = getClass().getSimpleName();
String configDescription = config().getLocalBag().getDescription();
-if (configDescription!=null &&
configDescription.startsWith(getClass().getSimpleName()))
+String displayName = getDisplayName();
+
+if (configDescription != null &&
configDescription.startsWith(className))
return configDescription;
-return getClass().getSimpleName()+"["+getDisplayName()+":"+(identity
!= null ? identity : null)+
-(configDescription!=null ? "/"+configDescription : "") + "@" +
getId() + "]";
+
+if (displayName != null)
+return className + "['" + displayName + "']";
+
+return className + "[" +
+getIdentity() +
+(configDescription == null ? "" : "/" + configDescription) +
+"@" + getId() +
+"]";
}
@Override
[brooklyn-dist] branch feature/docker created (now 64d7712)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch feature/docker in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. at 64d7712 WIP: Mirror permissions This branch includes the following new commits: new 64d7712 WIP: Mirror permissions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-dist] 01/01: WIP: Mirror permissions
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch feature/docker
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 64d771202543deb217e7d4a0321273cce10b5b1c
Author: Thomas Bouron
AuthorDate: Fri Jan 10 15:35:49 2020 +
WIP: Mirror permissions
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 70f8461..6adee3b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,9 @@ node(label: 'ubuntu') {
stage('Run tests') {
environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v /var/run/docker.sock:/var/run/docker.sock -v ${WORKSPACE}:/usr/build -w
/usr/build') {
-sh 'mvn clean install -Prpm -Pdeb -Pdocker
-Duser.home=/var/maven -Duser.name=jenkins'
+sh 'addgroup -gid 999 docker'
+sh 'usermod -aG docker $(whoami)'
+sh 'mvn clean install -Prpm -Pdeb -Pdocker
-Duser.home=/var/maven -Duser.name=jenkins -rf :karaf-docker-image'
}
}
}
[brooklyn-dist] branch master updated: Updates NOTICE files
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git The following commit(s) were added to refs/heads/master by this push: new a21aa71 Updates NOTICE files new 6260121 Merge pull request #152 from nakomis/update-notices a21aa71 is described below commit a21aa719a1fb5311a30bcea87787fb43b04c9852 Author: Martin Harris AuthorDate: Wed Jan 8 14:02:35 2020 + Updates NOTICE files --- dist/src/main/license/files/NOTICE | 102 +++- karaf/apache-brooklyn/src/main/resources/NOTICE | 102 +++- 2 files changed, 94 insertions(+), 110 deletions(-) diff --git a/dist/src/main/license/files/NOTICE b/dist/src/main/license/files/NOTICE index b4882da..d071d61 100644 --- a/dist/src/main/license/files/NOTICE +++ b/dist/src/main/license/files/NOTICE @@ -168,9 +168,9 @@ Bundled dependencies: License name: MIT License Notice: Copyright (C) 2017 by Marijn Haverbeke and others - com.fasterxml.jackson:2.9.7: + com.fasterxml.jackson:2.9.8: Project: Jackson FasterXML -Version: 2.9.7 +Version: 2.9.8 Available at: - http://github.com/FasterXML/jackson - http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding @@ -310,11 +310,11 @@ Bundled dependencies: License name: Apache License, version 2.0 Notice: Copyright (c) Square, Inc. - com.thoughtworks.xstream:1.4.8: + com.thoughtworks.xstream:1.4.11.1: Project: XStream Core -Version: 1.4.8 +Version: 1.4.11.1 Available at: http://x-stream.github.io/ -Developed by: XStream (http://xstream.codehaus.org) +Developed by: XStream (http://x-stream.github.io) License name: BSD 3-Clause (New BSD) License commander@2.16.0: @@ -740,11 +740,7 @@ Bundled dependencies: Developed by: Dave Gandy (http://twitter.com/davegandy) License name: Font Awesome License - github.com/NodePrime/jsonpath/cli/jsonpath: -Project: github.com/NodePrime/jsonpath/cli/jsonpath -Available at: github.com/NodePrime/jsonpath/ -License name: MIT License -Notice: Copyright (c) 2015 NodePrime Inc. + github.com/kubernetes/client-go/util/jsonpath: github.com/urfave/cli: Project: github.com/urfave/cli @@ -786,11 +782,11 @@ Bundled dependencies: Available at: https://github.com/airlift/airline License name: Apache License, version 2.0 - io.cloudsoft.windows:0.6.1: + io.cloudsoft.windows:0.7.0: Project: - Java WinRM library - WinRM Client -Version: 0.6.1 +Version: 0.7.0 Available at: http://github.com/cloudsoft/winrm4j License name: Apache License, version 2.0 @@ -851,12 +847,6 @@ Bundled dependencies: Developed by: Thomas Bouron License name: Apache License, version 2.0 - javax.activation:1.1.1: -Project: JavaBeans(TM) Activation Framework -Version: 1.1.1 -Available at: http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp -License name: Common Development and Distribution License, version 1.0 - javax.annotation.javax.annotation-api:1.3: Project: javax.annotation API Version: 1.3 @@ -896,13 +886,6 @@ Bundled dependencies: Developed by: Eclipse Foundation (https://www.eclipse.org/org/foundation/) License name: Common Development and Distribution License, version 1.1 - javax.xml.bind.jaxb-api:2.2.11: -Project: Java Architecture for XML Binding -Version: 2.2.11 -Available at: http://jaxb.java.net/ -Developed by: Oracle Corporation (http://www.oracle.com/) -License name: Common Development and Distribution License, version 1.1 - joda-time:2.7: Project: Joda-Time Version: 2.7 @@ -1029,11 +1012,11 @@ Bundled dependencies: License name: Creative Commons Public License, Attribution 3.0 Notice: Includes icons by Evan Shuster, Sarah Joy, Jack Zwanenburg - org.apache.commons.commons-compress:1.4: -Project: Commons Compress -Version: 1.4 -Available at: http://commons.apache.org/compress/ -Developed by: The Apache Software Foundation (http://www.apache.org/) + org.apache.commons.commons-compress:1.18: +Project: Apache Commons Compress +Version: 1.18 +Available at: https://commons.apache.org/proper/commons-compress/ +Developed by: The Apache Software Foundation (https://www.apache.org/) License name: Apache License, version 2.0 org.apache.commons.commons-lang3:3.3.2: @@ -1043,20 +1026,34 @@ Bundled dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.cxf:3.2.7: + org.apache.cxf:3.2.8: Project: Apache CXF -Version
[brooklyn-server] branch master updated: Updates NOTICE files
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new 0730c75 Updates NOTICE files new da3e5ee Merge pull request #1082 from nakomis/update-noticies 0730c75 is described below commit 0730c75d58a85d6e549f8f2228409f3a4d49b5d4 Author: Martin Harris AuthorDate: Wed Jan 8 14:06:51 2020 + Updates NOTICE files --- NOTICE| 54 ++- server-cli/NOTICE | 96 ++- 2 files changed, 70 insertions(+), 80 deletions(-) diff --git a/NOTICE b/NOTICE index ee9424a..c2f8899 100644 --- a/NOTICE +++ b/NOTICE @@ -69,9 +69,9 @@ Runtime dependencies: Developed by: QOS.ch (http://www.qos.ch) License name: Eclipse Public License, version 1.0 - com.fasterxml.jackson:2.9.7: + com.fasterxml.jackson:2.9.8: Project: Jackson FasterXML -Version: 2.9.7 +Version: 2.9.8 Available at: - http://github.com/FasterXML/jackson - https://github.com/FasterXML/jackson-core @@ -189,11 +189,11 @@ Runtime dependencies: License name: Apache License, version 2.0 Notice: Copyright (c) Square, Inc. - com.thoughtworks.xstream:1.4.8: + com.thoughtworks.xstream:1.4.11.1: Project: XStream Core -Version: 1.4.8 +Version: 1.4.11.1 Available at: http://x-stream.github.io/ -Developed by: XStream (http://xstream.codehaus.org) +Developed by: XStream (http://x-stream.github.io) License name: BSD 3-Clause (New BSD) License commons-beanutils:1.9.3: @@ -231,11 +231,11 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - io.cloudsoft.windows:0.6.1: + io.cloudsoft.windows:0.7.0: Project: - Java WinRM library - WinRM Client -Version: 0.6.1 +Version: 0.7.0 Available at: http://github.com/cloudsoft/winrm4j License name: Apache License, version 2.0 @@ -292,11 +292,11 @@ Runtime dependencies: Developed by: Chemouni Uriel (http://www.minidev.net/) License name: Apache License, version 2.0 - org.apache.commons.commons-compress:1.4: -Project: Commons Compress -Version: 1.4 -Available at: http://commons.apache.org/compress/ -Developed by: The Apache Software Foundation (http://www.apache.org/) + org.apache.commons.commons-compress:1.18: +Project: Apache Commons Compress +Version: 1.18 +Available at: https://commons.apache.org/proper/commons-compress/ +Developed by: The Apache Software Foundation (https://www.apache.org/) License name: Apache License, version 2.0 org.apache.commons.commons-lang3:3.3.2: @@ -306,16 +306,16 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.cxf:3.2.7: + org.apache.cxf:3.2.8: Project: Apache CXF -Version: 3.2.7 +Version: 3.2.8 Available at: http://cxf.apache.org Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.felix.org.apache.felix.framework:5.6.10: + org.apache.felix.org.apache.felix.framework:5.6.12: Project: Apache Felix Framework -Version: 5.6.10 +Version: 5.6.12 Available at: http://felix.apache.org/ Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 @@ -362,16 +362,16 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.karaf.jaas.org.apache.karaf.jaas.boot:4.2.2: + org.apache.karaf.jaas.org.apache.karaf.jaas.boot:4.2.7: Project: Apache Karaf :: JAAS :: Boot -Version: 4.2.2 +Version: 4.2.7 Available at: https://www.apache.org/ Developed by: The Apache Software Foundation (https://www.apache.org/) License name: Apache License, version 2.0 - org.apache.karaf.shell.org.apache.karaf.shell.core:4.2.2: + org.apache.karaf.shell.org.apache.karaf.shell.core:4.2.7: Project: Apache Karaf :: Shell :: Core -Version: 4.2.2 +Version: 4.2.7 Available at: https://www.apache.org/ Developed by: The Apache Software Foundation (https://www.apache.org/) License name: Apache License, version 2.0 @@ -390,9 +390,9 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.ws.xmlschema.xmlschema-core:2.2.3
[brooklyn-client] branch master updated: Updates NOTICE files
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git The following commit(s) were added to refs/heads/master by this push: new 39564e0 Updates NOTICE files new 6404b30 Merge pull request #82 from nakomis/notice-update 39564e0 is described below commit 39564e0bc841adecc7d7c719b39236ea8930b36e Author: Martin Harris AuthorDate: Wed Jan 8 13:59:26 2020 + Updates NOTICE files --- NOTICE | 20 cli/NOTICE | 6 +- cli/release/license/files/NOTICE | 6 +- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/NOTICE b/NOTICE index 7781bc2..874f6b7 100644 --- a/NOTICE +++ b/NOTICE @@ -12,11 +12,7 @@ Bundled dependencies: # This software includes the following bundled third-party components. # Referenced licenses can be found in the accompanying LICENSE file. - github.com/NodePrime/jsonpath/cli/jsonpath: -Project: github.com/NodePrime/jsonpath/cli/jsonpath -Available at: github.com/NodePrime/jsonpath/ -License name: MIT License -Notice: Copyright (c) 2015 NodePrime Inc. + github.com/kubernetes/client-go/util/jsonpath: github.com/urfave/cli: Project: github.com/urfave/cli @@ -43,9 +39,9 @@ Runtime dependencies: Developed by: QOS.ch (http://www.qos.ch) License name: Eclipse Public License, version 1.0 - com.fasterxml.jackson:2.9.7: + com.fasterxml.jackson:2.9.8: Project: Jackson FasterXML -Version: 2.9.7 +Version: 2.9.8 Available at: - http://github.com/FasterXML/jackson - https://github.com/FasterXML/jackson-core @@ -118,11 +114,11 @@ Runtime dependencies: Developed by: MaxMind, Inc. (http://www.maxmind.com/) License name: Apache License, version 2.0 - com.thoughtworks.xstream:1.4.8: + com.thoughtworks.xstream:1.4.11.1: Project: XStream Core -Version: 1.4.8 +Version: 1.4.11.1 Available at: http://x-stream.github.io/ -Developed by: XStream (http://xstream.codehaus.org) +Developed by: XStream (http://x-stream.github.io) License name: BSD 3-Clause (New BSD) License commons-codec:1.10: @@ -217,9 +213,9 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.felix.org.apache.felix.framework:5.6.10: + org.apache.felix.org.apache.felix.framework:5.6.12: Project: Apache Felix Framework -Version: 5.6.10 +Version: 5.6.12 Available at: http://felix.apache.org/ Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 diff --git a/cli/NOTICE b/cli/NOTICE index 10a7882..0aa41fc 100644 --- a/cli/NOTICE +++ b/cli/NOTICE @@ -12,11 +12,7 @@ Bundled dependencies: # This software includes the following bundled third-party components. # Referenced licenses can be found in the accompanying LICENSE file. - k8s.io/client-go: -Project: k8s.io/client-go -Available at: https://github.com/kubernetes/client-go -License name: Apache 2.0 -Notice: Copyright The Kubernetes Authors. + github.com/kubernetes/client-go/util/jsonpath: github.com/urfave/cli: Project: github.com/urfave/cli diff --git a/cli/release/license/files/NOTICE b/cli/release/license/files/NOTICE index 333165a..cfcb162 100644 --- a/cli/release/license/files/NOTICE +++ b/cli/release/license/files/NOTICE @@ -12,11 +12,7 @@ Bundled dependencies: # This software includes the following bundled third-party components. # Referenced licenses can be found in the accompanying LICENSE file. - k8s.io/client-go: -Project: k8s.io/client-go -Available at: https://github.com/kubernetes/client-go -License name: Apache 2.0 -Notice: Copyright The Kubernetes Authors. + github.com/kubernetes/client-go/util/jsonpath: github.com/urfave/cli: Project: github.com/urfave/cli
[brooklyn-server] branch master updated: Add support for use of DSL when specifying the pattern for $brooklyn:formatString()
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 7d61a9d Add support for use of DSL when specifying the pattern for
$brooklyn:formatString()
new f2160cb Merge pull request #1081 from tbouron/fix/dsl-format-string
7d61a9d is described below
commit 7d61a9d7c8e3eb118083bc130c7b7ef62bc5088e
Author: Thomas Bouron
AuthorDate: Mon Jan 6 17:31:21 2020 +
Add support for use of DSL when specifying the pattern for
$brooklyn:formatString()
---
.../spi/dsl/methods/BrooklynDslCommon.java | 14 ++---
.../brooklyn/spi/dsl/DslParseComponentsTest.java | 12 +++
.../core/sensor/DependentConfiguration.java| 24 ++
3 files changed, 35 insertions(+), 15 deletions(-)
diff --git
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index 518b501..3c398ab 100644
---
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -368,10 +368,10 @@ public class BrooklynDslCommon {
* are not yet fully resolved.
*/
@DslAccessible
-public static Object formatString(final String pattern, final
Object...args) {
-if (resolved(args)) {
+public static Object formatString(final Object pattern, final
Object...args) {
+if (resolved(Lists.asList(pattern, args))) {
// if all args are resolved, apply the format string now
-return String.format(pattern, args);
+return String.format(String.valueOf(pattern), args);
} else {
return new DslFormatString(pattern, args);
}
@@ -433,16 +433,16 @@ public class BrooklynDslCommon {
/**
* Deferred execution of String formatting.
*
- * @see DependentConfiguration#formatString(String, Object...)
+ * @see DependentConfiguration#formatString(Object, Object...)
*/
protected static class DslFormatString extends
BrooklynDslDeferredSupplier {
private static final long serialVersionUID = -4849297712650560863L;
-private final String pattern;
+private final Object pattern;
private final Object[] args;
-public DslFormatString(String pattern, Object ...args) {
+public DslFormatString(Object pattern, Object ...args) {
this.pattern = pattern;
this.args = args;
}
@@ -526,7 +526,7 @@ public class BrooklynDslCommon {
@SuppressWarnings({ "serial", "unused" })
@Deprecated
private static class FormatString extends DslFormatString {
-public FormatString(String pattern, Object[] args) {
+public FormatString(Object pattern, Object[] args) {
super(pattern, args);
}
}
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseComponentsTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseComponentsTest.java
index 1e8ccb8..ddd8a1f 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseComponentsTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseComponentsTest.java
@@ -57,6 +57,7 @@ public class DslParseComponentsTest extends AbstractYamlTest {
" brooklyn.config:",
"dest: 1",
"dest2: 1",
+"pattern: '%s-%s'",
" brooklyn.children:",
" - type: "+BasicEntity.class.getName(),
"id: two",
@@ -133,6 +134,17 @@ public class DslParseComponentsTest extends
AbstractYamlTest {
}
@Test
+public void testFormatStringWithDslPatternEvaluation() throws Exception {
+app();
+
+Object y1 =
parseDslExpression("$brooklyn:formatString($brooklyn:config(\"pattern\"),
$brooklyn:config(\"dest\"), $brooklyn:config(\"dest2\"))");
+Assert.assertEquals(y1.toString(),
"$brooklyn:formatString(config(\"pattern\"), config(\"dest\"),
config(\"dest2\"))");
+
+String y2 = Tasks.resolveValue(y1, String.class, ((EntityInternal)
find("one")).getExecutionContext());
+Assert.assertEquals(y2.toString(), "1-1");
+}
+
+@Test
public void testEntityReferenceAndAttributeWhenReady() throws Exception
[brooklyn-docs] branch master updated (5237ea6 -> 3ba088a)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from 5237ea6 Merge pull request #295 from nakomis/clarify-localhost new ce6b6fc Added documentation snipped to show how entities can be tagged and added to the quick launch new 9a3e973 Added header for adding catalog items to Quick Launch new 3ba088a Merge pull request #298 from iuliana/feature/quick-launch The 1661 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: guide/SUMMARY.md | 1 + guide/blueprints/catalog/quick-launch.md | 23 +++ guide/blueprints/catalog/schema.md | 1 + 3 files changed, 25 insertions(+) create mode 100644 guide/blueprints/catalog/quick-launch.md
[brooklyn-server] branch master updated (43c8b11 -> 87149c9)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 43c8b11 This closes #1080 new c8e7b27 add missing DTO accessors and "add policy" test new 63c6a3f fix mistaken variable name in dashboard aggregator new edc5f37 allow extended transformers or full CAMP app plans to be supplied as entity spec new 05b88b8 stop/destroy adjuncts when we destroy the entity new 4498e09 better error reporting for type transformers, missing types, and bad parses new d173d5d suppress spurious warning on speculative class loads new b0581df some ideas of things we could do new 11b76a9 Merge branch 'master' into tidies5 new 914ed9c tidy warnings new 4422a2a fix tests - exception type changed new 714747e add support for DSL expressions when adding a policy, and fix new add-policy test new 87149c9 Merge pull request #1075 from ahgittin/tidies5 The 12451 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../BrooklynComponentTemplateResolver.java | 60 - .../spi/creation/BrooklynYamlTypeInstantiator.java | 8 +-- .../spi/creation/CampTypePlanTransformer.java | 59 ++--- .../brooklyn/spi/dsl/BrooklynDslInterpreter.java | 2 + .../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java | 77 ++ .../spi/dsl/methods/BrooklynDslCommon.java | 2 + .../camp/brooklyn/spi/dsl/parse/DslParser.java | 2 +- .../brooklyn/ValidationMissingTypeYamlTest.java| 71 ++-- .../camp/brooklyn/spi/dsl/DslYamlTest.java | 3 +- .../camp/brooklyn/spi/dsl/TagsYamlTest.java| 31 + .../mgmt/internal/EntityManagementSupport.java | 27 ++-- .../apache/brooklyn/core/sensor/StaticSensor.java | 1 + .../core/typereg/BasicBrooklynTypeRegistry.java| 30 + .../core/typereg/BrooklynTypePlanTransformer.java | 3 + .../core/typereg/TypePlanTransformers.java | 12 ++-- .../stock/aggregator/DashboardAggregator.java | 4 +- .../brooklyn/util/core/ClassLoaderUtils.java | 10 ++- .../action/AbstractScheduledEffectorPolicy.java| 7 ++ .../policy/action/PeriodicEffectorPolicy.java | 1 + .../policy/action/PeriodicEffectorPolicyTest.java | 8 +++ .../org/apache/brooklyn/rest/api/AdjunctApi.java | 1 + .../apache/brooklyn/rest/domain/AdjunctDetail.java | 10 ++- .../brooklyn/rest/resources/AdjunctResource.java | 11 +++- .../rest/resources/ApplicationResource.java| 2 +- .../rest/resources/AdjunctResourceTest.java| 50 -- 25 files changed, 407 insertions(+), 85 deletions(-)
[brooklyn-ui] branch tbouron-patch-2 created (now 68a58a2)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-2 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at 68a58a2 Fixing an issue when building brooklyn-ui for downstream projects No new revisions were added by this update.
[brooklyn-ui] branch master updated (b6fe1a1 -> 4b749c4)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from b6fe1a1 Merge pull request #158 from apache/tbouron-patch-3 new 3add43f adds start time information to application data to allow ordering by launch time new 41852db add button to determine sort order and local storage to save preferences new 8871783 adjust entity tree header elements and styling new ddcf4f6 refactor to use time data from server new 4b749c4 Merge pull request #150 from frogfather/order-blueprints-by-date The 1715 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../entity-tree/entity-tree.directive.js | 7 ++-- .../app/components/entity-tree/entity-tree.html| 2 +- .../app/views/main/main.controller.js | 16 + ui-modules/app-inspector/app/views/main/main.less | 6 ++-- .../app/views/main/main.template.html | 41 +- 5 files changed, 48 insertions(+), 24 deletions(-)
[brooklyn-ui] branch master updated (c2443d6 -> 7d09a33)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from c2443d6 Merge pull request #152 from ahgittin/fix-composer-open new 6e3d06f add custom onChange directive to correct file uploader bug new 55fc892 remove blank lines new 7d09a33 Merge pull request #154 from frogfather/file-uploader-bug The 1705 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../utils/catalog-uploader/catalog-uploader.html | 2 +- .../utils/catalog-uploader/catalog-uploader.js | 24 +++--- 2 files changed, 22 insertions(+), 4 deletions(-)
[brooklyn-ui] branch master updated: Reuse local maven cache + add PR comment trigger
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 21ea4bb Reuse local maven cache + add PR comment trigger
new af3533c Merge pull request #151 from tbouron/feature/jenkins
21ea4bb is described below
commit 21ea4bb7db93148238875edb0155fb9043c4ca85
Author: Thomas Bouron
AuthorDate: Thu Dec 5 10:27:03 2019 +
Reuse local maven cache + add PR comment trigger
---
Jenkinsfile | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
*/
node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
catchError {
def environmentDockerImage
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
-
-// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
}
}
}
[brooklyn-ui] branch tbouron-patch-2 created (now 284c449)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-2 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at 284c449 DO NOT MERGE - This is to test the new Jenkins job No new revisions were added by this update.
[brooklyn-dist] branch master updated (4a2193b -> 10953ee)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. from 4a2193b This closes #149 new b142e43 Use the .m2 folder created within the workspace between stages new e929289 Add issue comment build trigger new 10953ee Merge pull request #147 from tbouron/tbouron-patch-1 The 799 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile | 12 1 file changed, 8 insertions(+), 4 deletions(-)
[brooklyn] branch master updated: Ignores .java-version (jenv config file)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git The following commit(s) were added to refs/heads/master by this push: new bd16f4d Ignores .java-version (jenv config file) new 47c1246 Merge pull request #31 from nakomis/ignore-java-version bd16f4d is described below commit bd16f4d3e1d1b5d5afc24f528bf1ad112d6ec6ad Author: Martin Harris AuthorDate: Wed Nov 27 16:04:05 2019 + Ignores .java-version (jenv config file) --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ed439f2..d247468 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ brooklyn*.log.* *brooklyn-persisted-state/ ignored + +.java-version
[brooklyn] branch master updated: fixup README.md
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git The following commit(s) were added to refs/heads/master by this push: new 7e815e4 fixup README.md new f7ef3e7 Merge pull request #32 from infrastation/master 7e815e4 is described below commit 7e815e4adbe11ccf09d23a19be87a10084f5e9c5 Author: Denis Ovsienko AuthorDate: Thu Nov 28 12:33:22 2019 + fixup README.md Switch some URLs to HTTPS and put some fencing right. --- README.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index de29827..e345bf6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# [](http://brooklyn.apache.org/) +# [](https://brooklyn.apache.org/) ### Apache Brooklyn helps to model, deploy, and manage systems. @@ -18,7 +18,7 @@ where you'll find: This is the uber-repo. To build the entire codebase, get this project and its sub-modules: -git clone http://github.com/apache/brooklyn/ +git clone https://github.com/apache/brooklyn/ cd brooklyn git submodule init git submodule update --remote --merge --recursive @@ -62,8 +62,8 @@ pushd brooklyn-dist/karaf/apache-brooklyn/target/assembly/ If you are performing a build on code not in source control (e.g. from a ZIP of source code, or after deleting SCM metadata), you will need to manually set two variables that are normally inferred from the environment: -* `-DbuildNumber=manual` -* `-DscmBranch=manual` +* `-DbuildNumber=manual` +* `-DscmBranch=manual` You can set these properties to any value you wish. When using a checkout from git, the `buildNumber` is set to the SHA1 commit ID (short form) of the containing project, and the `scmBranch` is set to the git branch. @@ -80,7 +80,7 @@ Useful topics include: * **[setting up Git](https://brooklyn.apache.org/developers/code/git-more.html)** with forks, submodules (or alternatively [avoiding submodules](https://brooklyn.apache.org/developers/code/git-more.html#not-using-submodules)) and other productivity hints -* the **[maven build](http://brooklyn.apache.org/v/latest/dev/env/maven-build.html)** and what to do on build errors +* the **[maven build](https://brooklyn.apache.org/v/latest/dev/env/maven-build.html)** and what to do on build errors * **[project structure](https://brooklyn.apache.org/v/1.0.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
[brooklyn-docs] branch master updated: Updates localhost doc to add a deployable example
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 3ac4d4f Updates localhost doc to add a deployable example
new 5237ea6 Merge pull request #295 from nakomis/clarify-localhost
3ac4d4f is described below
commit 3ac4d4f7018f36608f9dfa728a46dc1b17e2883c
Author: Martin Harris
AuthorDate: Tue Dec 3 14:10:41 2019 +
Updates localhost doc to add a deployable example
Also bumps some of the dependencies, which was required
to build the docs
---
.gitignore|2 +-
guide/locations/_localhost.md |6 +
package-lock.json | 2155 +
package.json |3 +-
4 files changed, 1102 insertions(+), 1064 deletions(-)
diff --git a/.gitignore b/.gitignore
index b0f4fbc..17e5bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ nb-configuration.xml
_book
node_modules
javadoc/stylesheet.css
-javadoc/javadoc.log
\ No newline at end of file
+javadoc/javadoc.log
diff --git a/guide/locations/_localhost.md b/guide/locations/_localhost.md
index bafab8c..77a65cd 100644
--- a/guide/locations/_localhost.md
+++ b/guide/locations/_localhost.md
@@ -4,6 +4,12 @@ If passwordless ssh login to `localhost` and passwordless
`sudo` is enabled on y
machine, you should be able to deploy some blueprints with no special
configuration,
just by specifying `location: localhost` in YAML.
+For example:
+
+location: localhost
+services:
+- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
+
If you use a passphrase or prefer a different key, these can be configured as
follows:
location:
diff --git a/package-lock.json b/package-lock.json
index 7823ee4..8acc22b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,8 @@
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz;,
"integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"acorn-globals": {
"version": "1.0.9",
@@ -24,7 +25,7 @@
"dev": true,
"optional": true,
"requires": {
-"acorn": "2.7.0"
+"acorn": "^2.1.0"
}
},
"ajv": {
@@ -34,10 +35,10 @@
"dev": true,
"optional": true,
"requires": {
-"co": "4.6.0",
-"fast-deep-equal": "1.0.0",
-"json-schema-traverse": "0.3.1",
-"json-stable-stringify": "1.0.1"
+"co": "^4.6.0",
+"fast-deep-equal": "^1.0.0",
+"json-schema-traverse": "^0.3.0",
+"json-stable-stringify": "^1.0.1"
}
},
"amdefine": {
@@ -55,17 +56,21 @@
"optional": true
},
"asn1": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz;,
- "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz;,
+ "integrity":
"sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"dev": true,
- "optional": true
+ "optional": true,
+ "requires": {
+"safer-buffer": "~2.1.0"
+ }
},
"assert-plus": {
"version": "1.0.0",
"resolved":
"https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz;,
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"asynckit": {
"version": "0.4.0",
@@ -95,13 +100,13 @@
"dev": true
},
"bcrypt-pbkdf": {
- "version": "1.0.1",
- "resolved":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz;,
- "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+ "version": "1.0.2",
+ "resolved":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz;,
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
[brooklyn] branch master updated: Add jenkinsfile for multibranch job on Jenkins
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn.git
The following commit(s) were added to refs/heads/master by this push:
new ae872cd Add jenkinsfile for multibranch job on Jenkins
new 4a83d86 Merge pull request #33 from tbouron/master
ae872cd is described below
commit ae872cda08b0a5ed5662597162cd17032df9b075
Author: Thomas Bouron
AuthorDate: Tue Dec 3 11:33:28 2019 +
Add jenkinsfile for multibranch job on Jenkins
---
Dockerfile | 11 ++-
Jenkinsfile | 23 +++
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d681655..0f8f2b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,8 @@ RUN apt-get update && apt-get install -y \
rpm \
dpkg \
libpng-dev \
+libjpeg-progs \
+pngquant \
make \
automake \
autoconf \
@@ -39,6 +41,13 @@ RUN apt-get update && apt-get install -y \
nasm \
gcc
-# For mvn-build
+# Make sure the /.config && /.npm (for UI module builds) is writable for all
users
+RUN mkdir -p /.config && chmod -R 777 /.config
+RUN mkdir -p /.npm && chmod -R 777 /.npm
+
+# Make sure the /var/tmp (for RPM build) is writable for all users
+RUN mkdir -p /var/tmp/ && chmod -R 777 /var/tmp/
+
+# Make sure the /var/maven is writable for all users
RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
ENV MAVEN_CONFIG=/var/maven/.m2
diff --git a/Jenkinsfile b/Jenkinsfile
index c41da46..4461e53 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,21 @@
*/
node(label: 'ubuntu') {
+def triggers = []
+if (env.CHANGE_ID) {
+triggers.push(issueCommentTrigger('.*test this please.*'))
+}
+if (env.BRANCH_NAME == 'master') {
+triggers.push(upstream(
+threshold: 'SUCCESS',
+upstreamProjects: '../brooklyn-server/master,
../brooklyn-library/master, ../brooklyn-ui/master, ../brooklyn-client/master,
../brooklyn-dist/master'
+))
+}
+
+properties([
+pipelineTriggers(triggers)
+])
+
catchError {
def environmentDockerImage
@@ -38,16 +53,16 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --rm --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn clean install -Prpm -Pdeb -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
// Conditional stage to deploy artifacts, when not building a PR
if (env.CHANGE_ID == null) {
stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --rm --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn deploy -Prpm -Pdeb -DskipTests
-Duser.home=/var/maven -Duser.name=jenkins'
}
}
}
[brooklyn-server] branch master updated: Reuse local maven cache + add PR comment trigger
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new b3c9759 Reuse local maven cache + add PR comment trigger
new 0a01c97 Merge pull request #1072 from tbouron/feature/jenkins
b3c9759 is described below
commit b3c975956fc508fb0a8d2828cf7342ad50e9cdca
Author: Thomas Bouron
AuthorDate: Thu Dec 5 10:24:34 2019 +
Reuse local maven cache + add PR comment trigger
---
Jenkinsfile | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
*/
node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
catchError {
def environmentDockerImage
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
-
-// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
}
}
}
[brooklyn-library] branch master updated: Reuse local maven cache + add PR comment trigger
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 09b8f68 Reuse local maven cache + add PR comment trigger
new 56d817d Merge pull request #176 from tbouron/feature/jenkins
09b8f68 is described below
commit 09b8f68d170cef63fc8eab92f3063efe8dd97196
Author: Thomas Bouron
AuthorDate: Thu Dec 5 10:26:05 2019 +
Reuse local maven cache + add PR comment trigger
---
Jenkinsfile | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
*/
node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
catchError {
def environmentDockerImage
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
-
-// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
}
}
}
[brooklyn-client] branch master updated: Reuse local maven cache + add PR comment trigger
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git
The following commit(s) were added to refs/heads/master by this push:
new 0f56b31 Reuse local maven cache + add PR comment trigger
new 0c02b7b Merge pull request #80 from tbouron/feature/jenkins
0f56b31 is described below
commit 0f56b319709e709474dba6d145077632f464e6fb
Author: Thomas Bouron
AuthorDate: Thu Dec 5 10:27:55 2019 +
Reuse local maven cache + add PR comment trigger
---
Jenkinsfile | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
*/
node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
catchError {
def environmentDockerImage
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
}
stage('Run tests') {
-environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
-
-// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
}
}
}
[brooklyn-ui] branch master updated (7bfa16e -> bb17638)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 7bfa16e Make sure /.config and /.npm directory are writable for all users. new 5dffd11 corrects pagination issue new cebcf58 changes following code review new 00a214d change selector new 69d8d56 correct selector new bb17638 Merge pull request #148 from frogfather/correct-pagination The 1694 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalog-selector/catalog-selector.directive.js | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-)
[brooklyn-library] branch master updated: Fixes ansible runAnsible task
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 4b77d7f Fixes ansible runAnsible task
new 8347b1e Merge pull request #174 from nakomis/fix/ansible
4b77d7f is described below
commit 4b77d7fa884486ff891139490d978f9bc8cc
Author: Martin Harris
AuthorDate: Thu Jun 27 13:37:37 2019 +0100
Fixes ansible runAnsible task
---
.../org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
index a574f35..fffbcea 100644
---
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
+++
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
@@ -71,7 +71,7 @@ public class AnsiblePlaybookTasks {
public static TaskFactory runAnsible(final String dir, Object
extraVars, String playbookName) {
String cmd = sudo(String.format("ansible-playbook "
+ optionalExtraVarsParameter(extraVars)
-+ " -s %s.yaml", playbookName));
++ " -b %s.yaml", playbookName));
if (LOG.isDebugEnabled()) {
LOG.debug("Ansible command: {}", cmd);
[brooklyn-ui] branch master updated (fceb104 -> 7bfa16e)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from fceb104 Fix typo in Dockerfile add 7bfa16e Make sure /.config and /.npm directory are writable for all users. No new revisions were added by this update. Summary of changes: Dockerfile | 7 +++ 1 file changed, 7 insertions(+)
[brooklyn-dist] branch master updated (d31829e -> fdf96d6)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. from d31829e Merge pull request #143 from tbouron/master add fdf96d6 Make sure the directory use for the RPM build is writable for all users on the docker container No new revisions were added by this update. Summary of changes: Dockerfile | 4 1 file changed, 4 insertions(+)
[brooklyn-ui] branch master updated: Add jenkinsfile for multibranch job on Jenkins
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 8865c00 Add jenkinsfile for multibranch job on Jenkins
new eccc1f3 Merge pull request #149 from tbouron/master
8865c00 is described below
commit 8865c00c66d0983d13a8bfc8371b97ee23ee3896
Author: Thomas Bouron
AuthorDate: Tue Dec 3 11:30:56 2019 +
Add jenkinsfile for multibranch job on Jenkins
---
Dockerfile | 5 +++-
Jenkinsfile | 82 +
2 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ff26a35..49faea2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,4 +28,7 @@ RUN apt-get update && apt-get install -y git-core \
dpkg \
pkg-config \
nasm \
-gcc \
\ No newline at end of file
+gcc \
+
+RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
+ENV MAVEN_CONFIG=/var/maven/.m2
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..05aca28
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+node(label: 'ubuntu') {
+catchError {
+def environmentDockerImage
+
+def dockerTag = env.BUILD_TAG.replace('%2F', '-')
+
+withEnv(["DOCKER_TAG=${dockerTag}"]) {
+stage('Clone repository') {
+checkout scm
+}
+
+stage('Prepare environment') {
+echo 'Creating maven cache ...'
+sh 'mkdir -p ${WORKSPACE}/.m2'
+echo 'Building docker image for test environment ...'
+environmentDockerImage = docker.build('brooklyn:${DOCKER_TAG}')
+}
+
+stage('Run tests') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
+}
+}
+
+// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
+}
+}
+
+// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
+}
+}
+}
+
+// Post actions steps, to always perform
+
+stage('Publish test results') {
+// Publish JUnit results
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/junitreports/*.xml'
+
+// Publish TestNG results
+step([
+$class: 'Publisher',
+reportFilenamePattern: '**/testng-results.xml'
+])
+}
+
+// Conditional stage, when not building a PR
+if (env.CHANGE_ID == null) {
+stage('Send notifications') {
+// Send email notifications
+step([
+$class: 'Mailer',
+notifyEveryUnstableBuild: true,
+recipients: 'd...@brooklyn.apache.org',
+sendToIndividuals: false
+])
+}
+}
+}
[brooklyn-client] branch master updated: Add jenkinsfile for multibranch job on Jenkins
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git
The following commit(s) were added to refs/heads/master by this push:
new 9da8faf Add jenkinsfile for multibranch job on Jenkins
new 510a388 Merge pull request #79 from tbouron/master
9da8faf is described below
commit 9da8faf59093dfee677a080c252e13f3c69f564f
Author: Thomas Bouron
AuthorDate: Tue Dec 3 11:26:21 2019 +
Add jenkinsfile for multibranch job on Jenkins
---
Dockerfile | 3 ++-
Jenkinsfile | 82 +
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index dc7f650..af4dfa7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,4 +21,5 @@ FROM maven:3.5.4-jdk-8-slim
# Install necessary binaries to build brooklyn-client
RUN apt-get update && apt-get install -y git-core golang-go
-RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
\ No newline at end of file
+RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
+ENV MAVEN_CONFIG=/var/maven/.m2
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..05aca28
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+node(label: 'ubuntu') {
+catchError {
+def environmentDockerImage
+
+def dockerTag = env.BUILD_TAG.replace('%2F', '-')
+
+withEnv(["DOCKER_TAG=${dockerTag}"]) {
+stage('Clone repository') {
+checkout scm
+}
+
+stage('Prepare environment') {
+echo 'Creating maven cache ...'
+sh 'mkdir -p ${WORKSPACE}/.m2'
+echo 'Building docker image for test environment ...'
+environmentDockerImage = docker.build('brooklyn:${DOCKER_TAG}')
+}
+
+stage('Run tests') {
+environmentDockerImage.inside('-i --name
brooklyn-${DOCKER_TAG} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
+}
+}
+
+// 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} --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
+}
+}
+
+// TODO: Publish docker image to
https://hub.docker.com/r/apache/brooklyn/ ?
+}
+}
+}
+
+// Post actions steps, to always perform
+
+stage('Publish test results') {
+// Publish JUnit results
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/junitreports/*.xml'
+
+// Publish TestNG results
+step([
+$class: 'Publisher',
+reportFilenamePattern: '**/testng-results.xml'
+])
+}
+
+// Conditional stage, when not building a PR
+if (env.CHANGE_ID == null) {
+stage('Send notifications') {
+// Send email notifications
+step([
+$class: 'Mailer',
+notifyEveryUnstableBuild: true,
+recipients: 'd...@brooklyn.apache.org',
+sendToIndividuals: false
+])
+}
+}
+}
[brooklyn-server] 01/01: Ignore RAT check for `.brooklyn` persisted state created by tests
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch tbouron-patch-1 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit 8577c67fa4e2990c53d662002a050c3f5be9ddf9 Author: Thomas Bouron AuthorDate: Tue Dec 3 09:25:52 2019 + Ignore RAT check for `.brooklyn` persisted state created by tests --- parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index f8d1bc4..e7c04d2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1136,6 +1136,8 @@ docs/** **/.m2/** + + **/.brooklyn/**
[brooklyn-server] branch tbouron-patch-1 created (now 8577c67)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-1 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. at 8577c67 Ignore RAT check for `.brooklyn` persisted state created by tests This branch includes the following new commits: new 8577c67 Ignore RAT check for `.brooklyn` persisted state created by tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-server] branch master updated: Remove override for karaf jaxb-api following upgrade to 4.2.7
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 528ff98 Remove override for karaf jaxb-api following upgrade to 4.2.7
new 894faf4 Merge pull request #1069 from geomacy/karaf-jaxb-version
528ff98 is described below
commit 528ff9804d94582c8fb4a8c9800624c08dc29077
Author: Geoff Macartney
AuthorDate: Sun Dec 1 16:27:43 2019 +
Remove override for karaf jaxb-api following upgrade to 4.2.7
Following #1068 "Bumps karaf version to 4.2.7 (latest)" the Brooklyn build
was
failing with the below error. Seems we can now remove the override from
81edd728
as part of #1035 "Use dependencyManagement from Karaf as a bom".
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-remote-resources-plugin:1.5:process (default) on
project rpm-packaging: Failed to resolve dependencies for one or more projects
in the reactor. Reason: Missing:
[ERROR] --
[ERROR] 1) javax.xml.bind:jaxb-api:jar:2.3.2
[ERROR]
[ERROR] Try downloading the file manually from the project website.
[ERROR]
[ERROR] Then, install it using the command:
[ERROR] mvn install:install-file -DgroupId=javax.xml.bind
-DartifactId=jaxb-api -Dversion=2.3.2 -Dpackaging=jar -Dfile=/path/to/file
[ERROR]
[ERROR] Alternatively, if you host your own repository you can deploy the
file there:
[ERROR] mvn deploy:deploy-file -DgroupId=javax.xml.bind
-DartifactId=jaxb-api -Dversion=2.3.2 -Dpackaging=jar -Dfile=/path/to/file
-Durl=[url] -DrepositoryId=[id]
[ERROR]
[ERROR] Path to dependency:
[ERROR] 1) org.apache.brooklyn:rpm-packaging:pom:1.0.0-SNAPSHOT
[ERROR] 2) org.apache.brooklyn:apache-brooklyn:zip:1.0.0-SNAPSHOT
[ERROR] 3) org.apache.karaf.features:enterprise:xml:features:4.2.7
[ERROR] 4) org.hibernate:hibernate-osgi:jar:5.4.2.Final
[ERROR] 5) org.hibernate:hibernate-core:jar:5.4.2.Final
[ERROR] 6) javax.xml.bind:jaxb-api:jar:2.3.2
[ERROR]
---
parent/pom.xml | 8
1 file changed, 8 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a166956..f8d1bc4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,14 +144,6 @@
org.osgi.compendium
${felix-osgi-compendium.version}
-
-
-
-
-javax.xml.bind
-jaxb-api
-${jaxb-api.version}
-
[brooklyn-server] branch master updated: Add Flaky retry analyser to more tests which will retry tests 3 tests if necessary
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new f3991df Add Flaky retry analyser to more tests which will retry tests
3 tests if necessary
new 4c88c63 Merge pull request #1058 from tbouron/fix/flaky-tests-retry
f3991df is described below
commit f3991dfc2c34a3b6a30729b99edeb7385a5367b5
Author: Thomas Bouron
AuthorDate: Wed Mar 20 09:17:56 2019 +
Add Flaky retry analyser to more tests which will retry tests 3 tests if
necessary
---
.../brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java | 3 ++-
.../org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java | 3 ++-
.../entity/software/base/SoftwareProcessStopsDuringStartTest.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java
index b200491..09267fc 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java
@@ -47,6 +47,7 @@ import
org.apache.brooklyn.policy.failover.ElectPrimaryConfig.PrimaryDefaultSens
import org.apache.brooklyn.policy.failover.ElectPrimaryConfig.SelectionMode;
import org.apache.brooklyn.policy.failover.ElectPrimaryEffector;
import org.apache.brooklyn.test.Asserts;
+import org.apache.brooklyn.test.support.FlakyRetryAnalyser;
import org.apache.brooklyn.test.support.LoggingVerboseReporter;
import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.core.config.ConfigBag;
@@ -278,7 +279,7 @@ public class ElectPrimaryTest extends
AbstractYamlRebindTest {
// TODO tests for timeout configurability
-@Test
+@Test(retryAnalyzer = FlakyRetryAnalyser.class)
public void testSelectionModeStrictReelectWithPreference() throws
Exception {
runSelectionModeTest(SelectionMode.STRICT, false);
}
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
index 6362a14..57a7316 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.api.sensor.Feed;
import org.apache.brooklyn.core.entity.EntityAsserts;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.test.support.FlakyRetryAnalyser;
import org.apache.brooklyn.util.core.http.BetterMockWebServer;
import org.apache.brooklyn.util.core.task.BasicExecutionManager;
import org.apache.brooklyn.util.repeat.Repeater;
@@ -83,7 +84,7 @@ public class RebindFeedWithHaTest extends
RebindTestFixtureWithApp {
return super.createApp();
}
-@Test
+@Test(retryAnalyzer = FlakyRetryAnalyser.class)
public void testHttpFeedCleansUpAfterHaDisabledAndRunsAtFailover() throws
Exception {
TestEntity origEntity =
origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(RebindFeedTest.MyEntityWithHttpFeedImpl.class)
.configure(RebindFeedTest.MyEntityWithHttpFeedImpl.BASE_URL,
baseUrl));
diff --git
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
index 3c8c100..420f05f 100644
---
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
+++
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
@@ -51,6 +51,7 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.LogWatcher;
import org.apache.brooklyn.test.LogWatcher.EventPredicates;
+import org.apache.brooklyn.test.support.FlakyRetryAnalyser;
import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -140,7 +141,7 @@ public class SoftwareProcessStopsDuringStartTest extends
BrooklynAppUnitTestSupp
assertEquals(loc.getCalls(), ImmutableList.of("obtain", "release",
"obtain", "release"));
}
-@Test
+@Test(retryAnalyzer
[brooklyn-library] branch master updated: Add Apache ActiveMQ Artemis catalog item
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 3927fb7 Add Apache ActiveMQ Artemis catalog item
new c7b9aa6 Merge pull request #134 from bostko/add-artemis
3927fb7 is described below
commit 3927fb716345b1e906e0ffbc3aeb9b796e4af8ce
Author: Valentin Aitken
AuthorDate: Mon Oct 9 16:09:11 2017 +0300
Add Apache ActiveMQ Artemis catalog item
Catalog item is visible in Apache Brooklyn karaf build
BROOKLYN-541
---
software/messaging/src/main/resources/catalog.bom | 51 +++
1 file changed, 51 insertions(+)
diff --git a/software/messaging/src/main/resources/catalog.bom
b/software/messaging/src/main/resources/catalog.bom
index 9ac06fb..d63335b 100644
--- a/software/messaging/src/main/resources/catalog.bom
+++ b/software/messaging/src/main/resources/catalog.bom
@@ -25,6 +25,57 @@ brooklyn.catalog:
type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker
name: ActiveMQ Broker
description: ActiveMQ is an open source message broker which fully
implements the Java Message Service 1.1 (JMS)
+- id: org.apache.brooklyn.entity.messaging.activemq-artemis
+ iconUrl: https://activemq.apache.org/artemis/images/activemq-logo.png
+ version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ item:
+type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
+name: ActiveMQ Artemis
+itemType: entity
+description: Apache ActiveMQ Artemis has a proven non blocking
architecture. It delivers outstanding performance. JMS 2.0 and 1.1 support.
+brooklyn.parameters:
+- name: rest.api.port
+ type: integer
+ default: 8161
+brooklyn.config:
+ version: '2.3.0' # sets install.version
+ installFile:
$brooklyn:formatString("apache-artemis-%1$s-bin.tar.gz",
config("install.version"))
+ brokerName: broker1
+ installSourceDirectory:
$brooklyn:formatString("apache-artemis-%1$s", config("install.version"))
+ downloadUrl:
$brooklyn:formatString("http://apache.cbox.biz/activemq/activemq-artemis/%1$s/apache-artemis-%1$s-bin.tar.gz",config("install.version"),
config("installFile")) # sets download.url
+ install.command:
+$brooklyn:formatString("tar zxf %2$s", config("download.url"),
config("installFile"))
+ customize.command:
+$brooklyn:formatString:
+ - "%1$s/%2$s/bin/artemis create %3$s --user '%4$s' --password
'%5$s' --require-login --name '%3$s' --addresses '%6$s' --http-port %7$s"
+ - $brooklyn:attributeWhenReady("expandedinstall.dir")
+ - $brooklyn:config("installSourceDirectory")
+ - $brooklyn:config("brokerName")
+ - $brooklyn:attributeWhenReady("user")
+ - $brooklyn:attributeWhenReady("password")
+ - $brooklyn:attributeWhenReady("host.name")
+ - $brooklyn:config("rest.api.port")
+ launch.command:
+$brooklyn:formatString("%1$s/bin/artemis-service start",
config("brokerName"))
+ checkRunning.command:
+ps aux | grep '' | grep org.apache.activemq.artemis.boot.Artemis >
/dev/null
+ stop.command:
+$brooklyn:formatString("%1$s/bin/artemis-service stop",
config("brokerName"))
+brooklyn.initializers:
+- type: org.apache.brooklyn.core.sensor.password.CreatePasswordSensor
+ brooklyn.config:
+name: password
+password.length: 12
+- type: org.apache.brooklyn.core.sensor.StaticSensor
+ brooklyn.config:
+name: user
+static.value: br0kerusEr
+- type: org.apache.brooklyn.core.sensor.StaticSensor
+ brooklyn.config:
+name: main.uri
+static.value:
+ $brooklyn:formatString("http://%s:%s;,
attributeWhenReady("host.name"), config("rest.api.port"))
+
- id: org.apache.brooklyn.entity.messaging.qpid.QpidBroker
iconUrl: classpath:///qpid-logo.jpeg
item:
[brooklyn-docs] branch master updated: Updates instructions for generating RSA key with latest OpenSSL
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git The following commit(s) were added to refs/heads/master by this push: new 6f356bf Updates instructions for generating RSA key with latest OpenSSL new f1cac62 Merge pull request #293 from nakomis/fix/ssh-keygen-docs 6f356bf is described below commit 6f356bfd0aa44fe807717d4ca5daf42eaa6773db Author: Martin Harris AuthorDate: Wed Sep 18 14:41:14 2019 +0100 Updates instructions for generating RSA key with latest OpenSSL --- guide/locations/_ssh-keys.md | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/guide/locations/_ssh-keys.md b/guide/locations/_ssh-keys.md index ef4091a..d087922 100644 --- a/guide/locations/_ssh-keys.md +++ b/guide/locations/_ssh-keys.md @@ -23,7 +23,16 @@ and no one snooping on the network can decrypt of any of the traffic. If you don't have an SSH key, create one with: ```bash -$ ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa +$ ssh-keygen -t rsa -N "" -m PEM -f ~/.ssh/id_rsa +``` + +**Note:** For previous versions of OpenSSL, the `-m PEM` flag is not necessary. +However, for newer versions of OpenSSL, if the `-m PEM` flag is omitted, the +key produced will be in OPENSSL format, not RSA format. To determine if a key +is in the correct format, `cat` the key and the first line should read as follows: + +```bash +-BEGIN RSA PRIVATE KEY- ```
[brooklyn-library] branch master updated: old java cassandra blueprints deprecated
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 29723b9 old java cassandra blueprints deprecated
new 14cefc7 Merge pull request #173 from
frogfather/deprecate_old_cassandra_blueprints
29723b9 is described below
commit 29723b9b06d06887f333b90dd02122f263f672fb
Author: frogfather
AuthorDate: Thu May 2 10:17:54 2019 +0100
old java cassandra blueprints deprecated
---
.../entity/nosql/cassandra/CassandraDatacenter.java | 13 +++--
.../entity/nosql/cassandra/CassandraDatacenterImpl.java | 10 +++---
.../brooklyn/entity/nosql/cassandra/CassandraFabric.java| 7 +++
.../entity/nosql/cassandra/CassandraFabricImpl.java | 10 +++---
.../brooklyn/entity/nosql/cassandra/CassandraNode.java | 4 +++-
.../entity/nosql/cassandra/CassandraNodeDriver.java | 6 +-
.../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 4 +++-
.../entity/nosql/cassandra/CassandraNodeSshDriver.java | 4 +++-
.../brooklyn/entity/nosql/cassandra/TokenGenerator.java | 6 +-
.../brooklyn/entity/nosql/cassandra/TokenGenerators.java| 6 +-
10 files changed, 36 insertions(+), 34 deletions(-)
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
index d9d2bbf..5a07c61 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
@@ -44,17 +44,10 @@ import com.google.common.collect.Multimap;
import com.google.common.reflect.TypeToken;
/**
- * A group of {@link CassandraNode}s -- based on Brooklyn's {@link
DynamicCluster}
- * (though it is a "Datacenter" in Cassandra terms, where Cassandra's
"cluster" corresponds
- * to a Brooklyn Fabric, cf {@link CassandraFabric}).
- * The Datacenter can be resized, manually or by policy if required.
- * Tokens are selected intelligently.
- *
- * Note that due to how Cassandra assumes ports are the same across a cluster,
- * it is NOT possible to deploy a cluster of size larger than 1 to
localhost.
- * (Some exploratory work has been done to use different 127.0.0.x IP's for
localhost,
- * and there is evidence this could be made to work.)
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
@Catalog(name="Apache Cassandra Datacenter Cluster", description="Cassandra is
a highly scalable, eventually " +
"consistent, distributed, structured key-value store which provides a
ColumnFamily-based data model " +
"richer than typical key/value systems",
iconUrl="classpath:///cassandra-logo.jpeg")
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
index 5322c22..59b161a 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
@@ -70,14 +70,10 @@ import com.google.common.collect.Sets;
import com.google.common.net.HostAndPort;
/**
- * Implementation of {@link CassandraDatacenter}.
- *
- * Several subtleties to note:
- * - a node may take some time after it is running and serving JMX to actually
be contactable on its thrift port
- * (so we wait for thrift port to be contactable)
- * - sometimes new nodes take a while to peer, and/or take a while to get a
consistent schema
- * (each up to 1m; often very close to the 1m)
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
public class CassandraDatacenterImpl extends DynamicClusterImpl implements
CassandraDatacenter {
/*
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
index 5d9a9ca..21574ad 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
@@ -36,11 +36,10 @@ import com.google.common.collect.Multimap;
import com.google.common.reflect.TypeToken;
/**
- * A fab
[brooklyn-library] branch master updated: PostgreSql version change
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 7de5ad1 PostgreSql version change
new 47e7f0e Merge pull request #172 from
frogfather/fix-pgsql-version-number
7de5ad1 is described below
commit 7de5ad1d2858a4ad9aef924f96d4d51887fc381c
Author: frogfather
AuthorDate: Tue Apr 23 15:34:53 2019 +0100
PostgreSql version change
---
.../entity/database/postgresql/PostgreSqlNode.java | 2 +-
.../entity/database/postgresql/PostgreSqlSshDriver.java | 17 +
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java
index ae05ce4..7b368dc 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java
@@ -52,7 +52,7 @@ import java.util.Map;
public interface PostgreSqlNode extends SoftwareProcess, HasShortName,
DatastoreCommon, DatabaseNode {
@SetFromFlag("version")
-ConfigKey SUGGESTED_VERSION =
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION,
"9.3-3");//"9.1-4");
+ConfigKey SUGGESTED_VERSION =
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION,
"10-10-2");//"9.1-4");
@SetFromFlag("configFileUrl")
ConfigKey CONFIGURATION_FILE_URL = ConfigKeys.newStringConfigKey(
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
index d23b636..8389c2e 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
@@ -106,15 +106,16 @@ public class PostgreSqlSshDriver extends
AbstractSoftwareProcessSshDriver implem
*/
@Override
public void install() {
-String version =
getEntity().getConfig(SoftwareProcess.SUGGESTED_VERSION);
-String majorMinorVersion = version.substring(0,
version.lastIndexOf("-"));
-String shortVersion = majorMinorVersion.replace(".", "");
+String version =
getEntity().getConfig(SoftwareProcess.SUGGESTED_VERSION); //10-10-2
+String majorMinorVersion = version.substring(0,
version.lastIndexOf("-")); //10-10
+String shortVersion = majorMinorVersion.substring(0,
majorMinorVersion.lastIndexOf("-")); //10
String altTarget = "/opt/brooklyn/postgres/";
String altInstallDir = Urls.mergePaths(altTarget,
"install/"+majorMinorVersion);
Iterable pgctlLocations = ImmutableList.of(
altInstallDir+"/bin",
+"/usr/pgsql-"+shortVersion+"/bin",
"/usr/lib/postgresql/"+majorMinorVersion+"/bin/",
"/opt/local/lib/postgresql"+shortVersion+"/bin/",
"/usr/pgsql-"+majorMinorVersion+"/bin",
@@ -132,7 +133,7 @@ public class PostgreSqlSshDriver extends
AbstractSoftwareProcessSshDriver implem
.append("which pg_ctl")
.appendAll(Iterables.transform(pgctlLocations,
StringFunctions.formatter("test -x %s/pg_ctl")))
.append(installPackage(ImmutableMap.of(
-"yum", "postgresql"+shortVersion+"
postgresql"+shortVersion+"-server",
+"yum", "postgresql"+shortVersion+"
postgresql"+shortVersion+"-server postgresql"+shortVersion+"-contrib
postgresql"+shortVersion+"-libs" ,
"apt", "postgresql-"+majorMinorVersion,
"port", "postgresql"+shortVersion+"
postgresql"+shortVersion+"-server"
), null))
@@ -218,7 +219,7 @@ public class PostgreSqlSshDriver extends
AbstractSoftwareProcessSshDriver implem
if (Strings.isBlank(osMajorVersion)) {
if (osName.equals("fedora")) osMajorVersion = "20";
-else osMajorVersion = "6";
+else osMajorVersion = "7";
log.warn("Insuffient OS version information
'"+getMachine().getOsDetails().getVersion()+"' for "+g
[brooklyn-ui] branch master updated (34612c1 -> a1d3f8c)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 34612c1 Merge pull request #131 from jcabrerizo/fix/SwaggerValidation new dcc2da2 Add parameters configuration UI for entities new 809f499 Fix remove parameter logic and allow JSON editing new 940c4c9 This closes #118 new 28206aa parameters json rendering new bc301fd add parameters field editors, fix json so it updates new cad966e only show params on application node, and allow adding param when nothing found new e511678 reduce the buttons for parameters to just search new 392f52a apply same rationalization to config new 3095f5f use labels instead of checkboxes for config filters new cd354c8 "add config" button needed in one more place new 187f69b generate the minimum snippet to define parameters new 93b360f address JC comments re parameters new 6a6de78 better handle reserved words used as param key names new 79c4c59 address TB's PR comments new a1d3f8c Merge pull request #129 from ahgittin/params The 1663 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalog-selector.template.html | 2 +- .../providers/blueprint-service.provider.js| 12 +- .../spec-editor/spec-editor.directive.js | 519 - .../app/components/spec-editor/spec-editor.less| 92 +++- .../spec-editor/spec-editor.template.html | 325 ++--- .../app/components/util/model/entity.model.js | 58 ++- 6 files changed, 801 insertions(+), 207 deletions(-)
[brooklyn-ui] branch master updated: Avoiding swagger validation
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new aa6a9de Avoiding swagger validation
new 34612c1 Merge pull request #131 from jcabrerizo/fix/SwaggerValidation
aa6a9de is described below
commit aa6a9de266410276b97cad7d67d1496020bf74e6
Author: Juan Cabrerizo
AuthorDate: Mon Apr 22 10:59:28 2019 +0100
Avoiding swagger validation
---
ui-modules/rest-api-docs/app/views/main/main.controller.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui-modules/rest-api-docs/app/views/main/main.controller.js
b/ui-modules/rest-api-docs/app/views/main/main.controller.js
index dba0024..fe08a72 100644
--- a/ui-modules/rest-api-docs/app/views/main/main.controller.js
+++ b/ui-modules/rest-api-docs/app/views/main/main.controller.js
@@ -56,7 +56,8 @@ export function mainStateController($scope, $log, $cookies) {
jsonEditor: false,
defaultModelRendering: 'schema',
showRequestHeaders: false,
-showOperationIds: false
+showOperationIds: false,
+validatorUrl: null
});
swaggerUi.load();
[brooklyn-server] branch master updated (b71ae49 -> d45718d)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from b71ae49 Merge pull request #1063 from tbouron/feature/test-case-finally new 78afb79 Check entitlements on delete bundle from catalog new c6c0783 New entitlements new b35174b Fine-grained entitlements applied new dc04266 messages updated new 57a3649 Changes requested on PR1061 new 3187a43 Messages changes for consistency new 50c7862 Missed message new d45718d Merge pull request #1061 from jcabrerizo/fixReadOnlyEntitlement The 12397 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../core/mgmt/entitlement/Entitlements.java| 30 +- .../brooklyn/rest/resources/AdjunctResource.java | 5 +++ .../rest/resources/ApplicationResource.java| 10 + .../brooklyn/rest/resources/BundleResource.java| 5 +++ .../brooklyn/rest/resources/EntityResource.java| 9 + .../brooklyn/rest/resources/LocationResource.java | 26 +++- .../rest/resources/PolicyConfigResource.java | 12 ++ .../brooklyn/rest/resources/PolicyResource.java| 22 +++ .../brooklyn/rest/resources/ScriptResource.java| 2 +- .../brooklyn/rest/resources/ServerResource.java| 46 +++--- .../brooklyn/rest/resources/UsageResource.java | 28 +++-- 11 files changed, 174 insertions(+), 21 deletions(-)
[brooklyn-docs] branch website updated: Update download index and verify files to match published website
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch website
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
The following commit(s) were added to refs/heads/website by this push:
new 52e77c1 Update download index and verify files to match published
website
new 166b83f Merge pull request #281 from geomacy/update-to-match-published
52e77c1 is described below
commit 52e77c128f3c01d0a38d20ad7499fa50fc2535ef
Author: Geoff Macartney
AuthorDate: Sun Apr 7 17:28:46 2019 +0100
Update download index and verify files to match published website
---
download/index.md | 112 ++--
download/verify.md | 523 ++---
2 files changed, 236 insertions(+), 399 deletions(-)
diff --git a/download/index.md b/download/index.md
index d52f696..87dde9c 100644
--- a/download/index.md
+++ b/download/index.md
@@ -12,21 +12,25 @@ children:
Apache Brooklyn is software for modelling, deploying and managing cloud
applications through autonomic blueprints.
+## Version {{ site.brooklyn-stable-version }} (recommended)
+Version {{ site.brooklyn-stable-version }} is the current version recommended
for production use.
+
- RPM Package
+ Packages
-Suitable for version 7 of CentOS and Red Hat Enterprise Linux.
+RPM package for version 7 of CentOS and Red Hat Enterprise Linux, and a DEB
package for Ubuntu and Debian distributions.
https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-1.noarch.rpm" role="button">RPM package
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}.deb" role="button">DEB package
@@ -37,15 +41,91 @@ Suitable for version 7 of CentOS and Red Hat Enterprise
Linux.
- DEB Package
+ Distribution
-Suitable Ubuntu and Debian distributions.
+A pre-built package that contains Apache Brooklyn and all of its dependencies
in a single, easy-to-run package.
+*Suitable for Linux and Windows servers and workstations with Java installed
+(Java 1.8 is supported, including OpenJDK, Oracle, and IBM varieties).*
- https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}.deb" role="button">DEB package
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-bin.zip" role="button">Zip
+
+
+
+
+
+
+
+
+
+
+ Command line client
+
+
+
+Already got a Brooklyn server? Download just the CLI client here.
+
+
+
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-linux.tar.gz" role="button">Linux
Tarball
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-macosx.tar.gz" role="button">Mac OSX
Tarball
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-windows.tar.gz"
role="button">Windows Tarball
+
+
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-linux.zip" role="button">Linux
Zip
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-macosx.zip" role="button">Mac OSX
Zip
+ https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-client-cli-windows.zip" role="button">Windows
Zip
+
+
+
+
+
+
+
+
+
+ Source Code
+
+
+
+The source code for Apache Brooklyn. Use this to build your own binaries and
make private modifications. *If you want to
+contribute code changes to Apache Brooklyn, we recommend you get the source
code from version control. Visit the
+[Developers pages](../developers/index.html) to find out m
[brooklyn-ui] branch master updated (e80fd86 -> 560f5ac)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from e80fd86 Merge pull request #124 from ahgittin/fix-dsl-literal new b061847 show entitlement error message when user tries to delete new 5c2fc01 Shows unathorized message if a request returns 403 status new 2635473 Update name message changed new 560f5ac Merge pull request #130 from jcabrerizo/fixEntitlementMSGs The 1646 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../app-inspector/app/components/providers/entity-api.provider.js | 2 +- .../app/views/main/inspect/summary/summary.controller.js| 3 ++- ui-modules/catalog/app/views/bundle/bundle.state.js | 6 -- 3 files changed, 7 insertions(+), 4 deletions(-)
[brooklyn-ui] branch master updated (9ae743c -> e80fd86)
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 9ae743c Merge pull request #125 from ahgittin/fix-locations
new 17c5d69 DSL Viewer ignored literals; this fixes that and tidies the
code a bit
new 4116f3e more improvements to dsl viewer
new e80fd86 Merge pull request #124 from ahgittin/fix-dsl-literal
The 1642 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../app/components/dsl-editor/dsl-editor.js| 6 +-
.../app/components/dsl-viewer/dsl-viewer.js| 83 +-
.../app/components/dsl-viewer/dsl-viewer.less} | 8 +--
.../components/dsl-viewer/dsl-viewer.template.html | 79 ++--
ui-modules/blueprint-composer/app/index.less | 1 +
5 files changed, 132 insertions(+), 45 deletions(-)
copy ui-modules/{utils/br-core/style/avatar.less =>
blueprint-composer/app/components/dsl-viewer/dsl-viewer.less} (90%)
[brooklyn-ui] branch master updated: Solver error showing entitlements messages
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 6f6f917 Solver error showing entitlements messages
new d026583 Merge pull request #128 from jcabrerizo/fixEntitlementMSGs
6f6f917 is described below
commit 6f6f9174e28013c8d1015a74bbdfe6941259ad8a
Author: Juan Cabrerizo
AuthorDate: Fri Mar 22 10:26:37 2019 +
Solver error showing entitlements messages
---
ui-modules/location-manager/app/views/detail/detail.controller.js | 2 +-
.../location-manager/app/views/wizard/advanced/advanced.controller.js | 2 +-
ui-modules/location-manager/app/views/wizard/byon/byon.controller.js| 2 +-
ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui-modules/location-manager/app/views/detail/detail.controller.js
b/ui-modules/location-manager/app/views/detail/detail.controller.js
index 426c1a9..01c0818 100644
--- a/ui-modules/location-manager/app/views/detail/detail.controller.js
+++ b/ui-modules/location-manager/app/views/detail/detail.controller.js
@@ -86,7 +86,7 @@ export function detailController($scope, $filter, $state,
$stateParams, brSnackb
$state.go('locations');
brSnackbar.create('Location "' +
$filter('locationName')(vm.location) + '" deleted successfully');
}).catch(error => {
-brSnackbar.create('Could not delete this location: ' +
error.message);
+brSnackbar.create('Could not delete this location: ' +
error.error.message);
});
};
vm.editLocation = function () {
diff --git
a/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
b/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
index 975d9c3..0107bc2 100644
---
a/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
+++
b/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
@@ -78,7 +78,7 @@ export function wizardAdvancedController($element, $state,
brSnackbar, location,
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
-brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.data);
});
};
diff --git
a/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
b/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
index c12c789..51ab1db 100644
--- a/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
+++ b/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
@@ -95,7 +95,7 @@ export function wizardByonController($element, $state,
brSnackbar, location, cat
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
-brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.error);
});
};
diff --git
a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
index 4e015c4..996a156 100644
--- a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
+++ b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
@@ -102,7 +102,7 @@ export function wizardCloudController($element, $state,
brSnackbar, locationSpec
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
-brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.error);
});
};
[brooklyn-server] branch master updated: add SERVER_STATUS entitlement for read-only role
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 38179a0 add SERVER_STATUS entitlement for read-only role
new 880eb1d Merge pull request #1059 from
jcabrerizo/fixReadOnlyEntitlement
38179a0 is described below
commit 38179a074357529699b3784c673c0de0c5bf2027
Author: Juan Cabrerizo
AuthorDate: Fri Mar 22 09:43:19 2019 +
add SERVER_STATUS entitlement for read-only role
---
.../java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
index 67f7080..cecff67 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
@@ -351,6 +351,7 @@ public class Entitlements {
FineGrainedEntitlements.allowing(SEE_ENTITY),
FineGrainedEntitlements.allowing(SEE_ACTIVITY_STREAMS),
FineGrainedEntitlements.allowing(SEE_CATALOG_ITEM),
+FineGrainedEntitlements.allowing(SERVER_STATUS),
FineGrainedEntitlements.seeNonSecretSensors(),
FineGrainedEntitlements.seeNonSecretConfig()
);
[brooklyn-server] branch master updated: minor changes to make working w AWS profiles easier
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 6ce94a8 minor changes to make working w AWS profiles easier
new f70a517 Merge pull request #1057 from ahgittin/aws-profile-tidy
6ce94a8 is described below
commit 6ce94a896029a4e17daa47d46d60adeed7da9368
Author: Alex Heneveld
AuthorDate: Mon Mar 18 16:20:24 2019 +
minor changes to make working w AWS profiles easier
---
.../location/jclouds/AwsEc2SessionAwareLocationConfig.java | 2 +-
.../src/main/resources/brooklyn/logback-logger-excludes.xml| 7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
index d20f846..fc98672 100644
---
a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
+++
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
@@ -24,5 +24,5 @@ import org.apache.brooklyn.core.config.ConfigKeys;
public interface AwsEc2SessionAwareLocationConfig extends
JcloudsLocationConfig{
ConfigKey IAM_ROLE_NAME =
ConfigKeys.newStringConfigKey("iamRoleName",
-"Use IAM role to get session credentials when connecting to AWS
EC2", "brooklyn");
+"IAM role / profile name to get session credentials when
connecting to AWS EC2", "brooklyn");
}
diff --git
a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
index 9d4bb4c..f4b4644 100644
---
a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
+++
b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
@@ -60,6 +60,11 @@
+
+
+
+
[brooklyn-server] branch master updated: Move testErrorsCaughtByApiAndRestApiWorks to its own class
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 84b6966 Move testErrorsCaughtByApiAndRestApiWorks to its own class
new 71eb696 Merge pull request #1050 from
geomacy/brooklyn-611-testErrorsCaughtByApiAndRestApiWorks
84b6966 is described below
commit 84b696611695c9d1db731049bb187b53e96ecc3e
Author: Geoff Macartney
AuthorDate: Tue Mar 12 22:49:56 2019 +
Move testErrorsCaughtByApiAndRestApiWorks to its own class
This is a workaround to avoid the initialisation error described in
https://issues.apache.org/jira/browse/BROOKLYN-611
---
.../launcher/BrooklynLauncherErrorTest.java| 78 ++
.../brooklyn/launcher/BrooklynLauncherTest.java| 22 --
2 files changed, 78 insertions(+), 22 deletions(-)
diff --git
a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherErrorTest.java
b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherErrorTest.java
new file mode 100644
index 000..444be99
--- /dev/null
+++
b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherErrorTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.launcher;
+
+import com.google.common.base.Preconditions;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.core.catalog.internal.CatalogInitialization;
+import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.mgmt.persist.PersistMode;
+import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.test.support.FlakyRetryAnalyser;
+import org.apache.brooklyn.util.http.HttpAsserts;
+import org.apache.brooklyn.util.net.Urls;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
+
+// TODO Fix https://issues.apache.org/jira/browse/BROOKLYN-611
+// until then test testErrorsCaughtByApiAndRestApiWorks is moved to its own
class to avoid the initialisation
+// error described in that issue
+public class BrooklynLauncherErrorTest {
+
+private BrooklynLauncher launcher;
+
+@AfterMethod(alwaysRun=true)
+public void tearDown() throws Exception {
+if (launcher != null) launcher.terminate();
+launcher = null;
+}
+
+@Test(retryAnalyzer = FlakyRetryAnalyser.class) // takes a bit of time
because starts webapp, but also tests rest api so useful
+public void testErrorsCaughtByApiAndRestApiWorks() throws Exception {
+launcher = newLauncherForTests(true)
+.catalogInitialization(new CatalogInitialization(null) {
+@Override public void populateInitialCatalogOnly() {
+throw new
RuntimeException("deliberate-exception-for-testing");
+}})
+.persistMode(PersistMode.DISABLED)
+.installSecurityFilter(false)
+.start();
+// 'deliberate-exception' error above should be thrown, then caught in
this calling thread
+ManagementContext mgmt =
launcher.getServerDetails().getManagementContext();
+Assert.assertFalse(
((ManagementContextInternal)mgmt).errors().isEmpty() );
+Assert.assertTrue(
((ManagementContextInternal)mgmt).errors().get(0).toString().contains("deliberate"),
""+((ManagementContextInternal)mgmt).errors() );
+HttpAsserts.assertContentMatches(
+Urls.mergePaths(launcher.getServerDetails().getWebServerUrl(),
"v1/server/up"),
+"true");
+HttpAsserts.assertContentMatches(
+Urls.mergePaths(launcher.getServerDetails().getWebServerUrl(),
"v1/server/healthy"),
+"false");
+// TODO test errors api?
+}
+
+private BrooklynLauncher newLauncherForTests(boolean minimal) {
+Preconditions.checkArgument(lau
[brooklyn-ui] branch tbouron-patch-1 updated: Address comments
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch tbouron-patch-1
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/tbouron-patch-1 by this push:
new bbbe872 Address comments
bbbe872 is described below
commit bbbe8720f3ac9c863f648ed89c1d1f17abe5dec7
Author: Thomas Bouron
AuthorDate: Tue Mar 12 18:38:53 2019 +
Address comments
---
ui-modules/blueprint-composer/app/components/util/d3-blueprint.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 6e1e0e6..a0a11ad 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -173,7 +173,8 @@ export function D3Blueprint(container) {
relationships: [],
};
-let zoom = d3.zoom().scaleExtent([0.1, 1.3]).on('zoom', onSvgZoom);
+let viewportWidth = window.innerWidth ||
document.documentElement.clientWidth || document.body.clientWidth;
+let zoom = d3.zoom().scaleExtent([0.1, Math.max(1, 1 +
log(viewportWidth/1024))]).on('zoom', onSvgZoom);
_svg
.attr('preserveAspectRatio', 'xMinYMin meet')
.attr('viewBox', () => {
[brooklyn-ui] 01/01: Allow bigger zoom in, for large screen mainly
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch tbouron-patch-1
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 6cfa8ee0e8a937728206bc61a58971191fc8431e
Author: Thomas Bouron
AuthorDate: Mon Mar 11 09:51:11 2019 +
Allow bigger zoom in, for large screen mainly
---
ui-modules/blueprint-composer/app/components/util/d3-blueprint.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 b25bc04..6e1e0e6 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -173,7 +173,7 @@ export function D3Blueprint(container) {
relationships: [],
};
-let zoom = d3.zoom().scaleExtent([0.1, 1]).on('zoom', onSvgZoom);
+let zoom = d3.zoom().scaleExtent([0.1, 1.3]).on('zoom', onSvgZoom);
_svg
.attr('preserveAspectRatio', 'xMinYMin meet')
.attr('viewBox', () => {
[brooklyn-ui] branch tbouron-patch-1 created (now 6cfa8ee)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch tbouron-patch-1 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. at 6cfa8ee Allow bigger zoom in, for large screen mainly This branch includes the following new commits: new 6cfa8ee Allow bigger zoom in, for large screen mainly The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[brooklyn-ui] branch master updated: tables should run with their own scope
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 7a7bf3c tables should run with their own scope
new 49c5f56 Merge pull request #119 from ahgittin/fix-table
7a7bf3c is described below
commit 7a7bf3c6a0cc743da910913c1762b5aecbb5339e
Author: Alex Heneveld
AuthorDate: Thu Jan 24 15:34:18 2019 +
tables should run with their own scope
without this if you put _two_ tables in the same parent controller view
they collide on their data and have their own data
---
ui-modules/utils/table/index.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui-modules/utils/table/index.js b/ui-modules/utils/table/index.js
index 9419b4d..bf12ef2 100644
--- a/ui-modules/utils/table/index.js
+++ b/ui-modules/utils/table/index.js
@@ -103,6 +103,7 @@ export function brTableDirective($log) {
link: link,
controller: ['$templateCache', 'brUtilsGeneral', controller],
controllerAs: 'ctrl',
+scope: true,
templateUrl: function(element, attrs) {
return attrs.templateUrl || TEMPLATE_CONTAINER_URL;
}
[brooklyn-docs] branch master updated (c127d40 -> f92c187)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from c127d40 Merge pull request #278 from kemitix/remove-amp-reference add 7197fb2 Update docs to describe log4j setup new f92c187 Merge pull request #279 from apache/log4j-logging The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: guide/dev/tips/logging.md | 133 +++--- guide/ops/logging.md | 43 ++- 2 files changed, 46 insertions(+), 130 deletions(-)
[brooklyn-docs] 01/01: Merge pull request #279 from apache/log4j-logging
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git commit f92c1870d16993f7df581c48f3384774e2f8e2e1 Merge: c127d40 7197fb2 Author: Thomas Bouron AuthorDate: Tue Mar 5 11:52:13 2019 + Merge pull request #279 from apache/log4j-logging Update docs to describe log4j setup guide/dev/tips/logging.md | 133 +++--- guide/ops/logging.md | 43 ++- 2 files changed, 46 insertions(+), 130 deletions(-)
[brooklyn-docs] branch log4j-logging deleted (was 7197fb2)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch log4j-logging in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. was 7197fb2 Update docs to describe log4j setup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[brooklyn-ui] branch master updated: handle errors in custom widgets better
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new b71a0cf handle errors in custom widgets better
new 2940b1b Merge pull request #123 from ahgittin/ui-composer-errors
b71a0cf is described below
commit b71a0cf1b6d9f1b6c5e190b2fd6407ef182e3046
Author: Alex Heneveld
AuthorDate: Thu Feb 14 11:02:13 2019 +
handle errors in custom widgets better
now if *.error is set, the widget silently falls back to the default.
if a user clicks to show the custom widget, the error message is shown.
subsequent custom widget toggles hide or show the error.
---
.../custom-config-widget/suggestion-dropdown.js| 35 +-
.../spec-editor/spec-editor.directive.js | 25 ++--
.../spec-editor/spec-editor.template.html | 6 +++-
3 files changed, 48 insertions(+), 18 deletions(-)
diff --git
a/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
b/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
index d58ec88..0899c0a 100644
---
a/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
+++
b/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
@@ -46,21 +46,28 @@ export function suggestionDropdownDirective($rootScope) {
};
function link(scope, element, attrs, specEditor) {
-scope.specEditor = specEditor;
-scope.defined = specEditor.defined;
-scope.getSuggestions = () => {
-var result = [];
-if (scope.params['suggestion-values']) {
-scope.params['suggestion-values'].forEach( (v) => {
-if (v["value"]) {
-result.push(v);
-} else {
-result.push({value: v});
-}
-});
-return result;
+try {
+scope.specEditor = specEditor;
+scope.defined = specEditor.defined;
+scope.getSuggestions = () => {
+var result = [];
+if (scope.params['suggestion-values']) {
+scope.params['suggestion-values'].forEach( (v) => {
+if (v["value"]) {
+result.push(v);
+} else {
+result.push({value: v});
+}
+});
+return result;
+}
+};
+} catch (e) {
+if ($scope.params) {
+$scope.params.error = e;
}
-};
+throw e;
+}
}
}
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 53be4f2..475952c 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
@@ -571,16 +571,35 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
/** returns 'enabled' or 'disabled' if a widget is defined, or null if
no special widget is defined */
specEditor.getCustomConfigWidgetMode = (item) => {
var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
-if (!widgetMetadata || widgetMetadata["error"]) return null;
+if (!widgetMetadata) return null;
+if (widgetMetadata["error"]) {
+return "disabled";
+}
return widgetMetadata["enabled"] ? 'enabled' : 'disabled';
};
+specEditor.customConfigWidgetError = (item) => {
+var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
+if (!widgetMetadata || !widgetMetadata["error"]) return null;
+if (widgetMetadata.manualToggleAfterError &&
widgetMetadata.enabled) {
+// show the error if manually enabled
+return widgetMetadata["error"];
+}
+return null;
+};
specEditor.toggleCustomConfigWidgetMode = (item, newval) => {
var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
if (!widgetMetadata) {
$log.error('Custom widget mode should not be toggled when not
available: '+item.name);
return null;
}
-if (!specEditor.defined(newval)) newval = !widge
[brooklyn-ui] branch master updated: handle errors in custom widgets better
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new b71a0cf handle errors in custom widgets better
new 2940b1b Merge pull request #123 from ahgittin/ui-composer-errors
b71a0cf is described below
commit b71a0cf1b6d9f1b6c5e190b2fd6407ef182e3046
Author: Alex Heneveld
AuthorDate: Thu Feb 14 11:02:13 2019 +
handle errors in custom widgets better
now if *.error is set, the widget silently falls back to the default.
if a user clicks to show the custom widget, the error message is shown.
subsequent custom widget toggles hide or show the error.
---
.../custom-config-widget/suggestion-dropdown.js| 35 +-
.../spec-editor/spec-editor.directive.js | 25 ++--
.../spec-editor/spec-editor.template.html | 6 +++-
3 files changed, 48 insertions(+), 18 deletions(-)
diff --git
a/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
b/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
index d58ec88..0899c0a 100644
---
a/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
+++
b/ui-modules/blueprint-composer/app/components/custom-config-widget/suggestion-dropdown.js
@@ -46,21 +46,28 @@ export function suggestionDropdownDirective($rootScope) {
};
function link(scope, element, attrs, specEditor) {
-scope.specEditor = specEditor;
-scope.defined = specEditor.defined;
-scope.getSuggestions = () => {
-var result = [];
-if (scope.params['suggestion-values']) {
-scope.params['suggestion-values'].forEach( (v) => {
-if (v["value"]) {
-result.push(v);
-} else {
-result.push({value: v});
-}
-});
-return result;
+try {
+scope.specEditor = specEditor;
+scope.defined = specEditor.defined;
+scope.getSuggestions = () => {
+var result = [];
+if (scope.params['suggestion-values']) {
+scope.params['suggestion-values'].forEach( (v) => {
+if (v["value"]) {
+result.push(v);
+} else {
+result.push({value: v});
+}
+});
+return result;
+}
+};
+} catch (e) {
+if ($scope.params) {
+$scope.params.error = e;
}
-};
+throw e;
+}
}
}
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 53be4f2..475952c 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
@@ -571,16 +571,35 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
/** returns 'enabled' or 'disabled' if a widget is defined, or null if
no special widget is defined */
specEditor.getCustomConfigWidgetMode = (item) => {
var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
-if (!widgetMetadata || widgetMetadata["error"]) return null;
+if (!widgetMetadata) return null;
+if (widgetMetadata["error"]) {
+return "disabled";
+}
return widgetMetadata["enabled"] ? 'enabled' : 'disabled';
};
+specEditor.customConfigWidgetError = (item) => {
+var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
+if (!widgetMetadata || !widgetMetadata["error"]) return null;
+if (widgetMetadata.manualToggleAfterError &&
widgetMetadata.enabled) {
+// show the error if manually enabled
+return widgetMetadata["error"];
+}
+return null;
+};
specEditor.toggleCustomConfigWidgetMode = (item, newval) => {
var widgetMetadata =
scope.state.config.customConfigWidgetMetadata[item.name];
if (!widgetMetadata) {
$log.error('Custom widget mode should not be toggled when not
available: '+item.name);
return null;
}
-if (!specEditor.defined(newval)) newval = !widge
[brooklyn-dist] branch master updated: update for security provider API change
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new 83db883 update for security provider API change
new fe89aff Merge pull request #139 from ahgittin/fix-sessions
83db883 is described below
commit 83db88331c9cae76ee5bb128890244f6eeed6416
Author: Alex Heneveld
AuthorDate: Tue Jan 29 20:06:50 2019 +
update for security provider API change
---
.../java/org/apache/brooklyn/security/CustomSecurityProvider.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
index 50195bf..b120cfe 100644
---
a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
+++
b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
@@ -18,6 +18,9 @@
*/
package org.apache.brooklyn.security;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.brooklyn.rest.security.provider.AbstractSecurityProvider;
@@ -28,7 +31,7 @@ public class CustomSecurityProvider extends
AbstractSecurityProvider implements
static final String USER = "custom";
@Override
-public boolean authenticate(HttpSession session, String user, String
password) {
+public boolean authenticate(HttpServletRequest request,
Supplier sessionSupplierOnSuccess, String user, String pass)
throws SecurityProviderDeniedAuthentication {
return USER.equals(user);
}
[brooklyn-ui] branch master updated (40b1e1e -> 76c5290)
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 40b1e1e This closes #117
new 7c4eb4c add jetty-web using sharing session manager
new 7c5e5a7 Revert "add jetty-web using sharing session manager"
new a65ac90 add makefile to logout project
new dbd1057 enhance web pages for flow where we request the user first
new d6ab218 make logout page modal to confirm logout and give options
new cc9601b fix path to ui-module-registry endpoint
new cef7fcc change providers to match rest api
new 91513f4 tidy logout app
new 9a77329 fix blueprint.xml for ui module server, and unproxy beans
from osgi in rest api
new 76c5290 Merge pull request #120 from ahgittin/fix-sessions
The 1618 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/OSGI-INF/blueprint/blueprint.xml | 59 +++--
.../ui/modularity/module/api/UiModule.java | 8 ++
.../module/api/internal/UiModuleImpl.java | 14 +++
.../module/registry/RestUiModuleRegistry.java | 17 ++-
.../resources/OSGI-INF/blueprint/blueprint.xml | 63 --
.../main/inspect/summary/summary.controller.js | 2 +-
ui-modules/{rest-api-docs => logout}/Makefile | 0
ui-modules/logout/app/index.js | 3 +-
ui-modules/logout/app/index.less | 2 +-
.../logout/app/views/main/main.controller.js | 132 -
.../logout/app/views/main/main.template.html | 69 ++-
ui-modules/logout/src/main/webapp/WEB-INF/web.xml | 42 ++-
12 files changed, 352 insertions(+), 59 deletions(-)
copy ui-modules/{rest-api-docs => logout}/Makefile (100%)
mode change 100755 => 100644
[brooklyn-server] branch master updated (4f7a122 -> f54c1e2)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 4f7a122 This closes #1034 new 4f24a93 share sessions among all BrooklynSecurityProviderFilter-using bundles new c21bdc8 fix security provider delegation new b1d1b11 make /logout just log out new c30d4c9 Merge branch 'make-logout-just-logout' into misc8 new 39cd453 simplify logout api new bb9a38f reinstall shared session handler if it has stopped new cb576a8 CSRF should return "forbidden" not "unauthorized" as we don't need authorization, we need the client to correctly encode the CSRF header. new 7cbf124 lots of debugging for case where session invalidation hangs on logout new b356e52 tidy, removing debug code, just having a clean-ish solution new 1518c1c make double-check/initialized field volatile new 6417a79 reinstall shared session handler if it has stopped new 3be6eac make double-check/initialized field volatile new c4e245b Merge branch 'fix-sessions-4' into make-logout-just-logout new 11d6f14 fix test for csrf mismatch now returns forbidden new 1a15c36 use adapter to access a shared session when required new 1d6f63a don't create new session until request is authorized, change SecurityProvider API new f6df273 better error-handling for bad auth strings new dc30572 comments addressing PR questions new f54c1e2 Merge pull request #1032 from ahgittin/make-logout-just-logout The 12325 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: karaf/jetty-config/src/main/resources/jetty.xml| 43 -- parent/pom.xml | 5 + .../org/apache/brooklyn/rest/api/LogoutApi.java| 26 +- rest/rest-resources/pom.xml| 8 +- .../BrooklynSecurityProviderFilterHelper.java | 96 ++--- .../brooklyn/rest/filter/CsrfTokenFilter.java | 33 +- .../rest/filter/EntitlementContextFilter.java | 4 +- .../brooklyn/rest/resources/LogoutResource.java| 105 +++-- .../brooklyn/rest/resources/ScriptResource.java| 19 +- .../brooklyn/rest/resources/ServerResource.java| 9 +- .../provider/AbstractSecurityProvider.java | 5 +- .../security/provider/AnyoneSecurityProvider.java | 5 +- .../provider/BlackholeSecurityProvider.java| 5 +- ...klynUserWithRandomPasswordSecurityProvider.java | 21 +- .../provider/DelegatingSecurityProvider.java | 38 +- .../provider/ExplicitUsersSecurityProvider.java| 15 +- .../security/provider/LdapSecurityProvider.java| 23 +- .../rest/security/provider/SecurityProvider.java | 38 +- .../rest/util/MultiSessionAttributeAdapter.java| 477 + .../main/resources/OSGI-INF/blueprint/service.xml | 6 +- .../brooklyn/rest/CsrfTokenFilterLauncherTest.java | 4 +- .../AuthenticateAnyoneSecurityProvider.java| 5 +- .../security/provider/TestSecurityProvider.java| 7 +- 23 files changed, 777 insertions(+), 220 deletions(-) create mode 100644 rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
[brooklyn-server] branch master updated: Add missing $
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new c9d739e Add missing $
new 070d362 Merge pull request #1028 from duncangrant/add-cxf-commands-dep
c9d739e is described below
commit c9d739e45c8b37a9baf385c9305a1f614f8d87e3
Author: Duncan Grant
AuthorDate: Wed Jan 23 13:31:48 2019 +
Add missing $
---
karaf/features/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 085fa47..e163c7e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -208,7 +208,7 @@
cxf-jaxrs
mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}
mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${cxf.version}
-mvn:org.apache.cxf.karaf/cxf-karaf-commands/{cxf.version}
+mvn:org.apache.cxf.karaf/cxf-karaf-commands/${cxf.version}
mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}
[brooklyn-server] branch master updated: Add cxf-karaf-commands dependency
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new ea28e8a Add cxf-karaf-commands dependency
new 779671a Merge pull request #1026 from duncangrant/add-cxf-commands-dep
ea28e8a is described below
commit ea28e8a7715beda0f628b64c9dad1e724d871e78
Author: Duncan Grant
AuthorDate: Wed Jan 23 10:24:26 2019 +
Add cxf-karaf-commands dependency
This is a dependency of cxf.
---
karaf/features/src/main/feature/feature.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index de2d896..085fa47 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -208,6 +208,7 @@
cxf-jaxrs
mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}
mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${cxf.version}
+mvn:org.apache.cxf.karaf/cxf-karaf-commands/{cxf.version}
mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}
[brooklyn-library] branch master updated: Fixes JBoss 6 & 7 logos in catalog
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git The following commit(s) were added to refs/heads/master by this push: new 1cfa11d Fixes JBoss 6 & 7 logos in catalog new f98f13d Merge pull request #169 from nakomis/fix-jboss-logo 1cfa11d is described below commit 1cfa11d7e1264f00e3dbe04ab19f78d0236dcce9 Author: Martin Harris AuthorDate: Fri Jan 18 10:24:15 2019 + Fixes JBoss 6 & 7 logos in catalog --- software/webapp/src/main/resources/catalog.bom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/webapp/src/main/resources/catalog.bom b/software/webapp/src/main/resources/catalog.bom index 9d99854..db767a7 100644 --- a/software/webapp/src/main/resources/catalog.bom +++ b/software/webapp/src/main/resources/catalog.bom @@ -25,7 +25,7 @@ brooklyn.catalog: type: org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService name: Node.JS Application - id: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server - iconUrl: classpath:///jboss_logo.png + iconUrl: classpath:///jboss-logo.png item: type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server name: "[DEPRECATED] JBoss Application Server 7" @@ -46,7 +46,7 @@ brooklyn.catalog: name: Nginx Server description: A single Nginx server. Provides HTTP and reverse proxy services - id: org.apache.brooklyn.entity.webapp.jboss.JBoss6Server - iconUrl: classpath:///jboss_logo.png + iconUrl: classpath:///jboss-logo.png item: type: org.apache.brooklyn.entity.webapp.jboss.JBoss6Server name: "[DEPRECATED] JBoss Application Server 6"
