This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 40b0a26 remove the names of the SCR components to prevent errors
40b0a26 is described below
commit 40b0a2630e1768a3ba144efdeb44ca6acf8d980d
Author: Alex Heneveld <[email protected]>
AuthorDate: Fri Sep 10 01:37:38 2021 +0100
remove the names of the SCR components to prevent errors
with the name set, it seems to log an ERROR about it already being
registered;
without the name it has gone away, at least a couple times here.
(previous attempts have seen them gone away but then come back so not 100%
sure but it all seems to work at least)
---
.../main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java | 2 +-
.../ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 160ad08..49664cf 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
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
@Component(
- name = ExternalUiModule.PID,
+ // name = ExternalUiModule.PID, // omitting the name / using default
seems to prevent warning about it being unable to be installed?
configurationPid = ExternalUiModule.PID,
configurationPolicy = ConfigurationPolicy.REQUIRE, // only trigger if
there is a corresponding PID config admin, setting up an external ui module?
immediate = true
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 ef15c21..6d589a9 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
@@ -32,7 +32,7 @@ import static com.google.common.base.Predicates.in;
import static com.google.common.base.Predicates.not;
@Component(
- name = "Brooklyn UI Metadata",
+ //name = "Brooklyn UI Metadata", // omitting the name / using default
seems to prevent warning about it being unable to be installed?
configurationPid = UiMetadataConfigListener.PID, configurationPolicy =
ConfigurationPolicy.OPTIONAL, immediate = true,
property = {UiMetadataRegistry.METADATA_TYPE + ":String=" +
UiMetadataRegistry.METADATA_TYPE_DEFAULT}
)
