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-dist.git
commit 5b7804d8b2348815dfb7d733949bf43cf3bec72f Author: Alex Heneveld <[email protected]> AuthorDate: Tue Mar 30 17:28:55 2021 +0100 tweak karaf resources - don't use filtered resources unnecessarily - extract our custom system properties - use latest bouncycastle (1.67), even if karaf is slightly lower (1.66) --- .../resources/etc/org.apache.karaf.features.xml | 4 + .../resources/bin/generate-password.sh | 0 .../resources/etc/brooklyn.cfg | 0 .../resources/etc/custom.system.properties} | 20 +-- .../main/resources/resources/etc/system.properties | 136 --------------------- 5 files changed, 14 insertions(+), 146 deletions(-) diff --git a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml index c5f5c06..10cb5e2 100644 --- a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml +++ b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml @@ -55,6 +55,10 @@ replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" /> <bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/1.51" replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" /> + <bundle originalUri="mvn:org.bouncycastle/bcprov-ext-jdk15on/1.66" + replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" /> + <bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/1.66" + replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" /> <bundle originalUri="mvn:net.i2p.crypto/eddsa/0.1.0" replacement="mvn:net.i2p.crypto/eddsa/0.2.0" /> </bundleReplacements> diff --git a/karaf/features/src/main/filtered-resources/resources/bin/generate-password.sh b/karaf/features/src/main/resources/resources/bin/generate-password.sh similarity index 100% rename from karaf/features/src/main/filtered-resources/resources/bin/generate-password.sh rename to karaf/features/src/main/resources/resources/bin/generate-password.sh diff --git a/karaf/features/src/main/filtered-resources/resources/etc/brooklyn.cfg b/karaf/features/src/main/resources/resources/etc/brooklyn.cfg similarity index 100% copy from karaf/features/src/main/filtered-resources/resources/etc/brooklyn.cfg copy to karaf/features/src/main/resources/resources/etc/brooklyn.cfg diff --git a/karaf/features/src/main/filtered-resources/resources/etc/brooklyn.cfg b/karaf/features/src/main/resources/resources/etc/custom.system.properties similarity index 55% rename from karaf/features/src/main/filtered-resources/resources/etc/brooklyn.cfg rename to karaf/features/src/main/resources/resources/etc/custom.system.properties index 4af1b37..7ef689c 100644 --- a/karaf/features/src/main/filtered-resources/resources/etc/brooklyn.cfg +++ b/karaf/features/src/main/resources/resources/etc/custom.system.properties @@ -17,16 +17,16 @@ # ################################################################################ -# Default configuration does NOT require log in; THIS SHOULD BE CHANGED if on a public endpoint -brooklyn.webconsole.security.provider = org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider - -# One alternative to the above (comment out the provider above and uncomment this) -# is to allow any localhost access and create a password for other usage -#brooklyn.webconsole.security.provider = org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider +# Customizations for Apache Brooklyn, read by default system.properties +# +# The properties defined in this file will be made available through system +# properties at the very beginning of the Karaf's boot process. -# Or to set a password and user, or multiple ones, comment the provider above out and uncomment the two lines below -#brooklyn.webconsole.security.users=admin -#brooklyn.webconsole.security.user.admin.password=password +# +# Name of this Karaf instance. +# +karaf.name = brooklyn -# Refer to the documentation for other auth settings, including LDAP, and other settings +# Needed to get CXF to run as the Jersey provider +javax.ws.rs.ext.RuntimeDelegate = org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl diff --git a/karaf/features/src/main/resources/resources/etc/system.properties b/karaf/features/src/main/resources/resources/etc/system.properties deleted file mode 100644 index ff910ae..0000000 --- a/karaf/features/src/main/resources/resources/etc/system.properties +++ /dev/null @@ -1,136 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# -# The properties defined in this file will be made available through system -# properties at the very beginning of the Karaf's boot process. -# - - -# Log level when the pax-logging service is not available -# This level will only be used while the pax-logging service bundle -# is not fully available. -# To change log levels, please refer to the org.ops4j.pax.logging.cfg file -# instead. -org.ops4j.pax.logging.DefaultServiceLog.level = ERROR - -# -# Name of this Karaf instance. -# -karaf.name = brooklyn - -# -# Default repository where bundles will be loaded from before using -# other Maven repositories. For the full Maven configuration, see -# the org.ops4j.pax.url.mvn.cfg file. -# -karaf.default.repository = system - -# -# Location of a shell script that will be run when starting a shell -# session. This script can be used to create aliases and define -# additional commands. -# -karaf.shell.init.script = ${karaf.etc}/shell.init.script - -# -# Sets the maximum size of the shell command history. If not set, -# defaults to 500 entries. Setting to 0 will disable history. -# -# karaf.shell.history.maxSize = 0 - -# -# Deletes the entire karaf.data directory at every start -# -karaf.clean.all = false - -# -# Deletes the karaf.data/cache directory at every start -# -karaf.clean.cache = false - -# -# Roles to use when logging into a local Karaf console. -# -# The syntax is the following: -# [classname:]principal -# where classname is the class name of the principal object -# (defaults to org.apache.karaf.jaas.modules.RolePrincipal) -# and principal is the name of the principal of that class -# (defaults to instance). -# -karaf.local.roles = admin,manager,viewer,systembundles - -# -# Set this empty property to avoid errors when validating xml documents. -# -xml.catalog.files = - -# -# Suppress the bell in the console when hitting backspace too many times -# for example -# -jline.nobell = true - -# -# ServiceMix specs options -# -org.apache.servicemix.specs.debug = false -org.apache.servicemix.specs.timeout = 0 - -# -# Settings for the OSGi 4.3 Weaving -# By default, we will not weave any classes. Change this setting to include classes -# that you application needs to have woven. -# -org.apache.aries.proxy.weaving.enabled = none -# Classes not to weave - Aries default + Xerces which is known to have issues. -org.apache.aries.proxy.weaving.disabled = org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.* - -# -# By default, only Karaf shell commands are secured, but additional services can be -# secured by expanding this filter -# -karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) - -# -# Security properties -# -# To enable OSGi security, uncomment the properties below, -# install the framework-security feature and restart. -# -#java.security.policy=${karaf.etc}/all.policy -#org.osgi.framework.security=osgi -#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks - -# -# HA/Lock configuration -# -# Karaf uses a lock mechanism to know which instance is the master (HA) -# The lock can be on the filesystem (default) or on a database. -# -# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details. -# -# Even using a single instance, Karaf creates the lock file -# You can specify the location of the lock file using the -# karaf.lock.dir=/path/to/the/directory/containing/the/lock -# - -# Needed to get CXF to run as the Jersey provider -javax.ws.rs.ext.RuntimeDelegate = org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl
