(brooklyn-dist) 01/01: Use `servicemix` as an activation-api
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch update-karaf/4_4_6 in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git commit f9409e5a00438f584efc9940ca2a240123bf74c3 Author: Duncan Grant AuthorDate: Tue Jan 30 15:38:22 2024 + Use `servicemix` as an activation-api --- all/pom.xml | 2 +- archetypes/quickstart/NOTES.txt | 2 +- archetypes/quickstart/pom.xml| 2 +- archetypes/quickstart/src/brooklyn-sample/pom.xml| 2 +- deb-packaging/pom.xml| 2 +- dist/pom.xml | 2 +- dist/src/main/dist/conf/brooklyn/default.catalog.bom | 2 +- docker-image/pom.xml | 2 +- docker/Makefile | 2 +- docker/brooklyn-docker-start | 2 +- downstream-parent/pom.xml| 2 +- karaf/apache-brooklyn/pom.xml| 2 +- karaf/features/pom.xml | 2 +- karaf/features/src/main/feature/feature.xml | 7 --- .../resources/catalog/catalog-brooklyn-default.bom | 2 +- .../resources/catalog/catalog-brooklyn-software-base.bom | 2 +- .../resources/catalog/catalog-brooklyn-software-brooklyn.bom | 2 +- .../filtered-resources/resources/catalog/catalog-core.bom| 12 ++-- .../resources/catalog/catalog-library-software.bom | 4 ++-- .../resources/catalog/catalog-templates-brooklyn-samples.bom | 2 +- .../main/filtered-resources/resources/catalog/catalog.bom| 2 +- .../src/main/resources/resources/etc/default.catalog.bom | 2 +- karaf/itest/pom.xml | 2 +- karaf/pom.xml| 2 +- pom.xml | 2 +- rpm-packaging/pom.xml| 2 +- shared-packaging/pom.xml | 2 +- shared-packaging/src/test/yaml/package-apps.yaml | 8 shared-packaging/src/test/yaml/package.bom | 2 +- vagrant/pom.xml | 2 +- vagrant/src/main/vagrant/README.md | 4 ++-- vagrant/src/main/vagrant/files/vagrant-catalog.bom | 10 +- vagrant/src/main/vagrant/servers.yaml| 2 +- 33 files changed, 50 insertions(+), 49 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 0f9d3ff..87f6040 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -31,7 +31,7 @@ org.apache.brooklyn brooklyn-dist-root -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT ../pom.xml diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt index f68a529..b345050 100644 --- a/archetypes/quickstart/NOTES.txt +++ b/archetypes/quickstart/NOTES.txt @@ -32,7 +32,7 @@ To test a build: pushd /tmp rm -rf brooklyn-sample -export BV=1.1.0-SNAPSHOT# BROOKLYN_VERSION +export BV=1.2.0-SNAPSHOT# BROOKLYN_VERSION mvn archetype:generate \ \ diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 32c6b8a..cb99fe7 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -31,7 +31,7 @@ org.apache.brooklyn brooklyn-parent -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT ../../../brooklyn-server/parent/pom.xml diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml b/archetypes/quickstart/src/brooklyn-sample/pom.xml index 1ac4688..1be25ee 100644 --- a/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -7,7 +7,7 @@ org.apache.brooklyn brooklyn-downstream-parent -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT com.acme.sample diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml index b8b14b4..c7906d8 100644 --- a/deb-packaging/pom.xml +++ b/deb-packaging/pom.xml @@ -37,7 +37,7 @@ org.apache.brooklyn brooklyn-dist-root -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT ../pom.xml diff --git a/dist/pom.xml b/dist/pom.xml index 40665c9..e3f39ca 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -32,7 +32,7 @@ org.apache.brooklyn brooklyn-dist-root -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT ../pom.xml diff --git a/dist/src/main/dist/conf/brooklyn/default.catalog.bom b/dist/src/main/dist/conf/brooklyn/default.catalog.bom index b6f7865..7e8c3a3 100644
(brooklyn-dist) branch update-karaf/4_4_6 created (now f9409e5)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch update-karaf/4_4_6 in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git at f9409e5 Use `servicemix` as an activation-api This branch includes the following new commits: new f9409e5 Use `servicemix` as an activation-api 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 update-karaf/4_4_6 created (now 524441b8)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch update-karaf/4_4_6 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git at 524441b8 Update pax-web This branch includes the following new commits: new 524441b8 Update pax-web 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: Update pax-web
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch update-karaf/4_4_6
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 524441b827cdae21075120760ec5fbac5dac1978
Author: Juan Cabrerizo
AuthorDate: Mon Jul 22 15:16:54 2024 +0200
Update pax-web
---
.../ui/modularity/module/api/UiModuleListener.java | 68 --
pom.xml| 14 ++---
2 files changed, 43 insertions(+), 39 deletions(-)
diff --git
a/modularity-server/module-api/src/main/java/org/apache/brooklyn/ui/modularity/module/api/UiModuleListener.java
b/modularity-server/module-api/src/main/java/org/apache/brooklyn/ui/modularity/module/api/UiModuleListener.java
index d07ad6b7..d5e5640b 100644
---
a/modularity-server/module-api/src/main/java/org/apache/brooklyn/ui/modularity/module/api/UiModuleListener.java
+++
b/modularity-server/module-api/src/main/java/org/apache/brooklyn/ui/modularity/module/api/UiModuleListener.java
@@ -35,8 +35,9 @@ import javax.servlet.ServletContextListener;
import org.apache.brooklyn.ui.modularity.module.api.internal.UiModuleImpl;
import org.apache.karaf.web.WebBundle;
import org.apache.karaf.web.WebContainerService;
-import org.ops4j.pax.web.service.spi.WebEvent;
-import org.ops4j.pax.web.service.spi.WebListener;
+import org.ops4j.pax.web.service.spi.model.events.WebApplicationEvent;
+import org.ops4j.pax.web.service.spi.model.events.WebApplicationEventListener;
+import org.ops4j.pax.web.service.spi.model.info.WebApplicationInfo;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
@@ -46,15 +47,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
+import static
org.ops4j.pax.web.service.spi.model.events.WebApplicationEvent.State.DEPLOYING;
+
/** Invoked by modules in their web.xml to create and register the {@link
UiModule} service for that UI module. */
public class UiModuleListener implements ServletContextListener {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(UiModuleListener.class);
private static final Dictionary EMPTY_DICTIONARY = new
Hashtable<>();
public static final String CONFIG_PATH =
"/WEB-INF/classes/ui-module/config.yaml";
private ServiceRegistration registration;
-private AtomicReference listener = new AtomicReference<>();
+private AtomicReference listener = new
AtomicReference<>();
public UiModuleListener() {
}
@@ -63,27 +66,27 @@ public class UiModuleListener implements
ServletContextListener {
final UiModule uiModule =
createUiModule(servletContextEvent.getServletContext());
Object moduleBundle =
servletContextEvent.getServletContext().getAttribute("osgi-bundlecontext");
final Bundle bundle = moduleBundle instanceof BundleContext ?
((BundleContext)moduleBundle).getBundle() :
FrameworkUtil.getBundle(this.getClass());
-
+
initWebListener(bundle);
-
+
// register service against the bundle where it came from if possible
(it always is, from what I've seen)
// this prevents errors if this.getClass()'s bundle is not yet active
and avoids needing to delay
// (it also means service would be unregistered on that bundle destroy
without listening for servlet context
-// destroy but servlet context destroy is useful for symmetry with
this and in case it is destroyed without
+// destroy but servlet context destroy is useful for symmetry with
this and in case it is destroyed without
// destroying the bundle; also we were already doing it)
-
+
try {
if (bundle.getState() != Bundle.ACTIVE) {
final Duration TIMEOUT = Duration.ofMinutes(2);
-LOG.warn("Bundle [{}] not ACTIVE to register Brooklyn UI
module [{}], bundle current state [{}], will wait up to {}",
-bundle.getSymbolicName(), uiModule.getName(),
bundle.getState(), TIMEOUT);
+LOG.warn("Bundle [{}] not ACTIVE to register Brooklyn UI
module [{}], bundle current state [{}], will wait up to {}",
+bundle.getSymbolicName(), uiModule.getName(),
bundle.getState(), TIMEOUT);
blockUntilBundleStarted(bundle, TIMEOUT);
}
-LOG.debug("Registering new Brooklyn UI module {}:{} [{}] called
'{}' on context-path '{}'",
-bundle.getSymbolicName(), bundle.getVersion(),
bundle.getVersion(), uiModule.getName(), uiModule.getPath() );
+LOG.debug("Registering new Brooklyn UI module {}:{} [{}] called
'{}' on context-path '{}'",
+bundle.getSymbolicName(), bundle.getVersion(),
bundle.getVersion(), uiModule.getName(), uiModule.getPath() );
regi
(brooklyn-server) branch update-karaf/4_4_6 created (now 7319bbc6f5)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch update-karaf/4_4_6 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git at 7319bbc6f5 bump karaf and associated dependencies This branch includes the following new commits: new 7319bbc6f5 bump karaf and associated dependencies 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) 01/01: bump karaf and associated dependencies
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch update-karaf/4_4_6
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7319bbc6f501844ad2359f5d3578683cd1a6045a
Author: Juan Cabrerizo
AuthorDate: Mon Jul 22 15:14:11 2024 +0200
bump karaf and associated dependencies
---
karaf/features/src/main/feature/feature.xml | 8
pom.xml | 12 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 1a8a25d66e..d2828e5a0c 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -231,7 +231,7 @@
-->
-pax-jetty
+pax-web-jetty
cxf-jaxrs-with-optional-dependencies
mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}
@@ -256,7 +256,7 @@
cxf-jaxrs
-
+
mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}
@@ -344,7 +344,7 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}
-
+
mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_1
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_5
@@ -444,7 +444,7 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/1.0.2_1
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/1.11-8_1
- - these need wrapped because they define Bundle-ManifestVersion: 1
+ - these need wrapped because they define Bundle-ManifestVersion: 1
wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okioBundle-Version=1.15.0Export-Package=okio;version=1.15.0
wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3Bundle-Version=3.12.6Import-Package=okio;version=1.15,javax.annotation;version=1.3,*;resolution:=optional
wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptorBundle-Version=3.12.6Import-Package=*;resolution:=mandatory
diff --git a/pom.xml b/pom.xml
index 6a6310ac65..aa7e3d176f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
1.6.2
3.0.1
-1.72
+1.77
0.3.0
0.34.0
0.6.0
@@ -188,13 +188,13 @@
6.8.1
-4.3.8
+4.4.6
${karaf.version}
-7.3.27
-9.4.49.v20220914
+8.0.27
+9.4.54.v20240208
3.2.2
1.3.2
-2.3.3
+2.3.8
1.3.5
6.0.5
@@ -210,7 +210,7 @@
2.4.9
5.2
-
(brooklyn-docs) branch master updated (383bdfd1 -> 93775b28)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git from 383bdfd1 add docs for invoke-effector on entity with arg=value add 378c8171 Fix minor typo new 93775b28 Merge pull request #383 from RedYetiDev/patch-1 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: README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(brooklyn-docs) 01/01: Merge pull request #383 from RedYetiDev/patch-1
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git commit 93775b28b4d252cbc6a68b5752ced300b77ab0fe Merge: 383bdfd1 378c8171 Author: Juan Cabrerizo AuthorDate: Fri Mar 29 09:56:03 2024 +0100 Merge pull request #383 from RedYetiDev/patch-1 Fix minor typo README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(brooklyn) branch master updated (4963975 -> 09f3cb8)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git from 4963975 add bzip2 to dockerfile used to build brooklyn add ff40a09 Updated licenses new 09f3cb8 Merge pull request #58 from apache/licences-update 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: DEPENDENCIES | 511 ++- brooklyn-client | 2 +- brooklyn-dist| 2 +- brooklyn-docs| 2 +- brooklyn-library | 2 +- brooklyn-server | 2 +- brooklyn-ui | 2 +- 7 files changed, 322 insertions(+), 201 deletions(-)
(brooklyn) 01/01: Merge pull request #58 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 09f3cb8908737f70b0b5a4a73f53b417d082d526 Merge: 4963975 ff40a09 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 18:02:52 2024 +0100 Merge pull request #58 from apache/licences-update Updated licenses DEPENDENCIES | 511 ++- brooklyn-client | 2 +- brooklyn-dist| 2 +- brooklyn-docs| 2 +- brooklyn-library | 2 +- brooklyn-server | 2 +- brooklyn-ui | 2 +- 7 files changed, 322 insertions(+), 201 deletions(-)
(brooklyn-server) branch master updated (65cac11c3f -> f1cd632ed7)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git from 65cac11c3f use bean with type to load beans in tests add 1dc6d105e2 Updated licenses new f1cd632ed7 Merge pull request #1414 from apache/licences-update 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: DEPENDENCIES| 422 server-cli/DEPENDENCIES | 354 ++-- 2 files changed, 513 insertions(+), 263 deletions(-)
(brooklyn-server) 01/01: Merge pull request #1414 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit f1cd632ed777d5076aedca843e5a4da9ff8e47dc Merge: 65cac11c3f 1dc6d105e2 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 16:32:47 2024 +0100 Merge pull request #1414 from apache/licences-update Updated licenses DEPENDENCIES| 422 server-cli/DEPENDENCIES | 354 ++-- 2 files changed, 513 insertions(+), 263 deletions(-)
(brooklyn-client) branch master updated (b8145cb -> d1f7954)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git from b8145cb Merge pull request #101 from jcabrerizo/add-arm64 add 60e1266 Updated licenses new d1f7954 Merge pull request #103 from apache/licences-update 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: DEPENDENCIES | 289 --- 1 file changed, 196 insertions(+), 93 deletions(-)
(brooklyn-ui) branch master updated (abea951b -> 7302b1a3)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git from abea951b tidyup of log levels add 1a7f42b0 Updated licenses new 7302b1a3 Merge pull request #383 from apache/licences-update 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: DEPENDENCIES | 482 +-- 1 file changed, 300 insertions(+), 182 deletions(-)
(brooklyn-client) 01/01: Merge pull request #103 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git commit d1f79544dda54d6c12ae616607a4db5b52a419a8 Merge: b8145cb 60e1266 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:35:08 2024 +0100 Merge pull request #103 from apache/licences-update Updated licenses DEPENDENCIES | 289 --- 1 file changed, 196 insertions(+), 93 deletions(-)
(brooklyn-ui) 01/01: Merge pull request #383 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git commit 7302b1a3f6fe71b4b482aeabba8c25a984869a18 Merge: abea951b 1a7f42b0 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:34:30 2024 +0100 Merge pull request #383 from apache/licences-update Updated licenses DEPENDENCIES | 482 +-- 1 file changed, 300 insertions(+), 182 deletions(-)
(brooklyn-dist) branch master updated (c49681f -> 8642aac)
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
from c49681f exclude jclouds-byon as that uses older snakeyaml
add e46323a Updated licenses
new 8642aac Merge pull request #184 from apache/licences-update
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:
DEPENDENCIES | 511 ++---
.../license-text/{CC0 => CC0 1.0 Universal}| 0
dist/src/main/license/files/LICENSE| 45 +-
dist/src/main/license/files/NOTICE | 466 +---
.../features/src/main/resources/resources/LICENSE | 197 +--
karaf/features/src/main/resources/resources/NOTICE | 619 -
6 files changed, 1135 insertions(+), 703 deletions(-)
copy dist/licensing/license-text/{CC0 => CC0 1.0 Universal} (100%)
(brooklyn-dist) 01/01: Merge pull request #184 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git commit 8642aac00a35875af6470ec35d4099d9af198a61 Merge: c49681f e46323a Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:33:55 2024 +0100 Merge pull request #184 from apache/licences-update Updated licenses DEPENDENCIES | 511 ++--- dist/licensing/license-text/CC0 1.0 Universal | 41 ++ dist/src/main/license/files/LICENSE| 45 +- dist/src/main/license/files/NOTICE | 466 +--- .../features/src/main/resources/resources/LICENSE | 197 +-- karaf/features/src/main/resources/resources/NOTICE | 619 - 6 files changed, 1176 insertions(+), 703 deletions(-)
(brooklyn-library) branch master updated (dc22ff3ec -> 34094f3ff)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git from dc22ff3ec API tidies around feed builders and workflow add 0d5b0696c Updated licenses new 34094f3ff Merge pull request #194 from apache/licences-update 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: DEPENDENCIES | 433 --- 1 file changed, 327 insertions(+), 106 deletions(-)
(brooklyn-library) 01/01: Merge pull request #194 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git commit 34094f3ff3a24fa274403f5bef087245d4d33671 Merge: dc22ff3ec 0d5b0696c Author: Juan Cabrerizo AuthorDate: Fri Jan 26 08:19:16 2024 +0100 Merge pull request #194 from apache/licences-update Updated licenses DEPENDENCIES | 433 --- 1 file changed, 327 insertions(+), 106 deletions(-)
(brooklyn-server) branch master updated: update snakeyaml to latest version; same for jackson and cxf to use latest snakeyaml
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 0c34ed594c update snakeyaml to latest version; same for jackson and
cxf to use latest snakeyaml
new 96cad205cf Merge pull request #1413 from ahgittin/bump-snakeyaml-22
0c34ed594c is described below
commit 0c34ed594caba03a6aa8f8ab558cd3201eebbe16
Author: Alex Heneveld
AuthorDate: Thu Jan 4 16:23:40 2024 +
update snakeyaml to latest version; same for jackson and cxf to use latest
snakeyaml
---
.../core/json/ConfigurableSerializerProvider.java | 7
pom.xml| 6 ++--
.../brooklyn/tasks/kubectl/KubeJobFileCreator.java | 22 +++-
.../java/org/apache/brooklyn/util/yaml/Yamls.java | 41 +++---
.../org/apache/brooklyn/util/yaml/YamlsTest.java | 33 +++--
5 files changed, 74 insertions(+), 35 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/json/ConfigurableSerializerProvider.java
b/core/src/main/java/org/apache/brooklyn/util/core/json/ConfigurableSerializerProvider.java
index f2b45831c3..8cba89ff8b 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/json/ConfigurableSerializerProvider.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/json/ConfigurableSerializerProvider.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.util.core.json;
import java.io.IOException;
+import com.fasterxml.jackson.databind.cfg.CacheProvider;
import org.apache.brooklyn.util.exceptions.Exceptions;
import com.fasterxml.jackson.core.JsonGenerator;
@@ -47,6 +48,12 @@ final class ConfigurableSerializerProvider extends
DefaultSerializerProvider {
return new ConfigurableSerializerProvider(config, this, jsf);
}
+@Override
+public DefaultSerializerProvider withCaches(CacheProvider cacheProvider) {
+// would need to support fluency in this class to support
+throw new IllegalStateException("Caches not supported for this
serializer provider");
+}
+
public ConfigurableSerializerProvider(SerializationConfig config,
ConfigurableSerializerProvider src, SerializerFactory jsf) {
super(src, config, jsf);
unknownTypeSerializer = src.unknownTypeSerializer;
diff --git a/pom.xml b/pom.xml
index 440e84e64d..1b130c7293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
1.2.2
1.6.5
-2.14.1
+2.16.1
3.4.10
4.5.13
4.4.15
@@ -140,8 +140,8 @@
2.4.21
2.9.1-01
2.4.21-01
-1.33
-1.26
+2.2
+1.26
1.6.2
3.0.1
diff --git
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java
index ac411c34d1..a769578880 100644
---
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java
+++
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java
@@ -18,6 +18,18 @@
*/
package org.apache.brooklyn.tasks.kubectl;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.brooklyn.core.mgmt.ha.BrooklynBomOsgiArchiveInstaller;
@@ -31,14 +43,6 @@ import org.yaml.snakeyaml.nodes.NodeTuple;
import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.representer.Representer;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.*;
-import java.util.stream.Collectors;
-
/**
* This was needed to ensure our Kubernetes Yaml Job configurations are valid.
*/
@@ -210,7 +214,7 @@ public class KubeJobFileCreator {
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-Representer representer = new Representer(){
+Representer representer = new Representer(options){
@Override
protected NodeTuple representJavaBeanProperty(Object javaBean,
Property property, Object propertyValue, Tag customTag) {
// if value of property is null, ignore it.
diff --git
a/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java
b/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java
index 05a016726e..aa11aa548f 100644
--- a/utils/common/src/main/java/org/apach
[brooklyn-client] branch master updated: add arm and arm64 as available architectures
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 9b8dc2d add arm and arm64 as available architectures
new b8145cb Merge pull request #101 from jcabrerizo/add-arm64
9b8dc2d is described below
commit 9b8dc2dbd8418b4620f5e5d9931f73ad2a1da194
Author: Juan Cabrerizo
AuthorDate: Thu Sep 28 17:31:54 2023 +0100
add arm and arm64 as available architectures
---
cli/release/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cli/release/build.sh b/cli/release/build.sh
index ab05284..10c33ad 100755
--- a/cli/release/build.sh
+++ b/cli/release/build.sh
@@ -24,7 +24,7 @@ echo "GO386=$GO386"
# Constants
#
OSVALUES="darwin freebsd linux netbsd openbsd windows"
-ARCHVALUES="386 amd64"
+ARCHVALUES="386 amd64 arm arm64"
BRNAME="br"
PROJECT_PACKAGE="github.com/apache/brooklyn-client/cli"
CLI_EXECUTABLE="${PROJECT_PACKAGE}/${BRNAME}"
[brooklyn-docs] branch master updated: Fixes incorrect filename in aws-cfn-stacks docs
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 f3e2e5b1 Fixes incorrect filename in aws-cfn-stacks docs
new 2f8480be Merge pull request #380 from nakomis/fix-cfn-stacks-docs
f3e2e5b1 is described below
commit f3e2e5b10edb8fa8d7b8e3f217a90d4e4e8ff090
Author: Martin Harris
AuthorDate: Thu May 25 10:02:38 2023 +0100
Fixes incorrect filename in aws-cfn-stacks docs
---
guide/blueprints/workflow/examples/aws-cfn-stacks/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guide/blueprints/workflow/examples/aws-cfn-stacks/index.md
b/guide/blueprints/workflow/examples/aws-cfn-stacks/index.md
index 9c5a9465..35d00c1a 100644
--- a/guide/blueprints/workflow/examples/aws-cfn-stacks/index.md
+++ b/guide/blueprints/workflow/examples/aws-cfn-stacks/index.md
@@ -14,7 +14,7 @@ This example shows how CloudFormation stacks in AWS can be
synchronized.
Firstly, we define our type to represent discovered stack and be able to
refresh `on_update`:
{% highlight yaml %}
-{% readj aws-cfn-type.yaml %}
+{% readj aws-cfn-type.bom %}
{% endhighlight %}
This should be added to the catalog.
[brooklyn-server] 01/02: moves `suppressWorkflowOutputs` from `Sanitizer` to `TaskTransformer` per @ahgittin comment
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch activities-rest-optization
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 103a1317800109c608697bfd1fbbf8eab30f5df9
Author: Juan Cabrerizo
AuthorDate: Thu Apr 27 16:01:35 2023 +0100
moves `suppressWorkflowOutputs` from `Sanitizer` to `TaskTransformer` per
@ahgittin comment
---
.../org/apache/brooklyn/core/config/Sanitizer.java | 30
.../resources/AbstractBrooklynRestResource.java| 3 +-
.../brooklyn/rest/transform/TaskTransformer.java | 33 ++
3 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
b/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
index 59bb5a1172..26c213b5de 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
@@ -262,36 +262,6 @@ public final class Sanitizer {
}
}
-public static Object suppressWorkflowOutputs(Object x) {
-if (x instanceof Map) {
-Map y = MutableMap.of();
-((Map)x).forEach((k,v) -> {
-y.put(k, v!=null && Sanitizer.IS_OUTPUT.apply(k) ? "(output
suppressed)": suppressWorkflowOutputs(v) );
-});
-return y;
-}else if (x instanceof Iterable){
-List y = MutableList.of();
-((Iterable)x).forEach(xi -> y.add(suppressWorkflowOutputs(xi)));
-return y;
-}else {
-return x;
-}
-}
-
-public static final Predicate IS_OUTPUT = new IsOutputPredicate();
-
-private static class IsOutputPredicate implements Predicate {
-@Override
-public boolean apply(Object name) {
-if (name == null) return false;
-String lowerName = name.toString().toLowerCase();
-for (String outputFieldName : ImmutableList.of("output", "stdout",
"stderr")) {
-if (lowerName.contains(outputFieldName))
-return true;
-}
-return false;
-}
-}
/**
* Kept only in case this anonymous inner class has made it into any
persisted state.
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index 44fc7a6f86..dfd13370e4 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.core.config.render.RendererHints;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.core.resolve.jackson.BeanWithTypeUtils;
import org.apache.brooklyn.rest.domain.ApiError;
+import org.apache.brooklyn.rest.transform.TaskTransformer;
import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils;
import org.apache.brooklyn.rest.util.DefaultExceptionMapper;
import org.apache.brooklyn.rest.util.ManagementContextProvider;
@@ -298,7 +299,7 @@ public abstract class AbstractBrooklynRestResource {
String resultS = mapper.writeValueAsString(result);
result =
BeanWithTypeUtils.newSimpleMapper().readValue(resultS, Object.class);
if (suppressOutput){
-result =
Sanitizer.suppressWorkflowOutputs(result);
+result =
TaskTransformer.suppressWorkflowOutputs(result);
}
//the below treats all numbers as doubles
//new Gson().fromJson(resultS, Object.class);
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
index bf9e62bd16..b15d346ae0 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.rest.transform;
import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -26,6 +27,7 @@ import com.google.common.collect.Ordering;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.HasTaskChildren;
import org.apache.brooklyn.api.mgmt.Task;
+imp
[brooklyn-server] 02/02: refactor code
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch activities-rest-optization
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 87f14388a7840b377bf70453848fc56498065a69
Author: Juan Cabrerizo
AuthorDate: Fri Apr 28 10:50:41 2023 +0100
refactor code
---
.../rest/resources/AbstractBrooklynRestResource.java | 4 ++--
.../apache/brooklyn/rest/transform/TaskTransformer.java | 16 +---
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index dfd13370e4..0a435bf681 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -266,7 +266,7 @@ public abstract class AbstractBrooklynRestResource {
public static Object getValueForDisplay(ManagementContext mgmt,
ObjectMapper mapper, Object value, boolean preferJson, boolean
isJerseyReturnValue, Boolean suppressNestedSecrets, Boolean suppressOutput) {
suppressNestedSecrets = checkAndGetSecretsSuppressed(mgmt,
suppressNestedSecrets, false);
-return getValueForDisplayAfterSecretsCheck(mgmt, mapper, value,
preferJson, isJerseyReturnValue, suppressNestedSecrets,suppressOutput);
+return getValueForDisplayAfterSecretsCheck(mgmt, mapper, value,
preferJson, isJerseyReturnValue, suppressNestedSecrets, suppressOutput);
}
static Object getValueForDisplayAfterSecretsCheck(ManagementContext
mgmt, ObjectMapper mapper, Object value, boolean preferJson, boolean
isJerseyReturnValue, Boolean suppressNestedSecrets, Boolean suppressOutput) {
@@ -299,7 +299,7 @@ public abstract class AbstractBrooklynRestResource {
String resultS = mapper.writeValueAsString(result);
result =
BeanWithTypeUtils.newSimpleMapper().readValue(resultS, Object.class);
if (suppressOutput){
-result =
TaskTransformer.suppressWorkflowOutputs(result);
+result =
TaskTransformer.suppressOutputs(result);
}
//the below treats all numbers as doubles
//new Gson().fromJson(resultS, Object.class);
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
index b15d346ae0..390732fb92 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
@@ -20,14 +20,12 @@ package org.apache.brooklyn.rest.transform;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Ordering;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.HasTaskChildren;
import org.apache.brooklyn.api.mgmt.Task;
-import org.apache.brooklyn.core.config.Sanitizer;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedStream;
import org.apache.brooklyn.rest.api.ActivityApi;
@@ -236,16 +234,16 @@ public class TaskTransformer {
return taskTaskSummaryFunction.apply(task);
}).collect(Collectors.toList());
}
-public static Object suppressWorkflowOutputs(Object x) {
+public static Object suppressOutputs(Object x) {
if (x instanceof Map) {
Map y = MutableMap.of();
((Map)x).forEach((k,v) -> {
-y.put(k, v!=null && TaskTransformer.IS_OUTPUT.apply(k) ?
"(output suppressed)": suppressWorkflowOutputs(v) );
+y.put(k, v!=null && TaskTransformer.IS_OUTPUT.apply(k) ?
"(output suppressed)": suppressOutputs(v) );
});
return y;
}else if (x instanceof Iterable){
List y = MutableList.of();
-((Iterable)x).forEach(xi -> y.add(suppressWorkflowOutputs(xi)));
+((Iterable)x).forEach(xi -> y.add(suppressOutputs(xi)));
return y;
}else {
return x;
@@ -254,16 +252,12 @@ public class TaskTransformer {
public static final Predicate IS_OUTPUT = new IsOutputPredicate();
+static final ImmutableList OUTPUT_VALUES =
ImmutableList.of("outpu
[brooklyn-server] branch activities-rest-optization created (now 87f14388a7)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch activities-rest-optization in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git at 87f14388a7 refactor code This branch includes the following new commits: new 103a131780 moves `suppressWorkflowOutputs` from `Sanitizer` to `TaskTransformer` per @ahgittin comment new 87f14388a7 refactor code The 2 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 (4ef6f634e3 -> b3eed3a937)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git from 4ef6f634e3 Merge branch 'more-workflow-and-misc' new a088ea9330 Update pom.xml new da2d6d1fa7 Note required Jenkins plugin new d33227ae3b accessors-smart has not yet released a 2.4.10 version new b3eed3a937 Merge pull request #1385 from kemitix/mitigate-CVE-2023-1370 The 14112 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 | 1 + pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
[brooklyn-server] 01/01: Update pom.xml
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch mitigate-CVE-2023-1370
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit a088ea9330953a606220d6adeac72c299df4bb1e
Author: Juan Cabrerizo
AuthorDate: Mon Mar 27 10:03:01 2023 +0200
Update pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6f8d1b21f3..4c2a42e180 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
1.15
1.2.17
1.2
-2.4.7
+2.4.10
${jsonSmart.version}
5.2
[brooklyn-server] branch mitigate-CVE-2023-1370 created (now a088ea9330)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch mitigate-CVE-2023-1370 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git at a088ea9330 Update pom.xml This branch includes the following new commits: new a088ea9330 Update pom.xml 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 update-snakeyaml-1.31 created (now a56a05f1d3)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch update-snakeyaml-1.31 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git at a56a05f1d3 Updated snakeyaml and jackson to patch CVE-2022-25857 and CVE-2022-38749 This branch includes the following new commits: new a56a05f1d3 Updated snakeyaml and jackson to patch CVE-2022-25857 and CVE-2022-38749 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] 01/01: Updated snakeyaml and jackson to patch CVE-2022-25857 and CVE-2022-38749
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch update-snakeyaml-1.31 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit a56a05f1d38a7b3a3062349c5e2b6b6d9a82f896 Author: Juan Cabrerizo AuthorDate: Wed Oct 19 09:45:24 2022 +0200 Updated snakeyaml and jackson to patch CVE-2022-25857 and CVE-2022-38749 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 306fb6dd73..7d0a6729c0 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.2.2 1.6.5 -2.13.3 +2.13.4 3.4.1 4.5.13 4.4.14 @@ -138,7 +138,7 @@ 4.5.13 3.12.0 2.4.15 -1.30 +1.31 1.26 1.6.2
[brooklyn-server] branch master updated: Added fix and test for set> config keys in container task factory
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 13a5fa48e1 Added fix and test for set> config keys in
container task factory
new 5db3f2052d Merge pull request #1342 from iuliana/fix/set-key
13a5fa48e1 is described below
commit 13a5fa48e1f40c8ec9020ccbfdd219bdaad61961
Author: iuliana
AuthorDate: Mon Jul 18 11:25:56 2022 +0100
Added fix and test for set> config keys in container task factory
---
.../brooklyn/tasks/kubectl/ContainerCommons.java | 5 ++--
.../brooklyn/tasks/kubectl/ContainerTaskTest.java | 33 ++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java
index 8e48ffedc7..4601a9ce02 100644
---
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java
+++
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.util.time.Duration;
import java.util.List;
import java.util.Map;
+import java.util.Set;
@SuppressWarnings({ "rawtypes"})
public interface ContainerCommons {
@@ -45,10 +46,10 @@ public interface ContainerCommons {
ConfigKey TIMEOUT = ConfigKeys.newConfigKey(Duration.class,
"timeout", "Container wait timeout", Duration.minutes(1));
ConfigKey WORKING_DIR =
ConfigKeys.newStringConfigKey("workingDir", "Location where the container
commands are executed");
-BasicConfigKey> VOLUME_MOUNTS =
SetConfigKey.builder(new TypeToken>() {}, "volumeMounts")
+ConfigKey>> VOLUME_MOUNTS = new
SetConfigKey.Builder<>(new TypeToken>() {}, "volumeMounts")
.description("Configuration to mount a volume into a
container.").defaultValue(null).build();
-BasicConfigKey> VOLUMES = SetConfigKey.builder(new
TypeToken>() {}, "volumes")
+ConfigKey>> VOLUMES = new SetConfigKey.Builder(new
TypeToken>() {}, "volumes")
.description("List of directories with data that is accessible
across multiple containers").defaultValue(null).build();
String NAMESPACE_CREATE_CMD = "kubectl create namespace brooklyn-%s"; //
namespace name
diff --git
a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
index 54796537e9..36fe0acc08 100644
---
a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
+++
b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
@@ -18,9 +18,11 @@
*/
package org.apache.brooklyn.tasks.kubectl;
+import com.beust.jcommander.internal.Maps;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.mgmt.HasTaskChildren;
import org.apache.brooklyn.api.mgmt.Task;
@@ -123,4 +125,35 @@ public class ContainerTaskTest extends
BrooklynAppUnitTestSupport {
}
}
+@Test
+public void testScriptContainerTask() {
+TestEntity entity =
app.createAndManageChild(EntitySpec.create(TestEntity.class));
+Map volumes = Maps.newHashMap();
+volumes.put("name", "tf-ws");
+volumes.put("hostPath", Maps.newHashMap("path", "/tfws"));
+
+List commands = MutableList.of("./hello.sh");
+
+Map configBag = new HashMap<>();
+configBag.put("name", "test-container-task");
+configBag.put("image", "hhwang927/ubuntu_base");
+configBag.put("imagePullPolicy", "never");
+configBag.put("commands", commands);
+configBag.put("workingDir", "/tfws/scripts");
+configBag.put("volumes", Sets.newHashSet(volumes));
+configBag.put("volumeMounts", Sets.newHashSet(Maps.newHashMap("name",
"tf-ws", "mountPath", "/tfws")));
+
+Task containerTask = new
ContainerTaskFactory.ConcreteContainerTaskFactory()
+.summary("Running docker task")
+.configure(configBag)
+.newTask();
+DynamicTasks.queueIfPossible(containerTask).orSubmitAsync(entity);
+Object result = containerTask.getUnchecked(Duration.of(5,
TimeUnit.MINUTES));
+List res = (List) result;
+while(!res.isEmpty() && Iterables.getLast(res).matches("namespace .*
deleted\\s*")) res = res.subList(0, res.size()-1);
+
+String res2 = res.isEmpty() ? null : Iterables.getLast(res);
+assertTrue(res2.contains("hello"));
+}
+
}
[brooklyn-server] branch master updated (f96704ab09 -> 79a7d5c228)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git from f96704ab09 Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-server new 9d52488b1b catch parse errors when doing parseCalendarMaybe new 3ab34382d8 improve selection logic for file log store search new 58130d2db3 simplify code for matching conditions in file log search new 79a7d5c228 Merge pull request #1336 from ahgittin/fix-log-viewer-glitches The 13729 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: .../util/core/logbook/file/FileLogStore.java | 61 +++--- .../java/org/apache/brooklyn/util/time/Time.java | 28 ++ 2 files changed, 37 insertions(+), 52 deletions(-)
[brooklyn-ui] branch master updated: fix issues around quick fixes
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 cd5b4090 fix issues around quick fixes
new 93dca5ae Merge pull request #342 from ahgittin/fix-quick-fixes
cd5b4090 is described below
commit cd5b409074204e756a9c55ec931e8cddb206a138
Author: Alex Heneveld
AuthorDate: Fri Jul 1 15:01:54 2022 +0100
fix issues around quick fixes
- reference to ancestor without ID caused null, now it sets the id
- reference to ancestor fix always just pointed at parent, not where config
was defined
- count of errors was sometimes not reset so was too high
- alignment of error line marker was wrong
---
.../providers/blueprint-service.provider.js| 3 +-
.../app/components/quick-fix/quick-fix.js | 34 +-
.../app/components/util/model/entity.model.js | 5 +++-
.../app/views/main/graphical/graphical.state.less | 1 +
4 files changed, 34 insertions(+), 9 deletions(-)
diff --git
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
index fc1e8cec..b682c1fb 100644
---
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
@@ -346,6 +346,7 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService,
entity.miscData.set('loading', false);
return refreshRelationships(entity);
}).then(() => {
+entity.clearIssues({group: 'config'});
return $q.all([
refreshConfigConstraints(entity),
refreshConfigMemberspecsMetadata(entity),
@@ -603,7 +604,7 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService,
.group('config')
.ref(definition.name)
.level(ISSUE_LEVEL.WARN)
-.message(`Implicitly defined from one of its
ancestor`)
+.message(`Implicitly defined (inherited from an
ancestor)`)
.build());
}
});
diff --git
a/ui-modules/blueprint-composer/app/components/quick-fix/quick-fix.js
b/ui-modules/blueprint-composer/app/components/quick-fix/quick-fix.js
index a42d7148..8a4d7459 100644
--- a/ui-modules/blueprint-composer/app/components/quick-fix/quick-fix.js
+++ b/ui-modules/blueprint-composer/app/components/quick-fix/quick-fix.js
@@ -45,7 +45,6 @@ export function computeQuickFixes(blueprintService,
allIssues) {
quickFixes: {},
};
}
-
let issueO = {
issue,
//quickFixes: {},
@@ -70,7 +69,6 @@ export function computeQuickFixes(blueprintService,
allIssues) {
quickFixes: {},
};
}
-
let issueO = {
issue,
//quickFixes: {},
@@ -124,13 +122,35 @@ const QUICK_FIX_PROPOSERS = {
proposals = {};
}
+// refer directly to the ancestor, and refer to it as scope root
(if root) or using id
+// no option to refer to parent because that gets weird if things
are rearranged
+// (application root is usually not rearranged)
if (!proposals.explicit_config) {
-let entityToReference = (entity || issue.entity).parent;
-let scopeRootOrComponent = blueprintService.get() ===
entityToReference ? 'scopeRoot()' : `component("${entityToReference.id}")`;
+let parent = (entity || issue.entity).parent;
+let entityToReference = parent;
+while (entityToReference &&
!entityToReference.config.has(issue.ref)) {
+entityToReference = entityToReference.parent;
+}
+if (!entityToReference) entityToReference = parent;
+const isParent = entityToReference === parent;
+const isScopeRoot = blueprintService.get() ===
entityToReference;
+const referrent = isParent ? 'parent' : isScopeRoot ? 'root' :
'ancestor';
+
proposals.explicit_config = {
-text: 'Set explicit config from parent',
-tooltip: `This will set the config "${issue.ref}" to its
parent value, explicitly`,
-apply: (issue, entity) => (entity ||
issue.entity).addConfig(issue.ref,
`$brooklyn:${scopeRootOrComponent}.config("${issue.ref}")`),
+text: 'Set explicit config fr
[brooklyn-server] branch master updated (e85d6e8ec3 -> b61c9d667d)
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from e85d6e8ec3 Merge pull request #1318 from
algairim/fixes/deployment-entitlements
new 4cdad35304 provide a Proxy for adjuncts (policies etc), create if
needed during rebind
new 6bc4e5c60a add test for adjunct proxy serialization
new 6b37990bd9 additional test cases for adjunct proxy
new 1e12494d7a fix recent failing tests around hashCode for adjunct proxy
new b61c9d667d Merge pull request #1320 from ahgittin/adjunct-proxy
The 13606 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:
.../camp/brooklyn/rebind/RebindMiscTest.java | 98 +++
.../brooklyn/core/enricher/AbstractEnricher.java | 3 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 24 +++
.../apache/brooklyn/core/feed/AbstractFeed.java| 3 +-
.../core/mgmt/persist/XmlMementoSerializer.java| 4 +
.../mgmt/rebind/RebindExceptionHandlerImpl.java| 31 +++-
.../brooklyn/core/mgmt/rebind/RebindIteration.java | 35 +++-
.../brooklyn/core/objs/AbstractEntityAdjunct.java | 20 +++
...l.java => AbstractBrooklynObjectProxyImpl.java} | 184 ---
.../core/objs/proxy/EntityAdjunctProxyImpl.java| 83 +
.../brooklyn/core/objs/proxy/EntityProxyImpl.java | 195 +
.../brooklyn/core/policy/AbstractPolicy.java | 3 +-
.../brooklyn/util/core/json/BidiSerialization.java | 5 +
13 files changed, 402 insertions(+), 286 deletions(-)
copy
core/src/main/java/org/apache/brooklyn/core/objs/proxy/{EntityProxyImpl.java =>
AbstractBrooklynObjectProxyImpl.java} (53%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityAdjunctProxyImpl.java
[brooklyn-server] branch master updated (2b2bd39848 -> e85d6e8ec3)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git from 2b2bd39848 Merge pull request #1316 from grkvlt/update/logbook-recursive-task-id-query new 71fe506ef6 Prevent application from deployment if the user does not have the required entitlement new c633529d77 Use constant for duplicate error messages new e85d6e8ec3 Merge pull request #1318 from algairim/fixes/deployment-entitlements The 13601 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: .../rest/resources/ApplicationResource.java| 78 ++ 1 file changed, 34 insertions(+), 44 deletions(-)
[brooklyn-ui] branch master updated (ed9a45d9 -> d1690133)
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
from ed9a45d9 Merge pull request #328 from algairim/fixes/catalog-saver
new 0186d880 Add search bar to filter effectors by name
new dd2dd4a8 Move effector buttons to the left; introduce generated CLI
options
new 6a06aa5d Move generated effector CLI content into a modal
new 3ba4472b Remove unused styling
new 46667918 Re-use existing Invoke modal for CLI content
new d392e066 Add CLI SVG template
new 9d1fb0cf Add clipboard button
new 383e6e10 Rename REST to API for CLI mode
new d1690133 Merge pull request #334 from
algairim/improvements/invoking-effectors
The 2356 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-effector/entity-effector.directive.js | 17 +++
.../entity-effector/entity-effector.html | 12 ++--
.../entity-effector/entity-effector.less | 15 +++---
.../entity-effector/modal/modal.controller.js | 26 +++--
.../components/entity-effector/modal/modal.less| 21 ++
.../entity-effector/modal/modal.template.html | 33 --
.../main/inspect/effectors/effectors.controller.js | 8 ++
.../main/inspect/effectors/effectors.template.html | 9 +-
.../br-core/br-svg/br-svg-cli.html}| 8 ++
.../br-core/br-svg/br-svg-play.html} | 8 ++
ui-modules/utils/br-core/br-svg/br-svg.js | 8 --
11 files changed, 133 insertions(+), 32 deletions(-)
copy
ui-modules/{blueprint-composer/app/views/main/graphical/edit/enricher/edit.enricher.template.html
=> utils/br-core/br-svg/br-svg-cli.html} (72%)
copy
ui-modules/{blueprint-composer/app/views/main/graphical/edit/enricher/edit.enricher.template.html
=> utils/br-core/br-svg/br-svg-play.html} (72%)
[brooklyn-ui] branch master updated: Change icon to include/exclude sub-tasks
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 b81b200c Change icon to include/exclude sub-tasks
new 9d6fa616 Merge pull request #331 from algairim/improvements/logbook
b81b200c is described below
commit b81b200c58a152e97e6fb51fe9f55e5f69dd06fe
Author: Mykola Mandra
AuthorDate: Thu Jun 9 13:16:11 2022 +0100
Change icon to include/exclude sub-tasks
Signed-off-by: Mykola Mandra
---
ui-modules/utils/logbook/logbook.less | 46 ++
ui-modules/utils/logbook/logbook.template.html | 20 ++-
2 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/ui-modules/utils/logbook/logbook.less
b/ui-modules/utils/logbook/logbook.less
index 6974ecbe..effd7e7d 100644
--- a/ui-modules/utils/logbook/logbook.less
+++ b/ui-modules/utils/logbook/logbook.less
@@ -116,27 +116,29 @@ br-logbook {
min-width: 150px;
}
- .fa-rotate-90 {
--webkit-transform: rotate(90deg);
--moz-transform: rotate(90deg);
--ms-transform: rotate(90deg);
--o-transform: rotate(90deg);
-transform: rotate(90deg);
- }
-
- .fa-rotate-180 {
--webkit-transform: rotate(180deg);
--moz-transform: rotate(180deg);
--ms-transform: rotate(180deg);
--o-transform: rotate(180deg);
-transform: rotate(180deg);
- }
-
- .fa-rotate-270 {
--webkit-transform: rotate(270deg);
--moz-transform: rotate(270deg);
--ms-transform: rotate(270deg);
--o-transform: rotate(270deg);
-transform: rotate(270deg);
+ .tooltip-inner {
+min-width: 150px;
+ }
+
+ .icon-include-subtasks {
+left:0;
+top:0;
+width: 100%;
+height: 100%;
+position: absolute;
+padding: 7px;
+ }
+
+ .icon-inactive {
+color: grey;
+ }
+
+ .btn-logbook {
+width: 40px;
+height: inherit;
+ }
+
+ .btn-group {
+height: 34px;
}
}
diff --git a/ui-modules/utils/logbook/logbook.template.html
b/ui-modules/utils/logbook/logbook.template.html
index 7d911a35..3f4b3693 100644
--- a/ui-modules/utils/logbook/logbook.template.html
+++ b/ui-modules/utils/logbook/logbook.template.html
@@ -40,12 +40,12 @@
Query
-
-
+
+
-
+
@@ -55,17 +55,19 @@
-
-
+
+
-
-
+
+
+
-
+
@@ -75,7 +77,7 @@
-
+
[brooklyn-ui] branch fix/add-brUtilGeneral created (now f2a98b88)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch fix/add-brUtilGeneral in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git at f2a98b88 Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not inyecting the factory in all the modules This branch includes the following new commits: new f2a98b88 Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not inyecting the factory in all the modules 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: Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not inyecting the factory in all the modules
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch fix/add-brUtilGeneral
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit f2a98b88ef32c329cbdeba61d7e47b2e70d8d745
Author: Juan Cabrerizo
AuthorDate: Thu Jun 9 17:17:40 2022 +0200
Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not
inyecting the factory in all the modules
---
ui-modules/blueprint-importer/app/index.js | 5 -
ui-modules/groovy-console/app/index.js | 5 +++--
ui-modules/location-manager/app/index.js | 6 +-
ui-modules/rest-api-docs/app/index.js | 5 -
ui-modules/utils/utils/general.js | 4 ++--
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ui-modules/blueprint-importer/app/index.js
b/ui-modules/blueprint-importer/app/index.js
index fc9ccd36..a376c47c 100644
--- a/ui-modules/blueprint-importer/app/index.js
+++ b/ui-modules/blueprint-importer/app/index.js
@@ -23,6 +23,7 @@ import ngResource from 'angular-resource';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
import brInterstitialSpinner from
'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner';
import brooklynModuleLinks from 'brooklyn-ui-utils/module-links/module-links';
@@ -36,7 +37,9 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
-angular.module('brooklynBlueprintImporter', [ngAnimate, ngCookies, ngResource,
brCore, brServerStatus, brInterstitialSpinner, brooklynModuleLinks,
brooklynUserManagement, uiRouter, mainState, brandAngularJs])
+angular.module('brooklynBlueprintImporter', [ngAnimate, ngCookies, ngResource,
brCore, brServerStatus,
+brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement,
uiRouter, mainState, brUtilsGeneral,
+brandAngularJs])
.config(['$logProvider', '$compileProvider', appConfig])
.config(['$urlRouterProvider', routerConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
diff --git a/ui-modules/groovy-console/app/index.js
b/ui-modules/groovy-console/app/index.js
index 7c660bd9..96ab04d0 100644
--- a/ui-modules/groovy-console/app/index.js
+++ b/ui-modules/groovy-console/app/index.js
@@ -21,6 +21,7 @@ import ngAnimate from 'angular-animate';
import ngCookies from 'angular-cookies';
import uiRouter from 'angular-ui-router';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brLogbook from 'brooklyn-ui-utils/logbook/logbook';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
@@ -35,8 +36,8 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
angular.module('brooklynGroovyConsole', [ngAnimate, ngCookies, uiRouter,
brCore, brServerStatus,
-brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement,
brLogbook, mainState, brandAngularJs
-])
+brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement,
brLogbook, mainState, brUtilsGeneral,
+brandAngularJs])
.config(['$logProvider', '$compileProvider', appConfig])
.config(['$urlRouterProvider', '$stateProvider', routerConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
diff --git a/ui-modules/location-manager/app/index.js
b/ui-modules/location-manager/app/index.js
index 17d7374e..105d4117 100644
--- a/ui-modules/location-manager/app/index.js
+++ b/ui-modules/location-manager/app/index.js
@@ -23,6 +23,7 @@ import uiRouter from 'angular-ui-router';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
import brAutoFocus from 'brooklyn-ui-utils/autofocus/autofocus';
import brInterstitialSpinner from
'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner';
@@ -43,7 +44,10 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
-angular.module('brooklynLocationManager', [ngAnimate, ngCookies, uiRouter,
brCore, brServerStatus, brAutoFocus, brInterstitialSpinner,
brooklynModuleLinks, brSensitiveField, brooklynUserManagement, brooklynApi,
brooklynCatalogDeleter, locationsState, detailState, wizardState,
wizardAdvancedState, wizardByonState, wizardCloudState, brandAngularJs])
+angular.module('brooklynLocationManager', [ngAnimate, ngCookies, uiRouter,
brCore, brServerStatus,
+brAutoFocus, brInterstitialSpinner, brooklynModuleLinks, brSensitiveField,
brooklynUserManagement, brooklynApi,
+brooklynCatalogDeleter, locationsState, detailState, wizardState,
wizard
[brooklyn-ui] branch master updated (41771db7 -> 3b7dc8a0)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git from 41771db7 Merge pull request #323 from algairim/composer-improvements new ee483f40 Add `order` as module property and use it when is present before using name for ordering modules new fec765b5 Addresing PR comments new 3b7dc8a0 Merge pull request #325 from jcabrerizo/feature/remove-appX-naming-from-home The 2335 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: .../ui/modularity/module/api/UiModule.java | 6 - .../module/api/internal/UiModuleImpl.java | 16 - ui-modules/app-inspector/package.json | 2 +- .../src/main/resources/ui-module/config.yaml | 3 ++- ui-modules/home/app/index.js | 3 ++- ui-modules/home/app/views/main/main.controller.js | 8 --- ui-modules/login/package-lock.json | 9 +++- ui-modules/utils/module-links/module-links.js | 6 ++--- ui-modules/utils/utils/general.js | 26 +++--- 9 files changed, 54 insertions(+), 25 deletions(-)
[brooklyn-ui] 01/01: Addresing PR comments
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch feature/remove-appX-naming-from-home
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit fec765b5ff469022a79b29d228d56e8c2f2fe9b4
Author: Juan Cabrerizo
AuthorDate: Wed May 18 10:54:49 2022 +0100
Addresing PR comments
---
ui-modules/utils/utils/general.js | 23 ++-
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/ui-modules/utils/utils/general.js
b/ui-modules/utils/utils/general.js
index 23b3d2b7..ff84eb6b 100644
--- a/ui-modules/utils/utils/general.js
+++ b/ui-modules/utils/utils/general.js
@@ -36,39 +36,36 @@ export function capitalize(input) {
* and anything with a length (string). also understands null and undefined.
*
* useful instead of the refrain of (x!==null && x.length>0), or a bit worse
for Object.
- */
+ */
export function isNonEmpty(object) {
if (typeof object === "undefined" || object == null) return false;
-
+
// treat arrays specially although I think the two methods below will
always work for them
if (Array.isArray(object)) return object.length > 0;
-
+
if (angular.isObject(object)) return Object.keys(object).length > 0;
// other common falsey types
if (object == 0 || object == false) return false;
// strings, maybe other things
if (object.hasOwnProperty("length")) return object.length > 0;
-
+
// other objects will be complex or default to true
-return true;
+return true;
}
export function uiModuleComparator(moduleA, moduleB) {
if(moduleA.order && moduleB.order){
-if (moduleA.order > moduleB.order) {
-return 1;
-}
-if(moduleA.order < moduleB.order) {
-return -1;
+if (moduleA.order != moduleB.order){
+return moduleA.order - moduleB.order;
}
}
// If no order implemented or is the same, order by name
-return moduleA.name > moduleB.name ? 1: -1;
+return moduleA.name.localeCompare(moduleB.name);
}
export function brUtilsGeneralProvider() {
-return {
-isNonEmpty,
+return {
+isNonEmpty,
capitalize,
uiModuleComparator
};
[brooklyn-ui] branch feature/remove-appX-naming-from-home created (now fec765b5)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch feature/remove-appX-naming-from-home in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git at fec765b5 Addresing PR comments This branch includes the following new commits: new fec765b5 Addresing PR comments 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] 01/01: replaces isMac logic for support new MacOs naming
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch feature/support-m1
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 1bf5e8ecfd95988dc33b25e544bdbd6b65322f4e
Author: Juan Cabrerizo
AuthorDate: Thu Apr 21 10:14:49 2022 +0200
replaces isMac logic for support new MacOs naming
---
.../main/java/org/apache/brooklyn/core/location/BasicOsDetails.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java
b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java
index 6a62bc0605..294cc0102f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java
@@ -34,6 +34,7 @@ public class BasicOsDetails implements OsDetails {
final boolean is64bit;
// (?i) forces matches to be case insensitive
public static final String UNIX_OS_NAME_PATTERNS =
"(?i).*linux.*|centos|debian|fedora|gentoo|rhel|slackware|solaris|suse|ubuntu|coreos";
+public static final String MACOS_OS_NAME_PATTERNS = "macOS|Mac OS X";
/** Sets is64Bit according to value of arch parameter. */
public BasicOsDetails(String name, String arch, String version) {
@@ -77,7 +78,7 @@ public class BasicOsDetails implements OsDetails {
@Override
public boolean isMac() {
-return getName()!=null && getName().equals(OsNames.MAC_OS_X);
+return getName()!=null && Pattern.matches(MACOS_OS_NAME_PATTERNS,
getName());
}
@Override
[brooklyn-server] branch feature/support-m1 created (now 1bf5e8ecfd)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch feature/support-m1 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git at 1bf5e8ecfd replaces isMac logic for support new MacOs naming This branch includes the following new commits: new 1bf5e8ecfd replaces isMac logic for support new MacOs naming 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: remove transition style rule which breaks color inherit on chrome
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 26ce8ca3 remove transition style rule which breaks color inherit on
chrome
new ee66181e Merge pull request #318 from ahgittin/fix-disappearing-text
26ce8ca3 is described below
commit 26ce8ca3e98805eef2b993edbd420905ce9acaf1
Author: Alex Heneveld
AuthorDate: Tue Apr 19 12:25:01 2022 +0100
remove transition style rule which breaks color inherit on chrome
due to https://bugs.chromium.org/p/chromium/issues/detail?id=265303
---
ui-modules/app-inspector/app/components/entity-tree/entity-node.less | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
index 5537805d..6a2a3e8f 100644
--- a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
+++ b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
@@ -46,7 +46,10 @@
border: 1px solid @well-border;
border-radius: @border-radius-base;
box-shadow: 0 1px 2px rgba(0,0,0,0.1);
-transition: all .2s ease-in-out;
+// transition: all .2s ease-in-out;
+// transition disabled because on chrome colours are not restored
afterwards
+// https://bugs.chromium.org/p/chromium/issues/detail?id=265303
+transition: none;
&.highlight {
animation: fadeOut 1s;
-webkit-animation: fadeOut 1s;
[brooklyn-client] branch master updated (8a89837 -> 531db19)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git from 8a89837 Merge pull request #94 from algairim/build/Jenkinsfile add 5ddcf1a This seems to make the cli build with go 1.18 new 531db19 Merge pull request #95 from apache/fix-go-18 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: cli/go.mod | 1 + cli/go.sum | 2 ++ 2 files changed, 3 insertions(+)
[brooklyn-client] 01/01: Merge pull request #95 from apache/fix-go-18
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git commit 531db19c9640e29950c8025360e541473fce7923 Merge: 8a89837 5ddcf1a Author: Juan Cabrerizo AuthorDate: Tue Apr 19 10:47:33 2022 +0200 Merge pull request #95 from apache/fix-go-18 This seems to make the cli build with go 1.18 cli/go.mod | 1 + cli/go.sum | 2 ++ 2 files changed, 3 insertions(+)
[brooklyn-ui] 01/01: Update node and npm
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch feature/update-node-16
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 474e6f90aad2d2875e71da1421399b2cf5bf335b
Author: Juan Cabrerizo
AuthorDate: Thu Apr 14 17:14:47 2022 +0200
Update node and npm
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc5a31da..a57845de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,8 @@
${pax-web.version}
-v13.2.0
-6.13.1
+v16.14.2
+8.5.0
[brooklyn-ui] branch feature/update-node-16 created (now 474e6f90)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch feature/update-node-16 in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git at 474e6f90 Update node and npm This branch includes the following new commits: new 474e6f90 Update node and npm 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: Follow arc coordinates after the rotation of member-spec item if parent entity has children
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 678b991 Follow arc coordinates after the rotation of member-spec item
if parent entity has children
new fb8a06a Merge pull request #314 from algairim/composer-improvements
678b991 is described below
commit 678b991f813d3d5449a27eb4f9933ad152e712f1
Author: Mykola Mandra
AuthorDate: Fri Feb 11 14:48:14 2022 +
Follow arc coordinates after the rotation of member-spec item if parent
entity has children
Signed-off-by: Mykola Mandra
---
.../app/components/util/d3-blueprint.js| 40 --
1 file changed, 30 insertions(+), 10 deletions(-)
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 6c4d42e..1408baa 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -133,6 +133,7 @@ export function D3Blueprint(container, options) {
}
},
memberspec: {
+rotationAngle: -45, // Rotate if parent has children
circle: {
r: 35,
cx: 0,
@@ -831,26 +832,45 @@ export function D3Blueprint(container, options) {
let relationArcs = _relationArcs.selectAll('.relation').data(arcsData,
(d) => getPathId(d));
+// Returns node coordinates with adjustment for member spec rotation
if present.
+const getNodeCoordinates = (entity) => {
+let _node = nodeForEntity(entity);
+let _x = _node.x;
+let _y = _node.y;
+
+if (entity.isMemberSpec()) {
+_y += _configHolder.nodes.memberspec.circle.cy;
+if (entity.parent.hasChildren()) {
+// follow the rotation as for 'specNodeData'
+let _radius = _configHolder.nodes.memberspec.circle.cy;
+let _theta = Math.PI * 2 *
_configHolder.nodes.memberspec.rotationAngle / 360;
+_x += _radius * Math.cos(_theta);
+_y -= _radius - Math.abs(_radius * Math.sin(_theta));
+}
+}
+
+return [_x, _y];
+};
+
const getArcTransitionParameters = (d) => {
-let targetNode = nodeForEntity(d.target);
-let sourceNode = nodeForEntity(d.source);
-let sourceY = sourceNode.y + (d.source.isMemberSpec() ?
_configHolder.nodes.memberspec.circle.cy : 0);
-let targetY = targetNode.y + (d.target.isMemberSpec() ?
_configHolder.nodes.memberspec.circle.cy : 0);
-let dx = targetNode.x - sourceNode.x;
+let [targetX, targetY] = getNodeCoordinates(d.target);
+let [sourceX, sourceY] = getNodeCoordinates(d.source);
+let dx = targetX - sourceX;
let dy = targetY - sourceY;
let dr = Math.sqrt(dx * dx + dy * dy);
let sweep = dx * dy > 0 ? 0 : 1;
-_mirror.attr('d', `M ${sourceNode.x},${sourceY} A ${dr},${dr} 0
0,${sweep} ${targetNode.x},${targetY}`);
+_mirror.attr('d', `M ${sourceX},${sourceY} A ${dr},${dr} 0
0,${sweep} ${targetX},${targetY}`);
let m =
_mirror._groups[0][0].getPointAtLength(_mirror._groups[0][0].getTotalLength() -
_configHolder.nodes.child.circle.r - 20);
-dx = m.x - sourceNode.x;
+dx = m.x - sourceX;
dy = m.y - sourceY;
+
dr = Math.sqrt(dx * dx + dy * dy);
-let isLeftToRight = dx > 0 || sourceNode.x === targetNode.x;
+let isLeftToRight = dx > 0 || sourceX === targetX;
-return [sourceNode.x, sourceY, dr, sweep, m.x, m.y, isLeftToRight];
+return [sourceX, sourceY, dr, sweep, m.x, m.y, isLeftToRight];
}
const isLeftToRight = (d) => {
@@ -1102,7 +1122,7 @@ export function D3Blueprint(container, options) {
.attr('transform', (d)=>(`translate(${d.x}, ${d.y})`));
specNodeData.transition()
.duration(_configHolder.transition)
-.attr('transform', (d)=>(`translate(${d.x}, ${d.y})
rotate(${d.data.hasChildren() ? -45 : 0})`));
+.attr('transform', (d)=>(`translate(${d.x}, ${d.y})
rotate(${d.data.hasChildren() ? _configHolder.nodes.memberspec.rotationAngle :
0})`));
specNodeData.exit()
.transition()
.duration(_configHolder.transition)
[brooklyn-server] branch master updated (21e19d2 -> 5f752e7)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 21e19d2 Merge pull request #1299 from algairim/policy/groups-change new bcf1139 Gracefully handle invalid sensor types in REST requests new e6305e9 Remove unused imports new 5f752e7 Merge pull request #1300 from algairim/rest/invalid-sensor-type-handling The 13543 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: .../rest/resources/ApplicationResource.java| 17 +++- .../brooklyn/rest/resources/SensorResource.java| 7 ++-- .../brooklyn/rest/resources/ServerResource.java| 5 ++- .../rest/transform/ApplicationTransformer.java | 6 ++- .../brooklyn/rest/transform/SensorTransformer.java | 3 +- .../brooklyn/rest/util/EntityAttributesUtils.java | 49 ++ .../rest/resources/ApplicationResourceTest.java| 33 ++- 7 files changed, 100 insertions(+), 20 deletions(-) create mode 100644 rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/EntityAttributesUtils.java
[brooklyn-server] branch master updated (4f1c7a2 -> 21e19d2)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 4f1c7a2 Merge pull request #1297 from algairim/collection-functionals new 33687e3 Move GroupsChangePolicyTest into camp-brooklyn as OSGI test new fbecd0d Support member.locations in GroupsChangePolicy new 2b59327 Resolve properties of member.locations in the context of the member new fc34ba9 Move GroupsChangePolicyTest to broolyn-camp, initialize with yaml; add tests for member.locaitons, member.initializers and member.policies new 7722f0c Add test for member.enrichers new 6c19c45 Optimise GroupsChangePolicyOsgiTest new 5626a6e Remove OSGI config, rename test respectively new 21e19d2 Merge pull request #1299 from algairim/policy/groups-change The 13540 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: .../brooklyn/policy/GroupsChangePolicyTest.java| 440 + .../brooklyn/entity/group/GroupsChangePolicy.java | 111 +- .../entity/group/GroupsChangePolicyTest.java | 136 --- 3 files changed, 530 insertions(+), 157 deletions(-) create mode 100644 camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/policy/GroupsChangePolicyTest.java delete mode 100644 core/src/test/java/org/apache/brooklyn/entity/group/GroupsChangePolicyTest.java
[brooklyn-server] branch master updated (1862f9b -> 4f1c7a2)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 1862f9b Merge pull request #1296 from jcabrerizo/features/update-xstream-1-4-19 new 768d920 New functionals to apply to an iterable: generic AllEqualsFunction and a sub-functin AllTrueFunction to check if all true in particular new 568af81 Document AllEqualsFunction new 4f1c7a2 Merge pull request #1297 from algairim/collection-functionals The 13532 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: .../util/collections/CollectionFunctionals.java| 40 +++--- .../collections/CollectionFunctionalsTest.java | 28 ++- 2 files changed, 62 insertions(+), 6 deletions(-)
[brooklyn-ui] branch master updated: Display error modal on HA operation failure
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 e1cf5a6 Display error modal on HA operation failure
new 4385873 Merge pull request #311 from algairim/ha-improvements
e1cf5a6 is described below
commit e1cf5a6b1282eedba5b30a6c6a0f872eed1b6c4f
Author: Mykola Mandra
AuthorDate: Thu Nov 18 16:05:38 2021 +
Display error modal on HA operation failure
Signed-off-by: Mykola Mandra
---
.../home/app/views/about/about.controller.js | 29 --
.../home/app/views/about/about.template.html | 22 +---
2 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/ui-modules/home/app/views/about/about.controller.js
b/ui-modules/home/app/views/about/about.controller.js
index 95a5113..6b675e7 100644
--- a/ui-modules/home/app/views/about/about.controller.js
+++ b/ui-modules/home/app/views/about/about.controller.js
@@ -81,6 +81,11 @@ export function aboutStateController($scope, $rootScope,
$element, $q, $uibModal
$scope.expectedNodeCounter = Object.keys($scope.states.nodes).length;
$scope.template = 'haStatusTemplate';
+$scope.operations = {
+REMOVE_TERMINATED_NODE: 'Remove',
+REMOVE_ALL_TERMINATED_NODES: 'Remove terminated nodes'
+};
+
$scope.importPersistence = function () {
$rootScope.$broadcast('open-persistence-importer');
}
@@ -193,8 +198,8 @@ export function aboutStateController($scope, $rootScope,
$element, $q, $uibModal
});
errorModal.closed.then(() => {
-console.log('closing, wipe errors')
$scope.errors = [];
+$scope.haManageErrors = [];
})
}
});
@@ -202,24 +207,34 @@ export function aboutStateController($scope, $rootScope,
$element, $q, $uibModal
$scope.removeNode = function (nodeId) {
$scope.template = 'spinnerTemplate';
let removeNode = serverApi.removeHaTerminatedNode(nodeId);
-removeNode.then(data => {
+removeNode.then(() => {
$scope.expectedNodeCounter--;
-$scope.container.dispatchEvent(new CustomEvent('update-states',
{}));
+}).catch(error => {
+$scope.haManageErrors.push({
+operationName: $scope.operations.REMOVE_TERMINATED_NODE,
+message: get(error, 'data.message', 'Unknown error.'),
+});
});
+$scope.container.dispatchEvent(new CustomEvent('update-states', {}));
}
$scope.removeAllTerminatedNodes = function () {
$scope.template = 'spinnerTemplate';
let removeNodes = serverApi.removeHaTerminatedNodes();
-removeNodes.then(data => {
+removeNodes.then(() => {
Object.values($scope.states.nodes).forEach( ({ status }) => {
if (status === "TERMINATED" || status === "FAILED")
$scope.expectedNodeCounter--;
});
-$scope.container.dispatchEvent(new CustomEvent('update-states',
{}));
+}).catch(error => {
+$scope.haManageErrors.push({
+operationName: $scope.operations.REMOVE_ALL_TERMINATED_NODES,
+message: get(error, 'data.message', 'Unknown error.'),
+});
});
-}
+$scope.container.dispatchEvent(new CustomEvent('update-states', {}));
+};
-$element.bind('update-states', (event) => {
+$element.bind('update-states', () => {
let updateStates = serverApi.getHaStates();
updateStates.then(({ data }) => {
if (Object.keys(data.nodes).length === $scope.expectedNodeCounter)
{
diff --git a/ui-modules/home/app/views/about/about.template.html
b/ui-modules/home/app/views/about/about.template.html
index fc29f01..d887b39 100644
--- a/ui-modules/home/app/views/about/about.template.html
+++ b/ui-modules/home/app/views/about/about.template.html
@@ -71,7 +71,7 @@
HA status
Remove terminated nodes
+style="float:
right;">{{operations.REMOVE_ALL_TERMINATED_NODES}}
[brooklyn-server] branch master updated: Require Entitlements.HA_ADMIN for HA clear requests; tidy up
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 f41b826 Require Entitlements.HA_ADMIN for HA clear requests; tidy up
new d35d92f Merge pull request #1275 from algairim/ha-improvements
f41b826 is described below
commit f41b82667794089bc1ae4d0cda5a5b44be080469
Author: Mykola Mandra
AuthorDate: Thu Nov 18 16:12:30 2021 +
Require Entitlements.HA_ADMIN for HA clear requests; tidy up
Signed-off-by: Mykola Mandra
---
.../org/apache/brooklyn/rest/api/ServerApi.java| 2 +-
.../brooklyn/rest/resources/ServerResource.java| 41 +++---
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git
a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
index 868f0f2..c8f08be 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
@@ -163,7 +163,7 @@ public interface ServerApi {
@GET
@Path("/ha/priority")
@ApiOperation(value = "Returns the HA node priority for MASTER failover")
-public long getHighAvailabitlityPriority();
+public long getHighAvailabilityPriority();
@POST
@Path("/ha/priority")
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
index 33f4ef3..81948f3 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
@@ -97,11 +97,10 @@ import com.google.common.collect.FluentIterable;
public class ServerResource extends AbstractBrooklynRestResource implements
ServerApi {
private static final int SHUTDOWN_TIMEOUT_CHECK_INTERVAL = 200;
-
private static final Logger log =
LoggerFactory.getLogger(ServerResource.class);
-
private static final String BUILD_SHA_1_PROPERTY = "git-sha-1";
private static final String BUILD_BRANCH_PROPERTY = "git-branch-name";
+private static final String USER_OPERATION_NOT_AUTHORIZED_MSG = "User '%s'
is not authorized to perform this operation";
@Context
private ContextResolver shutdownHandler;
@@ -114,7 +113,7 @@ public class ServerResource extends
AbstractBrooklynRestResource implements Serv
if (Entitlements.isEntitled(mgmt().getEntitlementManager(),
Entitlements.SEE_ALL_SERVER_INFO, null)) {
brooklyn().reloadBrooklynProperties();
} else {
-throw WebResourceUtils.forbidden("User '%s' is not authorized to
perform this operation", Entitlements.getEntitlementContext().user());
+throw
WebResourceUtils.forbidden(USER_OPERATION_NOT_AUTHORIZED_MSG,
Entitlements.getEntitlementContext().user());
}
}
@@ -128,7 +127,7 @@ public class ServerResource extends
AbstractBrooklynRestResource implements Serv
Long delayMillis) {
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(),
Entitlements.SEE_ALL_SERVER_INFO, null))
-throw WebResourceUtils.forbidden("User '%s' is not authorized to
perform this operation", Entitlements.getEntitlementContext().user());
+throw
WebResourceUtils.forbidden(USER_OPERATION_NOT_AUTHORIZED_MSG,
Entitlements.getEntitlementContext().user());
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(),
Entitlements.SHUTDOWN, null))
throw WebResourceUtils.forbidden("User '%s' is not authorized for
shutdown", Entitlements.getEntitlementContext().user());
@@ -334,7 +333,7 @@ public class ServerResource extends
AbstractBrooklynRestResource implements Serv
@Override
public VersionSummary getVersion() {
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(),
Entitlements.SERVER_STATUS, null))
-throw WebResourceUtils.forbidden("User '%s' is not authorized to
perform this operation", Entitlements.getEntitlementContext().user());
+throw
WebResourceUtils.forbidden(USER_OPERATION_NOT_AUTHORIZED_MSG,
Entitlements.getEntitlementContext().user());
// TODO
// * "build-metadata.properties" is probably the wrong name
@@ -361,7 +360,7 @@ public class ServerResource extends
AbstractBrooklynRestResource implements Serv
@Override
public String getPlaneId() {
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(),
Entitlements.SERVER_STATUS, null))
-throw WebResourceUtils
[brooklyn-ui] branch master updated (a2720ec -> e995578)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from a2720ec Merge pull request #298 from jathanasiou/enhancement/composer-persist-selector-state new a7dc45a larger home page tiles new 62f3134 UI modules minor renaming new 409e31d renaming further UI module name references and tests new e995578 Merge pull request #304 from jathanasiou/enhancement/home-visuals The 2265 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: ui-modules/app-inspector/app/index.e2e-spec.js | 2 +- ui-modules/app-inspector/package.json | 2 +- ui-modules/app-inspector/src/main/resources/ui-module/config.yaml | 2 +- ui-modules/blueprint-composer/app/index.e2e-spec.js| 2 +- ui-modules/blueprint-composer/package.json | 2 +- ui-modules/blueprint-composer/src/main/resources/ui-module/config.yaml | 2 +- ui-modules/blueprint-importer/app/index.e2e-spec.js| 2 +- ui-modules/blueprint-importer/package.json | 2 +- ui-modules/blueprint-importer/src/main/resources/ui-module/config.yaml | 2 +- ui-modules/groovy-console/app/index.e2e-spec.js| 2 +- ui-modules/groovy-console/package.json | 2 +- ui-modules/groovy-console/src/main/resources/ui-module/config.yaml | 2 +- ui-modules/home/app/views/main/main.template.html | 2 +- ui-modules/location-manager/app/index.e2e-spec.js | 2 +- ui-modules/location-manager/package.json | 2 +- ui-modules/location-manager/src/main/resources/ui-module/config.yaml | 2 +- ui-modules/rest-api-docs/app/index.e2e-spec.js | 2 +- ui-modules/rest-api-docs/package.json | 2 +- ui-modules/rest-api-docs/src/main/resources/ui-module/config.yaml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-)
[brooklyn-server] branch master updated: fix file log store test to clean up mgmt context and use test ng not junit
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 ee1f4b3 fix file log store test to clean up mgmt context and use test
ng not junit
new c52ce0b Merge pull request #1264 from ahgittin/file-log-store-test-fix
ee1f4b3 is described below
commit ee1f4b32b19b23d737dc69737eb88788e7e8d269
Author: Alex Heneveld
AuthorDate: Wed Oct 20 10:11:07 2021 +0100
fix file log store test to clean up mgmt context and use test ng not junit
---
.../util/core/logbook/file/FileLogStoreTest.java | 40 --
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git
a/core/src/test/java/org/apache/brooklyn/util/core/logbook/file/FileLogStoreTest.java
b/core/src/test/java/org/apache/brooklyn/util/core/logbook/file/FileLogStoreTest.java
index f37d19a..1c7c762 100644
---
a/core/src/test/java/org/apache/brooklyn/util/core/logbook/file/FileLogStoreTest.java
+++
b/core/src/test/java/org/apache/brooklyn/util/core/logbook/file/FileLogStoreTest.java
@@ -19,12 +19,12 @@
package org.apache.brooklyn.util.core.logbook.file;
import com.google.common.collect.ImmutableList;
-import junit.framework.TestCase;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.core.logbook.BrooklynLogEntry;
import org.apache.brooklyn.util.core.logbook.LogBookQueryParams;
-import org.junit.Test;
import org.testng.annotations.*;
import java.io.File;
@@ -35,8 +35,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import static
org.apache.brooklyn.util.core.logbook.file.FileLogStore.LOGBOOK_LOG_STORE_DATEFORMAT;
import static
org.apache.brooklyn.util.core.logbook.file.FileLogStore.LOGBOOK_LOG_STORE_PATH;
+import static org.apache.brooklyn.test.Asserts.assertNull;
+import static org.junit.Assert.assertEquals; // deliberately junit due to
order of arguments
-public class FileLogStoreTest extends TestCase {
+public class FileLogStoreTest extends BrooklynMgmtUnitTestSupport {
private final String UNEXPECTED_DATE_TIME_FORMAT = "-MM-dd
HH:mm:ss,SSS";
private final String JAVA_LOG_SAMPLE_PATH =
"brooklyn/util/core/logbook/file/log-sample.txt";
@@ -51,8 +53,10 @@ public class FileLogStoreTest extends TestCase {
private final AtomicInteger lineCount = new AtomicInteger();
-@BeforeTest
-public void setUp() {
+@Override
+@BeforeMethod(alwaysRun=true)
+public void setUp() throws Exception {
+// don't call super - we don't always need a mgmt context
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
}
@@ -137,7 +141,7 @@ public class FileLogStoreTest extends TestCase {
@Test
public void testParseLogWithDateTimeFormatMismatch() {
-ManagementContextInternal mgmt =
LocalManagementContextForTests.newInstance();
+mgmt = LocalManagementContextForTests.newInstance();
mgmt.getBrooklynProperties().put(LOGBOOK_LOG_STORE_DATEFORMAT.getName(),
UNEXPECTED_DATE_TIME_FORMAT);
FileLogStore cut = new FileLogStore(mgmt);
BrooklynLogEntry brooklynLogEntry = cut.parseLogLine(JAVA_LOG_LINE,
lineCount);
@@ -156,7 +160,7 @@ public class FileLogStoreTest extends TestCase {
@Test
public void testQueryLogSample() {
File file = new
File(Objects.requireNonNull(getClass().getClassLoader().getResource(JAVA_LOG_SAMPLE_PATH)).getFile());
-ManagementContextInternal mgmt =
LocalManagementContextForTests.newInstance();
+mgmt = LocalManagementContextForTests.newInstance();
mgmt.getBrooklynProperties().put(LOGBOOK_LOG_STORE_PATH.getName(),
file.getAbsolutePath());
LogBookQueryParams logBookQueryParams = new LogBookQueryParams();
logBookQueryParams.setNumberOfItems(2); // Request first two only.
@@ -203,7 +207,7 @@ public class FileLogStoreTest extends TestCase {
@Test
public void testQueryLogSampleWithDateTimeFormatMismatch() {
File file = new
File(Objects.requireNonNull(getClass().getClassLoader().getResource(JAVA_LOG_SAMPLE_PATH)).getFile());
-ManagementContextInternal mgmt =
LocalManagementContextForTests.newInstance();
+mgmt = LocalManagementContextForTests.newInstance();
mgmt.getBrooklynProperties().put(LOGBOOK_LOG_STORE_PATH.getName(),
file.getAbsolutePath());
mgmt.getBrooklynProperties().put(LOGBOOK_LOG_STORE_DATEFORMAT.getName(),
UNEXPECTED_DATE_TIME_FORMAT);
LogBookQueryParams logBookQueryParams = new LogBookQueryParams();
@@ -220,7 +224,7 @@ public class FileLogStoreTest extends TestCase
[brooklyn-client] branch master updated (3250c11 -> a6c89af)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git. from 3250c11 Merge pull request #91 from jcabrerizo/fix/apache-deploy new 3791546 Fix output new 4fa3b82 Forcing cleaning before deploy new a6c89af Merge pull request #92 from jcabrerizo/fix/apache-deploy The 474 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 | 2 +- cli/release/build.sh | 10 +- 2 files changed, 2 insertions(+), 10 deletions(-)
[brooklyn-client] branch master updated: Change GO386 depending on go version available
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 53eacb5 Change GO386 depending on go version available new 3250c11 Merge pull request #91 from jcabrerizo/fix/apache-deploy 53eacb5 is described below commit 53eacb5882726c3e20cefd199fae7c27c0de320b Author: Juan Cabrerizo AuthorDate: Wed Sep 8 09:51:06 2021 +0100 Change GO386 depending on go version available --- cli/release/build.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/cli/release/build.sh b/cli/release/build.sh index 3a3b0be..fc596de 100755 --- a/cli/release/build.sh +++ b/cli/release/build.sh @@ -184,6 +184,19 @@ See golang.org for more information, or run maven with '-Dno-go-client' to skip. exit 1 fi +if !(( "$GO_V" >= 16 )) ; then + export GO386=387 + echo "Updated GO386=$GO386 due GO version compatibilityq" + cat 1>&2 << \ +--MARKER-- + +ERROR: Incompatible Go language version: $GO_VERSION + +Go version 1.16 doesn't support GO386=387 + +--MARKER-- +fi + mkdir -p $outdir # Disable use of C code modules (causes problems with cross-compiling)
[brooklyn-client] branch master updated: Set up go environment
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 e1fc90e Set up go environment new 8922191 Merge pull request #90 from jcabrerizo/master e1fc90e is described below commit e1fc90e085e73f3d80a225e5917c9da919f2facb Author: Juan Cabrerizo AuthorDate: Wed Sep 8 08:12:41 2021 +0100 Set up go environment --- cli/release/build.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/release/build.sh b/cli/release/build.sh index 8f20942..3a3b0be 100755 --- a/cli/release/build.sh +++ b/cli/release/build.sh @@ -16,7 +16,10 @@ # specific language governing permissions and limitations # under the License. - +echo "Setting up go environment" +go env -w GO111MODULE=auto +export GO386='softfloat' +echo "GO386=$GO386" # # Constants #
[brooklyn-client] branch master updated: Adding mvn deploy if not PR
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 26a6c89 Adding mvn deploy if not PR
new fb19c16 Merge pull request #89 from jcabrerizo/master
26a6c89 is described below
commit 26a6c89366d1b4b034f48f21149bdb99f61f9c8f
Author: Juan Cabrerizo
AuthorDate: Tue Sep 7 17:49:32 2021 +0100
Adding mvn deploy if not PR
---
Jenkinsfile | 9 +
1 file changed, 9 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7fe54bb..ac79372 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,6 +48,15 @@ node(label: 'ubuntu') {
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} -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'
+}
+}
+}
}
}
[brooklyn-docs] 01/01: Update brooklyn_cfg.md
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch fix/ldap/user_regex in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git commit 22078b4fe39a95d44f38e2b12c756883a947a2eb Author: Juan Cabrerizo AuthorDate: Tue Sep 7 13:11:28 2021 +0100 Update brooklyn_cfg.md --- guide/ops/configuration/brooklyn_cfg.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/ops/configuration/brooklyn_cfg.md b/guide/ops/configuration/brooklyn_cfg.md index dd97a71..9a4f8bf 100644 --- a/guide/ops/configuration/brooklyn_cfg.md +++ b/guide/ops/configuration/brooklyn_cfg.md @@ -136,7 +136,7 @@ The other things you need to set in `brooklyn.cfg` are: * `brooklyn.webconsole.security.ldap.url` - ldap connection url * `brooklyn.webconsole.security.ldap.user_name_regex` *optional* none by default- regex pattern for usernames. If it's - configured, non-matching usernames will be rejected without checking the credentials in the LDAP server + configured, non-matching usernames will be rejected without checking the credentials in the LDAP server. Special characters need to be escaped * `brooklyn.webconsole.security.ldap.realm` - ldap dc parameter (domain) * `brooklyn.webconsole.security.ldap.allowed_realms_regex` - allows multiple realms (domains) that match regex - username must be of form domain\user @@ -155,7 +155,7 @@ brooklyn.webconsole.security.provider=org.apache.brooklyn.rest.security.provider brooklyn.webconsole.security.ldap.url=ldap://localhost:10389/X-BIND-USER=uid=admin%2cou=system,X-BIND-PASSWORD=secret,X-COUNT-LIMIT=1000 brooklyn.webconsole.security.ldap.realm=example.com # username regext pattern for \ -brooklyn.webconsole.security.ldap.user_name_regex=.*\\.* +brooklyn.webconsole.security.ldap.user_name_regex=.*.* ~~~ After you setup the brooklyn connection to your LDAP server, you can authenticate in brooklyn using your cn (e.g. John Smith) and your password.
[brooklyn-docs] branch fix/ldap/user_regex created (now 22078b4)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch fix/ldap/user_regex in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. at 22078b4 Update brooklyn_cfg.md This branch includes the following new commits: new 22078b4 Update brooklyn_cfg.md 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 (74c62f5 -> 0c6aba7)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 74c62f5 Merge pull request #1242 from zan-mateusz/fix/osgi-termination-after-persistence-import new 7280829 removing data subdir as not present in a brooklyn generated persistence export new 7a764ec fix for export to include data subdir new 0c6aba7 Merge pull request #1243 from zan-mateusz/fix/importing-brooklyn-generated-export The 13237 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/resources/ServerResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[brooklyn-ui] branch master updated: Add 'download' attribute to download buttons
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 05e3436 Add 'download' attribute to download buttons new 09b3c42 Merge pull request #279 from algairim/app-inspector-streams-improvements 05e3436 is described below commit 05e34369cc6f3ca047340b98458d41d8090348de Author: Mykola Mandra AuthorDate: Thu Sep 2 12:59:29 2021 +0100 Add 'download' attribute to download buttons Signed-off-by: Mykola Mandra --- .../app/views/main/inspect/activities/detail/detail.template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html index b7ded9d..2765cef 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html +++ b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html @@ -141,7 +141,7 @@ +uib-tooltip="Download" tooltip-placement="top" tooltip-popup-delay="500" tooltip-append-to-body="true" download>
[brooklyn-docs] branch master updated (90bae02 -> a6dce79)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from 90bae02 Merge pull request #332 from algairim/documentation-improvements new 9633b8e Separate examples from external docs new 055782e Extract yaml new c4072ba Fix naming new c124451 Relative links to sections not found new e34fb61 Remove broken yaml import new c4af852 Extract yaml examples new cb299ba Fix typos new a6dce79 Merge pull request #333 from duncangrant/fix-broken-links The 1809 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: _plugins/jekyll_relative_links.rb | 4 ++ _plugins/read.rb | 2 +- guide/locations/_azure-ARM.md | 2 - guide/locations/_azure-classic.md | 26 +-- guide/locations/_clouds.md | 2 - guide/locations/_ibm-softlayer.md | 2 - guide/locations/_localhost.md | 4 +- .../_location-customizer-security-groups.md| 21 + guide/locations/_special-locations.md | 50 ++ guide/locations/index.md | 13 +- .../_location-azure-classic-sample.camp.md | 25 +++ .../_location-customizing-security-groups.camp.md | 12 ++ .../locations/snippets/_location-localhost.camp.md | 5 +++ .../snippets/_location-open-ports.camp.md | 7 +++ .../_location-special-availability.camp.md | 11 + .../snippets/_location-special-round.camp.md | 16 +++ .../snippets/_location-special-sequential.camp.md | 14 ++ .../snippets/_location-special-single.camp.md | 5 +++ .../_externalised-configuration-blueprint.camp.md | 16 +++ .../_externalised-configuration-catalog.camp.md| 14 ++ .../_externalised-configuration-twoways.camp.md| 15 +++ guide/ops/externalized-configuration.md| 50 ++ .../_going-deep-in-java-and-logs.camp.md | 8 .../troubleshooting/going-deep-in-java-and-logs.md | 9 +--- 24 files changed, 166 insertions(+), 167 deletions(-) create mode 100644 guide/locations/snippets/_location-azure-classic-sample.camp.md create mode 100644 guide/locations/snippets/_location-customizing-security-groups.camp.md create mode 100644 guide/locations/snippets/_location-localhost.camp.md create mode 100644 guide/locations/snippets/_location-open-ports.camp.md create mode 100644 guide/locations/snippets/_location-special-availability.camp.md create mode 100644 guide/locations/snippets/_location-special-round.camp.md create mode 100644 guide/locations/snippets/_location-special-sequential.camp.md create mode 100644 guide/locations/snippets/_location-special-single.camp.md create mode 100644 guide/ops/external/_externalised-configuration-blueprint.camp.md create mode 100644 guide/ops/external/_externalised-configuration-catalog.camp.md create mode 100644 guide/ops/external/_externalised-configuration-twoways.camp.md create mode 100644 guide/ops/troubleshooting/_going-deep-in-java-and-logs.camp.md
[brooklyn-docs] branch master updated: Fix default value of destroyOnFailure in docs
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 05c0b3c Fix default value of destroyOnFailure in docs new 90bae02 Merge pull request #332 from algairim/documentation-improvements 05c0b3c is described below commit 05c0b3c5d525037d4c5a0c99475af3b276aed9ae Author: Mykola Mandra AuthorDate: Thu Sep 2 11:38:08 2021 +0100 Fix default value of destroyOnFailure in docs Signed-off-by: Mykola Mandra --- guide/locations/_clouds.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/locations/_clouds.md b/guide/locations/_clouds.md index b925372..ad41e94 100644 --- a/guide/locations/_clouds.md +++ b/guide/locations/_clouds.md @@ -142,7 +142,7 @@ For more keys and more detail on the keys below, see - If you want to investigate failures, set `destroyOnFailure: false` to keep failed VM's around. (You'll have to manually clean them up.) - The default is false: if a VM fails to start, or is never ssh'able, then the VM will be terminated. + The default is true: if a VM fails to start, or is never ssh-able, then the VM will be terminated. - You can set `useMachinePublicAddressAsPrivateAddress` to true to overwrite the VMs private IP with its public IP. This is useful as it can be difficult to get VMs communicating via the private IPs they are assigned in some clouds. Using this config, blueprints which use private IPs can still be deployed to these clouds.
[brooklyn-ui] branch master updated: attempt to fix WARN and ERROR on service creation, and tidy some references and logs
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 1a6a88d attempt to fix WARN and ERROR on service creation, and tidy
some references and logs
new 01295c1 Merge pull request #277 from
ahgittin/fix-warnings-about-ui-modules-java-bundles
1a6a88d is described below
commit 1a6a88d1c22585522d04fe56ca94d7d4ed559f73
Author: Alex Heneveld
AuthorDate: Wed Sep 1 13:09:24 2021 +0100
attempt to fix WARN and ERROR on service creation, and tidy some references
and logs
metadata service appeared to have an inconsistent naming strategy; when i
updated the name it worked perfectly.
---
modularity-server/external-modules/pom.xml | 3 +--
.../brooklyn/ui/modularity/ExternalUiModule.java | 12 ++---
modularity-server/metadata-registry/pom.xml| 5 ++--
.../registry/impl/UiMetadataConfigListener.java| 31 +-
.../registry/impl/UiMetadataRegistryImpl.java | 1 -
.../ui/modularity/module/api/UiModuleListener.java | 1 +
.../module/registry/UiModuleRegistryImpl.java | 4 +++
7 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/modularity-server/external-modules/pom.xml
b/modularity-server/external-modules/pom.xml
index fc23600..fa83702 100644
--- a/modularity-server/external-modules/pom.xml
+++ b/modularity-server/external-modules/pom.xml
@@ -103,9 +103,8 @@
-
+
<_dsannotations>*
-
<_metatypeannotations>*
diff --git
a/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
b/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
index 7866efe..160ad08 100644
---
a/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
+++
b/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
@@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableList;
@Component(
name = ExternalUiModule.PID,
configurationPid = ExternalUiModule.PID,
-configurationPolicy = ConfigurationPolicy.REQUIRE,
+configurationPolicy = ConfigurationPolicy.REQUIRE, // only trigger if
there is a corresponding PID config admin, setting up an external ui module?
immediate = true
)
public class ExternalUiModule implements UiModule {
@@ -71,7 +71,12 @@ public class ExternalUiModule implements UiModule {
@Activate
public void activate(final Map properties) {
-this.setModuleProperties(properties);
+if (!properties.containsKey(KEY_URL) &&
properties.containsKey("component.id")) {
+// activation properties aren't usually for a module; do this
check to suppress warning
+LOG.debug("Not setting module properties for activation properties
"+properties);
+} else {
+this.setModuleProperties(properties);
+}
}
@Modified
@@ -90,7 +95,8 @@ public class ExternalUiModule implements UiModule {
}
if (issues.size() > 0) {
-throw new IllegalArgumentException("Invalid UI module [" +
properties.get(KEY_ID) + "] ... " + issues.toString());
+LOG.error("Invalid UI module (ignoring) [" +
properties.get(KEY_ID) + "] ... " + issues.toString()+"; properties:
"+properties, new Throwable("source of error"));
+return;
}
this.id = properties.get(KEY_ID);
diff --git a/modularity-server/metadata-registry/pom.xml
b/modularity-server/metadata-registry/pom.xml
index ce62d4a..2c15bb7 100644
--- a/modularity-server/metadata-registry/pom.xml
+++ b/modularity-server/metadata-registry/pom.xml
@@ -114,10 +114,9 @@
true
-
-
+
+
<_dsannotations>*
-
<_metatypeannotations>*
diff --git
a/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
b/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
index 564f6c7..ef15c21 100644
---
a/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
+++
b/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
@@ -33,11 +33,11 @@ import static com.google.common.base.Predicates.not;
@Component(
[brooklyn-server] branch master updated: Replace log out for keep it consistence with Tasks
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 ec47312 Replace log out for keep it consistence with Tasks
ec47312 is described below
commit ec47312d1fbacf37cdc41a12b2411cc551feed86
Author: Juan Cabrerizo
AuthorDate: Wed Sep 1 11:09:06 2021 +0100
Replace log out for keep it consistence with Tasks
Replace log out for keep it consistence with logs for Tasks and other
actions
---
.../main/java/org/apache/brooklyn/rest/resources/EffectorResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
index 862f15c..1c276f0 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
@@ -92,7 +92,7 @@ public class EffectorResource extends
AbstractBrooklynRestResource implements Ef
throw WebResourceUtils.forbidden("User '%s' is not authorized to
invoke effector %s on entity %s",
Entitlements.getEntitlementContext().user(),
effector.get().getName(), entity);
}
-String userInfo = Entitlements.getEntitlementContext() != null ? "by
user " + Entitlements.getEntitlementContext().user() : "(no user info
available)";
+String userInfo = Entitlements.getEntitlementContext() != null ? "for
user " + Entitlements.getEntitlementContext().user() : "(no user info
available)";
log.info("REST invocation of " + entity + "." + effector.get() + " " +
Sanitizer.sanitize(parameters) + " " + userInfo);
Task t = entity.invoke(effector.get(), parameters);
[brooklyn-ui] branch master updated: Support entityId and taskId as parameters
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 05a1377 Support entityId and taskId as parameters
new 7c7f671 Merge pull request #275 from jcabrerizo/fix/logbook/queryByIds
05a1377 is described below
commit 05a13775381493d2c739616dd69ad3a275ce0bf9
Author: Juan Cabrerizo
AuthorDate: Tue Aug 31 11:30:02 2021 +0100
Support entityId and taskId as parameters
---
.../app/views/main/inspect/activities/detail/detail.template.html | 2 +-
.../app/views/main/inspect/summary/summary.template.html | 2 +-
ui-modules/utils/logbook/logbook.js| 7 +--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
index 572c791..b7ded9d 100644
---
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
+++
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
@@ -181,7 +181,7 @@
Logbook (activity)
-
+
diff --git
a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
index d8dee1f..cbb4226 100644
---
a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
+++
b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
@@ -189,6 +189,6 @@
Logbook (entity)
-
+
diff --git a/ui-modules/utils/logbook/logbook.js
b/ui-modules/utils/logbook/logbook.js
index 5a8f686..b0c2b8a 100644
--- a/ui-modules/utils/logbook/logbook.js
+++ b/ui-modules/utils/logbook/logbook.js
@@ -34,7 +34,8 @@ export function logbook() {
template: template,
restrict: 'E',
scope: {
-searchId: '@',
+taskId: '@',
+entityId: '@',
},
controller: ['$scope', '$element', '$interval', 'brBrandInfo',
'logbookApi', controller],
controllerAs: 'vm'
@@ -233,7 +234,9 @@ export function logbook() {
const params = {
levels: levels,
tail: $scope.search.latest,
-searchPhrases: [$scope.search.phrase,
$scope.searchId].filter(phrase => phrase),
+searchPhrase: $scope.search.phrase,
+taskId: $scope.taskId,
+entityId: $scope.entityId,
numberOfItems: $scope.search.numberOfItems,
dateTimeFrom: dateTimeFrom,
dateTimeTo: dateTimeTo,
[brooklyn-server] branch master updated (8afd23e -> 98849fd)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 8afd23e bump winrm - fix leak in encryption factory new b0e2a12 FileLogStore and QueryParams expecting EntityId and TaskId as a new param field new fcfc34f OpenSearchLogStore using updated QueryParams with EntityId and/or TaskId new 98849fd Merge pull request #1241 from jcabrerizo/fix/logbook/queryByIds The 13229 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: .../util/core/logbook/LogBookQueryParams.java | 30 +-- .../util/core/logbook/file/FileLogStore.java | 46 +++ .../logbook/opensearch/OpenSearchLogStore.java | 39 +++-- .../util/core/logbook/file/FileLogStoreTest.java | 94 +- .../logbook/opensearch/OpenSearchLogStoreTest.java | 46 ++- .../brooklyn/util/core/logbook/file/log-sample.txt | 8 +- 6 files changed, 212 insertions(+), 51 deletions(-)
[brooklyn-ui] branch master updated: Remove UTC conversion as now the log are using UTC too
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 7b4246c Remove UTC conversion as now the log are using UTC too
new 17f52d6 Merge pull request #270 from
jcabrerizo/fix/logbook/autoquery-using-utc
7b4246c is described below
commit 7b4246c01007da477d1761e74d9efd01e8ec57c0
Author: Juan Cabrerizo
AuthorDate: Thu Aug 26 16:06:03 2021 +0100
Remove UTC conversion as now the log are using UTC too
---
ui-modules/utils/logbook/logbook.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui-modules/utils/logbook/logbook.js
b/ui-modules/utils/logbook/logbook.js
index 18aa738..5a8f686 100644
--- a/ui-modules/utils/logbook/logbook.js
+++ b/ui-modules/utils/logbook/logbook.js
@@ -225,7 +225,7 @@ export function logbook() {
let dateTimeFrom = getUtcTimestamp($scope.search.dateTimeFrom);
let dateTimeTo = getUtcTimestamp($scope.search.dateTimeTo)
if (isTail() && !isNewQueryParameters &&
!isEmpty($scope.logEntries)) {
-dateTimeFrom =
getUtcTimestamp(getLogEntryTimestamp($scope.logEntries.slice(-1)[0]))
+dateTimeFrom =
getLogEntryTimestamp($scope.logEntries.slice(-1)[0])
}
const levels = getCheckedBoxes($scope.search.logLevels);
[brooklyn-docs] branch master updated: Fix multiline example for for info level
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 b8c2379 Fix multiline example for for info level
b8c2379 is described below
commit b8c23796497a02e66bf9f052923aa4e3da6a6cf3
Author: Juan Cabrerizo
AuthorDate: Thu Aug 26 14:32:06 2021 +0100
Fix multiline example for for info level
---
guide/ops/logging.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/guide/ops/logging.md b/guide/ops/logging.md
index f45d83c..a39975e 100644
--- a/guide/ops/logging.md
+++ b/guide/ops/logging.md
@@ -142,6 +142,7 @@ is a good simple way to forward content added to the info
and debug log files:
@log_level info
@type multiline
+ format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
format1 /^(?\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z)
(?\S+)?-(?\S+)? (?\w{4}
|\w{5})\W{1,4}(?\d{1,3}) (?(?:\S\.)*\S*)
\[(?\S+)\] (?.*)/
time_format %Y-%m-%dT%H:%M:%S,%L
[brooklyn-docs] branch master updated (de2c636 -> 2351d31)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from de2c636 Merge pull request #326 from jcabrerizo/feature/log-timestampt-utc new 8b53357 Example of rotating index using OpenSearch new 8e6526c Fix multiline pattern new 2351d31 Merge pull request #327 from jcabrerizo/feature/logbook/rotatinIndexLog The 1786 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.md | 42 ++ 1 file changed, 30 insertions(+), 12 deletions(-)
[brooklyn-server] branch master updated (fccad0d -> e56d96d)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from fccad0d hide the deprecated entities/activities endpoint new 7668d7f Added HA_ADMIN entitlement and added test coverage for it new 9a420f2 Fixed the groovy test that I broke by mistake new e56d96d Merge pull request #1232 from iuliana/feature/ha-admin The 13205 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: .../org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java | 6 -- .../apache/brooklyn/core/mgmt/entitlement/EntitlementsTest.java | 9 - 2 files changed, 12 insertions(+), 3 deletions(-)
[brooklyn-server] branch master updated (9a9cfc0 -> e80cb69)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 9a9cfc0 be stricter on coercions that are otherwise lossy and/or platform-dependent new dc15bf9 tweak log format new f393640 make log watcher use its own stream, not stdout, and not rely on log4j setup new 5be0b6c add failing test cases for non-annotated log messages new 3650f72 fix how logging MDC context includes task and entity IDs for _all_ tasks new a3b590e include thread id for debug logs new 7293155 add logging categories for activities of special interest new 19054fe guard against early use of application IDs new 7eca7f8 Update ApplicationLoggingTest.java new e80cb69 Merge pull request #1231 from ahgittin/more-log-traceability The 13201 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: .../api/internal/BrooklynLoggingCategories.java| 14 ++-- .../brooklyn/core/entity/AbstractApplication.java | 25 +-- .../core/mgmt/entitlement/Entitlements.java| 13 .../core/mgmt/internal/LocalEntityManager.java | 16 .../core/objs/proxy/InternalEntityFactory.java | 23 +- .../util/core/task/BasicExecutionContext.java | 47 .../util/core/task/BasicExecutionManager.java | 68 - .../core/entity/ApplicationLoggingTest.java| 87 ++ .../resources/brooklyn/logback-appender-file.xml | 6 +- .../brooklyn/logback-appender-jclouds.xml | 3 +- .../resources/brooklyn/logback-appender-stdout.xml | 4 +- .../java/org/apache/brooklyn/test/LogWatcher.java | 60 +++ .../resources/brooklyn/logback-appender-file.xml | 3 +- 13 files changed, 256 insertions(+), 113 deletions(-) copy locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java => api/src/main/java/org/apache/brooklyn/api/internal/BrooklynLoggingCategories.java (61%)
[brooklyn-server] branch master updated: Fix test II
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 81da1ac Fix test II new f24451c Merge pull request #1229 from jcabrerizo/feature/logbook/default-path-relative 81da1ac is described below commit 81da1ac51b4048907163d08fd1252c39ccc98cd1 Author: Juan Cabrerizo AuthorDate: Mon Aug 23 17:45:23 2021 +0100 Fix test II --- rest/rest-resources/src/test/resources/logbook.log.sample | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest/rest-resources/src/test/resources/logbook.log.sample b/rest/rest-resources/src/test/resources/logbook.log.sample index dd00809..75a9546 100644 --- a/rest/rest-resources/src/test/resources/logbook.log.sample +++ b/rest/rest-resources/src/test/resources/logbook.log.sample @@ -1,5 +1,5 @@ -2021-06-29T13:01:33,321 - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-586] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@2ff437f8[/v1/server/user@null] -2021-06-29T13:01:33,327 - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@606bd997[/v1/ui-module-registry@null] -2021-06-29T13:01:33,327 - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@17dc0492[/v1/ui-module-registry@null] -2021-06-29T13:01:33,332 - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@40ddb947[/v1/ui-module-registry@null] -2021-06-29T13:01:33,340 - DEBUG 324 o.a.b.r.u.j.BrooklynJacksonJsonProvider [qtp213572341-791] Found mapper com.fasterxml.jackson.databind.ObjectMapper@20ac4763 for org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider@42f134e5, creating custom Brooklyn mapper \ No newline at end of file +2021-06-29T13:01:33,321Z - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-586] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@2ff437f8[/v1/server/user@null] +2021-06-29T13:01:33,327Z - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@606bd997[/v1/ui-module-registry@null] +2021-06-29T13:01:33,327Z - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@17dc0492[/v1/ui-module-registry@null] +2021-06-29T13:01:33,332Z - WARN 324 o.a.b.r.u.MultiSessionAttributeAdapter [qtp213572341-791] Unsupported session impl in org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest@40ddb947[/v1/ui-module-registry@null] +2021-06-29T13:01:33,340Z - DEBUG 324 o.a.b.r.u.j.BrooklynJacksonJsonProvider [qtp213572341-791] Found mapper com.fasterxml.jackson.databind.ObjectMapper@20ac4763 for org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider@42f134e5, creating custom Brooklyn mapper \ No newline at end of file
[brooklyn-server] branch master updated (dbc82f9 -> a8c9045)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from dbc82f9 Fix typo new 189e5de Adding new atribute to control save the user groups origin new 9303766 Using class name as origin name new a8c9045 Merge pull request #1225 from jcabrerizo/feature/ldap-independent-groups The 13171 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: .../apache/brooklyn/core/mgmt/entitlement/WebEntitlementContext.java | 2 +- .../org/apache/brooklyn/rest/filter/EntitlementContextFilter.java | 4 +++- .../apache/brooklyn/rest/security/provider/LdapSecurityProvider.java | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-)
[brooklyn-server] branch master updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 dbc82f9 Fix typo
dbc82f9 is described below
commit dbc82f94c688959dcc2f9c803d769a92ec427b42
Author: Juan Cabrerizo
AuthorDate: Thu Aug 19 09:40:56 2021 +0100
Fix typo
Fix typo in logs default path
---
.../java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
index 2d154c0..57fd10f 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
@@ -56,11 +56,11 @@ public class FileLogStore implements LogStore {
/*
# Example config for local default implementation
brooklyn.logbook.logStore =
org.apache.brooklyn.util.core.logbook.file.FileLogStore
-brooklyn.logbook.fileLogStore.path = /var/logs/brooklyn/brooklyn.debug.log
+brooklyn.logbook.fileLogStore.path = /var/log/brooklyn/brooklyn.debug.log
*/
public final static String BASE_NAME_FILE_LOG_STORE = BASE_NAME_LOGBOOK +
".fileLogStore";
public final static ConfigKey LOGBOOK_LOG_STORE_PATH =
ConfigKeys.newStringConfigKey(
-BASE_NAME_FILE_LOG_STORE + ".path", "Log file path",
"/var/logs/brooklyn/brooklyn.debug.log");
+BASE_NAME_FILE_LOG_STORE + ".path", "Log file path",
"/var/log/brooklyn/brooklyn.debug.log");
public final static ConfigKey LOGBOOK_LOG_STORE_REGEX =
ConfigKeys.newStringConfigKey(
BASE_NAME_FILE_LOG_STORE + ".regexPattern",
[brooklyn-server] branch master updated: fix for 406 http error on post request ha/state
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 b935979 fix for 406 http error on post request ha/state
new 34adf4f Merge pull request #1224 from zan-mateusz/fix/api-ha-state
b935979 is described below
commit b93597928c6016e0257cf5b830f0ebf67af9bb12
Author: zan-mateusz
AuthorDate: Tue Aug 17 16:48:11 2021 +0100
fix for 406 http error on post request ha/state
---
rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
index 7c40824..096a928 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
@@ -136,7 +136,7 @@ public interface ServerApi {
@POST
@Path("/ha/state")
@ApiOperation(value = "Changes the HA state of this management node")
-@Produces({MediaType.APPLICATION_FORM_URLENCODED})
+@Consumes({MediaType.APPLICATION_FORM_URLENCODED})
public ManagementNodeState setHighAvailabilityNodeState(
@ApiParam(name = "mode", value = "The state to change to")
@FormParam("mode") HighAvailabilityMode mode);
[brooklyn-ui] branch master updated: fix for incorrect logic for disabling apply button
This is an automated email from the ASF dual-hosted git repository. jcabrerizo 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 7e43e8a fix for incorrect logic for disabling apply button new 3abfb35 Merge pull request #268 from zan-mateusz/fix/node-management-modal-apply-button 7e43e8a is described below commit 7e43e8a84f84f383a00ba42902696e4c820b898e Author: zan-mateusz AuthorDate: Tue Aug 17 17:16:31 2021 +0100 fix for incorrect logic for disabling apply button --- .../home/app/views/about/node-management/node-management.template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-modules/home/app/views/about/node-management/node-management.template.html b/ui-modules/home/app/views/about/node-management/node-management.template.html index 253d1a6..5e41d53 100644 --- a/ui-modules/home/app/views/about/node-management/node-management.template.html +++ b/ui-modules/home/app/views/about/node-management/node-management.template.html @@ -77,7 +77,7 @@ ng-click="doShowEditOptions()">Edit Apply
[brooklyn-docs] branch master updated (6ba57f5 -> d1dcba1)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from 6ba57f5 Merge pull request #319 from iuliana/feature/trace-log new d82cf97 Add power user role new 7e77913 New blueprintAuthor new d1dcba1 Merge pull request #320 from jcabrerizo/feature/add-poweruser The 1772 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[brooklyn-docs] branch master updated (7f8efba -> 9da4ca9)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git. from 7f8efba use simpler `read` in most places new 357db1f Initial logbook setup guide new cb63ef6 Update logging.md new 9da4ca9 Merge pull request #318 from algairim/logbook-documentation The 1766 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.md | 56 1 file changed, 56 insertions(+)
[brooklyn-server] 01/01: Merge pull request #1209 from apache/fix-noldapgroups
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit aba23d2f7222e3dc538e968ac0c55bf04bd953b8 Merge: c33f70d 10bff60 Author: Juan Cabrerizo AuthorDate: Thu Jul 22 09:21:12 2021 +0100 Merge pull request #1209 from apache/fix-noldapgroups Fix partial login when ldap user in no groups .../brooklyn/rest/security/provider/LdapSecurityProvider.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[brooklyn-server] branch master updated (c33f70d -> aba23d2)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from c33f70d Merge pull request #1208 from algairim/logbook-search-improvements add 10bff60 Fix partial login new aba23d2 Merge pull request #1209 from apache/fix-noldapgroups 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: .../brooklyn/rest/security/provider/LdapSecurityProvider.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[brooklyn-ui] branch master updated (902a187 -> e9db2a6)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 902a187 Merge pull request #253 from jathanasiou/fix/composer-scrollbars new b4ce1e2 Improve UX for auto-query: display 'Loading...' while user editing search parameters new 052b300 Assign unique IDs for plaintext and pretty formatted text of the search result areas new 5c799b0 Support search of multiple phrases; intoduce searchId as a logbook padirective rameter new 42454fe Add logbook to app inspector with activity ID as a search phrase to match with at least new 92ca85a Initialize logbook date filters with null new a2c32f0 Add logbook into summary, clarify logbook specific in parentheses new 69bb1a6 Remove unused logbook filters: task ID and entity ID new 8811b01 Revert "Remove unused logbook filters: task ID and entity ID" new e9db2a6 Merge pull request #252 from algairim/logbook-widget The 2077 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: ui-modules/app-inspector/app/index.js | 7 +- ui-modules/app-inspector/app/index.less| 1 + .../inspect/activities/detail/detail.template.html | 4 ++ .../main/inspect/summary/summary.template.html | 5 ++ ui-modules/utils/logbook/logbook.js| 74 ++ ui-modules/utils/logbook/logbook.template.html | 4 +- 6 files changed, 65 insertions(+), 30 deletions(-)
[brooklyn-server] branch master updated: Support multi-phrase query
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 c4b95c9 Support multi-phrase query
new c33f70d Merge pull request #1208 from
algairim/logbook-search-improvements
c4b95c9 is described below
commit c4b95c98dfdd91ceb4da7fa23aa15ba05af961fb
Author: Mykola Mandra
AuthorDate: Mon Jul 19 18:33:19 2021 +0100
Support multi-phrase query
Signed-off-by: Mykola Mandra
---
.../util/core/logbook/LogBookQueryParams.java | 10 +++
.../brooklyn/util/core/logbook/LogStore.java | 1 -
.../util/core/logbook/file/FileLogStore.java | 18 ++--
.../logbook/opensearch/OpenSearchLogStore.java | 8 --
.../util/core/logbook/file/FileLogStoreTest.java | 32 --
.../logbook/opensearch/OpenSearchLogStoreTest.java | 18 ++--
6 files changed, 71 insertions(+), 16 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogBookQueryParams.java
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogBookQueryParams.java
index 4b9c698..5219224 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogBookQueryParams.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogBookQueryParams.java
@@ -41,7 +41,7 @@ public class LogBookQueryParams {
private String dateTimeTo;
/** The search phrase to look log items with */
-private String searchPhrase;
+private List searchPhrases;
public Integer getNumberOfItems() {
return numberOfItems;
@@ -83,11 +83,11 @@ public class LogBookQueryParams {
this.dateTimeTo = dateTimeTo;
}
-public String getSearchPhrase() {
-return searchPhrase;
+public List getSearchPhrases() {
+return searchPhrases;
}
-public void setSearchPhrase(String searchPhrase) {
-this.searchPhrase = searchPhrase;
+public void setSearchPhrases(List searchPhrases) {
+this.searchPhrases = searchPhrases;
}
}
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogStore.java
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogStore.java
index 83e88be..d08f71c 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogStore.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogStore.java
@@ -29,5 +29,4 @@ public interface LogStore {
* @throws IOException
*/
List query(LogBookQueryParams query) throws IOException;
-
}
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
index e25428c..2d154c0 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java
@@ -105,6 +105,7 @@ public class FileLogStore implements LogStore {
Date dateTimeFrom = Strings.isNonBlank(params.getDateTimeFrom()) ?
Time.parseDate(params.getDateTimeFrom()) : null;
Date dateTimeTo = Strings.isNonBlank(params.getDateTimeTo()) ?
Time.parseDate(params.getDateTimeTo()) : null;
+boolean isSearchPhrasesPresent =
!Objects.isNull(params.getSearchPhrases()) &&
!params.getSearchPhrases().isEmpty();
Predicate filter = brooklynLogEntry -> {
@@ -140,9 +141,9 @@ public class FileLogStore implements LogStore {
}
}
-// Check the search phrase.
-if (Strings.isNonBlank(params.getSearchPhrase()) &&
Strings.isNonBlank(brooklynLogEntry.getMessage())) {
-isSearchPhraseMatch =
brooklynLogEntry.getMessage().contains(params.getSearchPhrase());
+// Check search phrases.
+if (isSearchPhrasesPresent &&
Strings.isNonBlank(brooklynLogEntry.getMessage())) {
+isSearchPhraseMatch =
containsSearchPhrases(brooklynLogEntry.getMessage(), params.getSearchPhrases());
}
return isLogLevelMatch && isDateTimeFromMatch &&
isDateTimeToMatch && isSearchPhraseMatch;
@@ -200,4 +201,15 @@ public class FileLogStore implements LogStore {
}
return entry;
}
+
+public static boolean containsSearchPhrases(String logMessage,
List searchPhrases) {
+boolean found = true;
+for (String searchPhrase : searchPhrases) {
+if (!logMessage.contains(searchPhrase)) {
+found = false;
+break;
+}
+}
+return found;
+}
}
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/logbook/opensearch/OpenSearchLogStore.java
b/core/
[brooklyn-server] branch master updated (b4d4a26 -> 6938065)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from b4d4a26 Merge pull request #1198 from jcabrerizo/feature/csrf-cookie-secure new ea63534 Remove reverse order from logbook API, use 'tail' instead to get latest log lines. Query 'head' by default. new ffd3988 Fix logbook resource unit-tests to match tail filed in logbook REST API new 6938065 Merge pull request #1197 from algairim/logbook-search-improvements The 13023 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: .../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 +- .../rest/resources/LogbookResourceTest.java| 4 +- 7 files changed, 95 insertions(+), 64 deletions(-)
[brooklyn-ui] branch master updated (4bedda3 -> 3694aca)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git. from 4bedda3 Merge pull request #242 from jcabrerizo/feature/fix-module-url new b7e6772 Add option to auto-refresh logbook widget with latest update new 5eabff8 Adjust styling of query and tail buttons new 31a7558 Optimize tail on auto-update: query from the date-time of the latest logline, rounded down to seconds new b80f374 Fix 'query head' action new 3694aca Merge pull request #243 from algairim/logbook-widget The 2022 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: ui-modules/utils/logbook/logbook.js| 291 + ui-modules/utils/logbook/logbook.less | 67 -- ui-modules/utils/logbook/logbook.template.html | 41 ++-- 3 files changed, 269 insertions(+), 130 deletions(-)
[brooklyn-dist] branch master updated: JSESSIONID mask as httpOnly
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 5871051 JSESSIONID mask as httpOnly
new d147840 Merge pull request #173 from
jcabrerizo/feature/http-only-cookie
5871051 is described below
commit 5871051e0e8ec1a4a6bfcd5651ac70fc52f3e57e
Author: Juan Cabrerizo
AuthorDate: Mon Jul 12 15:59:14 2021 +0100
JSESSIONID mask as httpOnly
---
karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg
b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg
index 39947eb..325bf6b 100644
--- a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg
+++ b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg
@@ -16,4 +16,4 @@
#
# TODO use the PortService - ${port:8081,8200}
org.osgi.service.http.port=8081
-
+org.ops4j.pax.web.session.cookie.httpOnly=true
[brooklyn-server] branch master updated: Csrf-Token mark as secure when https is used
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 50432e3 Csrf-Token mark as secure when https is used
new b4d4a26 Merge pull request #1198 from
jcabrerizo/feature/csrf-cookie-secure
50432e3 is described below
commit 50432e3c054f0cd99f076ff85532b879aed95070
Author: Juan Cabrerizo
AuthorDate: Mon Jul 12 15:53:12 2021 +0100
Csrf-Token mark as secure when https is used
---
.../java/org/apache/brooklyn/rest/filter/CsrfTokenFilter.java| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CsrfTokenFilter.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CsrfTokenFilter.java
index 93344f9..ca57d3e 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CsrfTokenFilter.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CsrfTokenFilter.java
@@ -239,8 +239,8 @@ public class CsrfTokenFilter implements
ContainerRequestFilter, ContainerRespons
}
session.setAttribute(CSRF_TOKEN_VALUE_ATTR, token);
-addCookie(responseContext, CSRF_TOKEN_VALUE_COOKIE, token, "Clients
should send this value in header "+CSRF_TOKEN_VALUE_HEADER+" for validation");
-addCookie(responseContext, CSRF_TOKEN_VALUE_COOKIE_ANGULAR_NAME,
token, "Compatibility cookie for "+CSRF_TOKEN_VALUE_COOKIE+" following
AngularJS conventions");
+addCookie(responseContext, CSRF_TOKEN_VALUE_COOKIE, token, "Clients
should send this value in header "+CSRF_TOKEN_VALUE_HEADER+" for validation",
requestContext.getSecurityContext().isSecure());
+addCookie(responseContext, CSRF_TOKEN_VALUE_COOKIE_ANGULAR_NAME,
token, "Compatibility cookie for "+CSRF_TOKEN_VALUE_COOKIE+" following
AngularJS conventions", requestContext.getSecurityContext().isSecure());
CsrfTokenRequiredForRequests requiredWhen;
if (Strings.isNonBlank(requiredWhenS)) {
@@ -273,9 +273,10 @@ public class CsrfTokenFilter implements
ContainerRequestFilter, ContainerRespons
}
-protected NewCookie addCookie(ContainerResponseContext responseContext,
String cookieName, String token, String comment) {
-NewCookie cookie = new NewCookie(cookieName, token, "/", null,
comment, -1, false);
+protected NewCookie addCookie(ContainerResponseContext responseContext,
String cookieName, String token, String comment, boolean markSecure) {
+NewCookie cookie = new NewCookie(cookieName, token, "/", null,
comment, -1, markSecure);
responseContext.getHeaders().add("Set-Cookie", cookie);
+
return cookie;
}
[brooklyn-ui] branch master updated (6a56f16 -> 6055c5a)
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 6a56f16 Merge pull request #239 from
algairim/designer-events-refactoring
new 031adfe Convert logbook into directive
new 99ff692 Remove commented HTML tags
new cf5b69a Scroll down the logbook after query in case of non-reverse
order
new 681a32e Default logbook query to suggest 1000 lines instead of 10
new c0c303a Merge branch 'master' into logbook-widget
new 4503305 Keep serverVersion under scope instead of contrlloer instance
new 6055c5a Merge pull request #235 from algairim/logbook-widget
The 2007 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:
ui-modules/home/app/index.js | 9 +-
ui-modules/home/app/index.less | 7 +-
.../home/app/views/about/about.controller.js | 9 +-
.../home/app/views/about/about.template.html | 11 +-
.../home/app/views/logbook/logbook.controller.js | 180
.../home/app/views/logbook/logbook.template.html | 73
ui-modules/utils/logbook/logbook.js| 188 +
.../{home/app/views => utils}/logbook/logbook.less | 0
ui-modules/utils/logbook/logbook.template.html | 60 +++
9 files changed, 268 insertions(+), 269 deletions(-)
delete mode 100644 ui-modules/home/app/views/logbook/logbook.controller.js
delete mode 100644 ui-modules/home/app/views/logbook/logbook.template.html
create mode 100644 ui-modules/utils/logbook/logbook.js
rename ui-modules/{home/app/views => utils}/logbook/logbook.less (100%)
create mode 100644 ui-modules/utils/logbook/logbook.template.html
[brooklyn-server] branch master updated (0f2c4ca -> 5947556)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 0f2c4ca refactor to make findConfigKeys shareable new 1dac4da untested trial code to better get existing sessions new e1edae7 Merge remote-tracking branch 'upstream/master' into HEAD new 3a7ed78 LDAP logging improvements new 80ba1aa Cleanup comments new ed69895 Remove unnecessary import new 5947556 Merge pull request #1174 from duncangrant/ldap-login-improvements3 The 12917 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: .../BrooklynSecurityProviderFilterHelper.java | 25 +-- .../BrooklynSecurityProviderFilterJavax.java | 25 ++- .../security/provider/LdapSecurityProvider.java| 73 +++ .../rest/util/MultiSessionAttributeAdapter.java| 82 +++--- .../provider/LdapSecurityProviderTest.java | 73 +++ 5 files changed, 230 insertions(+), 48 deletions(-) create mode 100644 rest/rest-resources/src/test/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProviderTest.java
[brooklyn] 01/01: Merge pull request #48 from apache/extend-go-version
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 11a023bde822166ec8b36de97be08fac69c952d8 Merge: 8786592 b6def2d Author: Juan Cabrerizo AuthorDate: Tue Mar 9 12:00:26 2021 + Merge pull request #48 from apache/extend-go-version Dockerfile | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-)
[brooklyn] branch master updated (8786592 -> 11a023b)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git. from 8786592 bump sub-projects to latest commits add 1abf5c7 Updates go version add b6def2d Revert change to maven container version new 11a023b Merge pull request #48 from apache/extend-go-version 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: Dockerfile | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-)
[brooklyn-client] branch master updated: Adds CatalogApi test using equivalent non deprecated method
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo 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 f150eed Adds CatalogApi test using equivalent non deprecated method
new fd31f7f Merge pull request #85 from grkvlt/fix/deprecated-api-test
f150eed is described below
commit f150eedb34f6a050cfc1db5fae9fdef95e567b9a
Author: Andrew Donald Kennedy
AuthorDate: Thu Feb 11 10:47:43 2021 +
Adds CatalogApi test using equivalent non deprecated method
Signed-off-by: Andrew Donald Kennedy
---
.../rest/client/BrooklynApiRestClientTest.java | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git
a/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
b/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
index d5d8d92..4165dd9 100644
---
a/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
+++
b/java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
@@ -37,6 +37,7 @@ import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.core.location.BasicLocationRegistry;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.core.typereg.BrooklynBomYamlCatalogBundleResolver;
import org.apache.brooklyn.rest.BrooklynRestApiLauncher;
import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest;
import org.apache.brooklyn.rest.domain.ApplicationSummary;
@@ -113,13 +114,32 @@ public class BrooklynApiRestClientTest {
log.info("locations from catalog are: "+locations);
}
-public void testCatalogCreate()throws Exception {
-final Response response =
api.getCatalogApi().createFromUpload(getFileContentsAsString("catalog/test-catalog.bom").getBytes(),
false);
+// Note that the API method called here is now deprecated.
+// The equivalent call is used in testCatalogCreate below.
+public void testCatalogCreateFromYamlDeprecated()throws Exception {
+String yaml = getFileContentsAsString("catalog/test-catalog.bom");
+yaml = yaml.replaceAll("simple-tomcat", "simple-tomcat-yaml");
+final Response response = api.getCatalogApi().createFromYaml(yaml,
false);
Asserts.assertEquals(response.getStatus(), 201);
-Asserts.assertStringContains(String.valueOf(response.getEntity()),
"simple-tomcat:1.0");
+Asserts.assertStringContains(String.valueOf(response.getEntity()),
"simple-tomcat-yaml:1.0");
}
+// Note that the API method called here is now deprecated.
+// The equivalent call is used in testCatalogCreate below.
+public void testCatalogCreateFromUploadDeprecated()throws Exception {
+String yaml = getFileContentsAsString("catalog/test-catalog.bom");
+yaml = yaml.replaceAll("simple-tomcat", "simple-tomcat-upload");
+final Response response =
api.getCatalogApi().createFromUpload(yaml.getBytes(), false);
+Asserts.assertEquals(response.getStatus(), 201);
+Asserts.assertStringContains(String.valueOf(response.getEntity()),
"simple-tomcat-upload:1.0");
+}
+public void testCatalogCreate()throws Exception {
+String yaml = getFileContentsAsString("catalog/test-catalog.bom");
+final Response response = api.getCatalogApi().create(yaml.getBytes(),
BrooklynBomYamlCatalogBundleResolver.FORMAT, false, true, false);
+Asserts.assertEquals(response.getStatus(), 201);
+Asserts.assertStringContains(String.valueOf(response.getEntity()),
"simple-tomcat:1.0");
+}
public void testApplicationApiList() throws Exception {
List apps = api.getApplicationApi().list(null);
[brooklyn-server] branch master updated (c25bcfc -> f4760b5)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from c25bcfc This closes #1147 new 44a870e Set return type for deprecated CatalogApi methods new 03919c8 Add response type for other deprecated APIs for continued backcompatibility new f4760b5 Merge pull request #1148 from grkvlt/fix/rest-api-client The 12785 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/ApplicationApi.java| 4 ++-- .../src/main/java/org/apache/brooklyn/rest/api/BundleApi.java | 4 ++-- .../src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java| 8 3 files changed, 8 insertions(+), 8 deletions(-)
[brooklyn-dist] branch feature/bump-karaf created (now 9f19815)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch feature/bump-karaf in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. at 9f19815 Fix version typo This branch includes the following new commits: new 6ece9c6 Updated ops4h.base new 544655a WIP compiling bit not starting new 8cc44a6 Usin com.sun.activation instad of javax new 9f19815 Fix version typo The 4 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] 02/04: WIP compiling bit not starting
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch feature/bump-karaf
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 544655a11431ec7a4ce6ad005bf6cf5b729282d8
Author: Juan Cabrerizo
AuthorDate: Mon Dec 14 11:05:39 2020 +
WIP compiling bit not starting
---
karaf/features/src/main/feature/feature.xml | 3 +++
karaf/itest/pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 07d2ed5..f59d4dc 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -53,6 +53,9 @@
+
+
+wrap:mvn:javax.activation/activation/1.1
mvn:javax.mail/mail/${javax.mail.version}
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 3564bd6..cbdfe28 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -111,7 +111,7 @@
org.osgi
-org.osgi.core
+osgi.core
${org.osgi.core.version}
provided
