Repository: brooklyn-dist Updated Branches: refs/heads/master b8e251a75 -> e53a9c99b
tidies to accompany https://github.com/apache/brooklyn-server/pull/746 remove bom-scanner config, and declare bundle in catalog.bom Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c5c5fa76 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c5c5fa76 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c5c5fa76 Branch: refs/heads/master Commit: c5c5fa76c10582c788cb63e852313358b8395d0a Parents: b8e251a Author: Alex Heneveld <[email protected]> Authored: Tue Jul 18 09:02:41 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Jul 18 09:02:41 2017 +0100 ---------------------------------------------------------------------- .../src/main/resources/etc/default.catalog.bom | 1 + ....apache.brooklyn.core.catalog.bomscanner.cfg | 27 -------------------- 2 files changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c5c5fa76/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom ---------------------------------------------------------------------- diff --git a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom index 8a0e705..ac658e1 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom +++ b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom @@ -3,6 +3,7 @@ # and templates to get started using Brooklyn brooklyn.catalog: + bundle: brooklyn-default-karaf-catalog version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION include: classpath://library-catalog-classes.bom http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c5c5fa76/karaf/config/src/main/resources/org.apache.brooklyn.core.catalog.bomscanner.cfg ---------------------------------------------------------------------- diff --git a/karaf/config/src/main/resources/org.apache.brooklyn.core.catalog.bomscanner.cfg b/karaf/config/src/main/resources/org.apache.brooklyn.core.catalog.bomscanner.cfg deleted file mode 100644 index 242dfd6..0000000 --- a/karaf/config/src/main/resources/org.apache.brooklyn.core.catalog.bomscanner.cfg +++ /dev/null @@ -1,27 +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. -# -################################################################################ - -# CSV Whitelist of regular expressions to match bundle symbolic id if bundle is to be permitted to add -# applications (templates) to the catalog -whiteList=.* - -# CSV Blacklist of regular expressions to match bundle symbolic id to prevent selected whitelisted bundles -# adding applications (templates) to the catalog -blackList= -
