Repository: karaf Updated Branches: refs/heads/master 56025161e -> 96a0920c6
[KARAF-2923] Remove unused configuration file for regions Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7456445c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7456445c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7456445c Branch: refs/heads/master Commit: 7456445c876666cceca1771ca4c465e39610aa41 Parents: 5602516 Author: Guillaume Nodet <[email protected]> Authored: Tue Apr 22 17:12:53 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Wed Apr 23 15:48:07 2014 +0200 ---------------------------------------------------------------------- .../resources/etc/regions-config.xml | 37 -------------------- .../core/internal/InstanceServiceImpl.java | 1 - 2 files changed, 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/7456445c/assemblies/features/framework/src/main/filtered-resources/resources/etc/regions-config.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/regions-config.xml b/assemblies/features/framework/src/main/filtered-resources/resources/etc/regions-config.xml deleted file mode 100644 index 9aca3a8..0000000 --- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/regions-config.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. ---> -<regions xmlns="http://karaf.apache.org/xmlns/region/v1.0.0";> - <region name="org.apache.karaf.region.application"></region> - - <filter to="org.eclipse.equinox.region.kernel" from="org.apache.karaf.region.application"> - <package name="org.slf4j"/> - <package name="org.apache.aries.util"/> - <package name="org.apache.aries.util.io"/> - <package name="org.apache.aries.util.nls"/> - <package name="org.apache.aries.util.tracker"/> - <package name="org.apache.aries.util.service.registry"/> - <package name="org.apache.aries.proxy.weaving"/> - <package name="org.apache.aries.proxy"/> - <package name="org.apache.aries.blueprint"/> - <package name="org.apache.aries.blueprint.mutable"/> - <package name="org.osgi.service.blueprint"/> - <package name="org.osgi.service.blueprint.container"/> - <package name="org.osgi.service.blueprint.reflect"/> - </filter> -</regions> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/7456445c/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index 535c2a0..01a4fa1 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -305,7 +305,6 @@ public class InstanceServiceImpl implements InstanceService { copyResourceToDir(karafBase, "etc/org.apache.karaf.log.cfg", printOutput); copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", printOutput); copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", printOutput); - copyResourceToDir(karafBase, "etc/regions-config.xml", printOutput); copyResourceToDir(karafBase, "etc/shell.init.script", printOutput); copyResourceToDir(karafBase, "etc/users.properties", printOutput);
