karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [2/2] karaf git commit: [KARAF-5167] Improve instance resources sync
Date Wed, 14 Jun 2017 05:52:26 GMT
[KARAF-5167] Improve instance resources sync


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/525c99ad
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/525c99ad
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/525c99ad

Branch: refs/heads/karaf-4.1.x
Commit: 525c99ad9502a0c2cccff128737a2d761a03b2b9
Parents: c195682
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jun 13 17:19:25 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jun 14 07:37:53 2017 +0200

----------------------------------------------------------------------
 instance/pom.xml                                |  61 ++
 .../core/internal/InstanceServiceImpl.java      |  10 +-
 .../karaf/instance/resources/etc/all.policy     |  22 -
 .../instance/resources/etc/config.properties    | 376 ----------
 .../instance/resources/etc/custom.properties    |  30 -
 .../instance/resources/etc/distribution.info    |  26 -
 .../resources/etc/equinox-debug.properties      | 111 ---
 .../resources/etc/java.util.logging.properties  |  23 -
 .../karaf/instance/resources/etc/jmx.acl.cfg    |  56 --
 .../resources/etc/jmx.acl.java.lang.Memory.cfg  |   8 -
 .../etc/jmx.acl.org.apache.karaf.bundle.cfg     |  21 -
 .../etc/jmx.acl.org.apache.karaf.config.cfg     |  35 -
 .../jmx.acl.org.apache.karaf.security.jmx.cfg   |  10 -
 .../etc/jmx.acl.osgi.compendium.cm.cfg          |  36 -
 .../karaf/instance/resources/etc/jre.properties | 745 -------------------
 .../instance/resources/etc/keys.properties      |  36 -
 ....apache.felix.eventadmin.impl.EventAdmin.cfg |   4 -
 .../etc/org.apache.felix.fileinstall-deploy.cfg |  25 -
 .../etc/org.apache.karaf.command.acl.bundle.cfg |  27 -
 .../etc/org.apache.karaf.command.acl.config.cfg |  27 -
 .../org.apache.karaf.command.acl.feature.cfg    |  10 -
 .../etc/org.apache.karaf.command.acl.jaas.cfg   |   6 -
 .../etc/org.apache.karaf.command.acl.kar.cfg    |  10 -
 ...rg.apache.karaf.command.acl.scope_bundle.cfg |  14 -
 .../etc/org.apache.karaf.command.acl.shell.cfg  |   9 -
 .../etc/org.apache.karaf.command.acl.system.cfg |  10 -
 .../resources/etc/org.apache.karaf.features.cfg |  88 ---
 .../etc/org.apache.karaf.features.repos.cfg     |  38 -
 .../resources/etc/org.apache.karaf.jaas.cfg     |  44 --
 .../resources/etc/org.apache.karaf.kar.cfg      |  29 -
 .../resources/etc/org.apache.karaf.log.cfg      |  19 -
 .../etc/org.apache.karaf.management.cfg         |   5 +-
 .../resources/etc/org.apache.karaf.shell.cfg    |   5 +-
 .../resources/etc/org.ops4j.pax.logging.cfg     |  88 ---
 .../resources/etc/org.ops4j.pax.url.mvn.cfg     | 147 ----
 .../karaf/instance/resources/etc/profile.cfg    |  27 -
 .../instance/resources/etc/shell.init.script    |  56 --
 .../instance/resources/etc/startup.properties   |  10 -
 .../instance/resources/etc/system.properties    |   2 +-
 .../instance/resources/etc/users.properties     |  33 -
 .../core/internal/InstanceServiceImplTest.java  |   3 +-
 .../org/apache/karaf/itests/InstanceTest.java   |  18 +-
 42 files changed, 73 insertions(+), 2287 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/pom.xml
----------------------------------------------------------------------
diff --git a/instance/pom.xml b/instance/pom.xml
index f41ef53..09ebc77 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -102,9 +102,70 @@
                     <include>**/*</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated-resources/org/apache/karaf/instance</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/../assemblies/features/base/src/main/resources</directory>
+                                    <excludes>
+                                        <exclude>**/etc/system.properties</exclude>
+                                    </excludes>
+                                </resource>
+                                <resource>
+                                    <directory>${project.basedir}/../assemblies/features/base/src/main/filtered-resources</directory>
+                                    <filtering>true</filtering>
+                                    <excludes>
+                                        <exclude>**/bin/karaf</exclude>
+                                        <exclude>**/bin/karaf.bat</exclude>
+                                        <exclude>**/bin/start</exclude>
+                                        <exclude>**/bin/start.bat</exclude>
+                                        <exclude>**/bin/stop</exclude>
+                                        <exclude>**/bin/stop.bat</exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>@@</delimiter>
+                    </delimiters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-services-maven-plugin</artifactId>
             </plugin>

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/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 67c6bdc..c3d1d0a 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
@@ -319,6 +319,7 @@ public class InstanceServiceImpl implements InstanceService {
 
                 mkdir(karafBase, "bin", printOutput);
                 mkdir(karafBase, "etc", printOutput);
+                mkdir(karafBase, "etc/scripts", printOutput);
                 mkdir(karafBase, "system", printOutput);
                 mkdir(karafBase, "deploy", printOutput);
                 mkdir(karafBase, "data", printOutput);
@@ -334,18 +335,13 @@ public class InstanceServiceImpl implements InstanceService {
                     "etc/distribution.info",
                     "etc/equinox-debug.properties",
                     "etc/java.util.logging.properties",
-                    "etc/jmx.acl.cfg",
                     "etc/jre.properties",
                     "etc/keys.properties",
-                    "etc/org.apache.felix.fileinstall-deploy.cfg",
-                    "etc/org.apache.karaf.features.repos.cfg",
-                    "etc/org.apache.karaf.jaas.cfg",
-                    "etc/org.apache.karaf.kar.cfg",
-                    "etc/org.apache.karaf.log.cfg",
                     "etc/org.ops4j.pax.logging.cfg",
                     "etc/org.ops4j.pax.url.mvn.cfg",
                     "etc/shell.init.script",
                     "etc/users.properties",
+                    "etc/scripts/shell.completion.script",
                     FEATURES_CFG
                 };
                 copyResourcesToDir(resources, karafBase, textResources, printOutput);
@@ -1174,7 +1170,7 @@ public class InstanceServiceImpl implements InstanceService {
     
     private void copyFilteredResourceToDir(String resource, File target, Map<String, URL> resources, Map<String, String> props, boolean printOutput) throws IOException {
         File outFile = new File(target, resource);
-        if( !outFile.exists() ) {
+        if (!outFile.exists()) {
             logDebug("Creating file: %s", printOutput, outFile.getPath());
             try (
                 InputStream is = getResourceStream(resource, resources);

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/all.policy
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/all.policy b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/all.policy
deleted file mode 100644
index 7585f22..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/all.policy
+++ /dev/null
@@ -1,22 +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.
-//
-//===========================================================================
-
-grant {
-   permission java.security.AllPermission;
-};

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
deleted file mode 100644
index 4218695..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
+++ /dev/null
@@ -1,376 +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.
-#
-################################################################################
-
-#
-# This file lists Karaf default settings for this particular version of Karaf.
-# For easier maintenance when upgrading Karaf and to better document which
-# default values have changed, it is recommended to place any changes to
-# these values in a custom.properties file in the same folder as this file.
-# Each value specified in custom.properties will override the default value
-# here.
-#
-
-#
-# Properties file inclusions (as a space separated list of relative paths)
-# Included files will override the values specified in this file
-# NB: ${includes} properties files are mandatory, it means that Karaf will not start
-# if the include file is not found
-#
-${includes} = jre.properties custom.properties
-
-#
-# Properties file inclusions (as a space separated list of relative paths)
-# Included files will override the values specified in this file
-# NB: ${optionals} properties files are optionals, it means that Karaf will just
-# display a warning message but the bootstrap will be performed
-#
-# ${optionals} = my.properties
-
-#
-# Framework selection properties
-#
-karaf.framework=felix
-
-#
-# Location of the OSGi frameworks
-#
-karaf.framework.equinox=mvn\:org.eclipse.tycho/org.eclipse.osgi/3.11.2.v20161107-1947
-karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/5.6.2
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
- org.osgi.resource;version="1.0",\
- org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
- org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
- org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
- org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
- org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",\
- org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",\
- org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",\
- org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
- org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
- org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
- org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
- org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
- org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\
- org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
- org.osgi.service.url;version="1.0",\
- org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
- org.apache.karaf.version;version="4.1.1.SNAPSHOT",\
- org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="4.1.1.SNAPSHOT",\
- org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="4.1.1.SNAPSHOT",\
- ${jre-${java.specification.version}}
-
-#
-# Extra packages appended after standard packages
-#
-org.osgi.framework.system.packages.extra = \
-    org.apache.karaf.branding, \
-    sun.misc, \
-    javax.xml.bind;uses:=\"javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.2.1, \
-    javax.xml.bind.annotation;uses:=\"javax.xml.bind,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom\";version=2.2.1, \
-    javax.xml.bind.annotation.adapters;version=2.2.1, \
-    javax.xml.bind.attachment;uses:=javax.activation;version=2.2.1, \
-    javax.xml.bind.helpers;uses:=\"javax.xml.bind,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.2.1, \
-    javax.xml.bind.util;uses:=\"javax.xml.bind,javax.xml.transform.sax\";version=2.2.1, \
-    javax.xml.soap;uses:=\"javax.activation,javax.xml.namespace,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom\";version=1.3, \
-    javax.activation;version=1.1, \
-    javax.annotation;version=1.2, \
-    javax.annotation.security;version=1.2, \
-    javax.annotation.sql;version=1.2, \
-    javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=1.2, \
-    javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=1.2, \
-    javax.xml.stream.util;uses:=\"javax.xml.namespace,javax.xml.stream,javax.xml.stream.events\";version=1.2, \
-    org.apache.html.dom;uses:=\"org.w3c.dom.html,org.apache.xerces.dom,org.w3c.dom,org.xml.sax\";version=2.11.0, \
-    org.apache.wml.dom;uses:=\"org.apache.wml,org.apache.xerces.dom,org.w3c.dom\";version=2.11.0, \
-    org.apache.wml;uses:=org.w3c.dom;version=2.11.0, \
-    org.apache.xerces.xpointer;uses:=\"org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.impl,org.apache.xerces.xs,org.apache.xerces.impl.dv,org.apache.xerces.xinclude\";version=2.11.0, \
-    org.apache.xerces.xni.grammars;uses:=\"org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs\";version=2.11.0, \
-    org.apache.xerces.impl.xs.util;uses:=\"org.apache.xerces.xs,org.w3c.dom.ls,org.apache.xerces.xs.datatypes,org.apache.xerces.xni,org.apache.xerces.util,org.apache.xerces.xni.grammars,org.apache.xerces.impl.xs,org.apache.xerces.xni.parser,javax.xml.namespace\";version=2.11.0, \
-    org.apache.xerces.jaxp.validation;uses:=\"org.apache.xerces.xni.grammars,javax.xml.validation,org.apache.xerces.xni,javax.xml.transform.dom,org.w3c.dom,org.apache.xerces.xs,org.apache.xerces.impl.dv,org.apache.xerces.dom,org.apache.xerces.xni.parser,org.apache.xerces.util,org.apache.xerces.impl.xs.util,javax.xml.parsers,org.xml.sax,org.apache.xerces.impl.validation,javax.xml.transform,org.apache.xerces.impl.xs,org.apache.xerces.impl,javax.xml.stream,javax.xml.transform.stax,javax.xml.stream.events,javax.xml.namespace,org.apache.xerces.parsers,org.apache.xml.serialize,javax.xml.transform.stream,org.apache.xerces.impl.msg,org.w3c.dom.ls,org.xml.sax.ext,javax.xml.transform.sax\";version=2.11.0, \
-    org.apache.xerces.impl.dtd.models;uses:=org.apache.xerces.xni;version=2.11.0, \
-    org.apache.xerces.impl.xpath;uses:=\"org.apache.xerces.util,org.apache.xerces.xni\";version=2.11.0, \
-    org.apache.xerces.dom3.as;uses:=\"org.w3c.dom,org.w3c.dom.ls\";version=2.11.0, \
-    org.apache.xerces.impl.dv.xs;uses:=\"org.apache.xerces.xs.datatypes,javax.xml.datatype,org.apache.xerces.jaxp.datatype,org.apache.xerces.impl.dv,org.apache.xerces.util,org.apache.xerces.impl.dv.util,org.apache.xerces.xs,org.apache.xerces.impl.xs,org.apache.xerces.xni,javax.xml.namespace,org.apache.xerces.impl.xs.util,org.apache.xerces.impl.xpath.regex,org.w3c.dom\";version=2.11.0, \
-    org.apache.xerces.util;uses:=\"org.xml.sax.ext,org.apache.xerces.xni,org.xml.sax,org.w3c.dom.ls,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.dom,org.w3c.dom,org.apache.xerces.impl.xs.opti,org.apache.xerces.impl,javax.xml.namespace,javax.xml.stream,javax.xml.stream.events,javax.xml.parsers,org.apache.xml.resolver.readers,org.apache.xerces.jaxp,org.apache.xml.resolver\";version=2.11.0, \
-    org.apache.xerces.impl.xs.opti;uses:=\"org.w3c.dom,org.apache.xerces.xni.parser,org.apache.xerces.xni,org.apache.xerces.util,org.apache.xerces.impl.xs,org.apache.xerces.impl,org.apache.xerces.xni.grammars,org.apache.xerces.parsers,org.apache.xerces.impl.validation,org.apache.xerces.impl.dv,org.apache.xerces.impl.msg\";version=2.11.0, \
-    org.apache.xerces.impl.xs.identity;uses:=\"org.apache.xerces.xs,org.apache.xerces.impl.xs.util,org.apache.xerces.impl.xpath,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.impl.xs\";version=2.11.0, \
-    org.apache.xerces.jaxp;uses:=\"org.xml.sax.helpers,org.xml.sax,org.apache.xerces.util,org.apache.xerces.parsers,javax.xml.parsers,javax.xml.validation,org.apache.xerces.jaxp.validation,org.apache.xerces.xni.parser,org.w3c.dom,org.apache.xerces.impl.validation,org.apache.xerces.dom,org.apache.xerces.xni,org.apache.xerces.impl.xs,org.apache.xerces.impl,org.w3c.dom.ls,org.apache.xerces.impl.xs.opti,org.apache.xerces.xs,org.apache.xerces.xni.grammars\";version=2.11.0, \
-    org.apache.xerces.impl.dv;uses:=\"org.apache.xerces.util,org.apache.xerces.xs,org.apache.xerces.impl.xs.util\";version=2.11.0, \
-    org.apache.xerces.xs.datatypes;uses:=\"org.apache.xerces.xs,javax.xml.datatype,org.apache.xerces.xni,javax.xml.namespace\";version=2.11.0, \
-    org.apache.xerces.impl.msg;uses:=org.apache.xerces.util;version=2.11.0, \
-    org.apache.xerces.dom.events;uses:=\"org.w3c.dom.events,org.w3c.dom.views,org.w3c.dom\";version=2.11.0, \
-    org.apache.xerces.xni;uses:=org.apache.xerces.xni.parser;version=2.11.0, \
-    org.apache.xerces.impl.xs;uses:=\"org.apache.xerces.xs,org.apache.xerces.impl.dv,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xni.grammars,org.apache.xerces.parsers,org.apache.xerces.impl.dv.xs,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.xml.sax,org.apache.xerces.impl.xs.identity,org.apache.xerces.xs.datatypes,org.w3c.dom,org.apache.xerces.impl.xs.opti,org.apache.xerces.impl.xs.traversers,org.w3c.dom.ls,org.apache.xerces.impl.xs.models,org.apache.xerces.dom,org.apache.xerces.impl,javax.xml.namespace,org.apache.xerces.impl.validation\";version=2.11.0, \
-    org.apache.xerces.impl;uses:=\"org.apache.xerces.xni.grammars,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.util,org.apache.xerces.impl.dtd,org.apache.xerces.impl.io,org.apache.xerces.impl.validation,org.xml.sax\";version=2.11.0, \
-    org.apache.xerces.stax.events;uses:=\"javax.xml.stream,javax.xml.stream.events,javax.xml.namespace,org.apache.xerces.util,org.apache.xerces.stax\";version=2.11.0, \
-    org.apache.xerces.impl.io;uses:=\"org.apache.xerces.util,org.apache.xerces.impl.msg\";version=2.11.0, \
-    org.apache.xerces.xinclude;uses:=\"org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.impl.io,org.apache.xerces.xpointer,org.apache.xerces.impl\";version=2.11.0, \
-    org.apache.xerces.jaxp.datatype;uses:=\"javax.xml.datatype,org.apache.xerces.util,javax.xml.namespace\";version=2.11.0, \
-    org.apache.xerces.parsers;uses:=\"org.apache.xerces.util,org.apache.xerces.xs,org.w3c.dom.ls,org.apache.xerces.impl.dv,org.apache.xerces.dom,org.apache.xerces.xni.parser,org.apache.xerces.xni,org.w3c.dom,org.xml.sax.ext,org.xml.sax,org.apache.xerces.xni.grammars,org.apache.xerces.impl.xs,org.apache.xerces.dom3.as,org.xml.sax.helpers,org.apache.xerces.impl,org.apache.xerces.impl.dtd,org.apache.xerces.impl.validation,org.apache.xerces.impl.msg,org.apache.xerces.xinclude,org.apache.xerces.xpointer\";version=2.11.0, \
-    org.apache.xerces.impl.dv.util;uses:=\"org.apache.xerces.xs,org.apache.xerces.xs.datatypes\";version=2.11.0, \
-    org.apache.xerces.xni.parser;uses:=org.apache.xerces.xni;version=2.11.0, \
-    org.apache.xerces.impl.xs.traversers;uses:=\"org.apache.xerces.util,org.apache.xerces.impl.xs.opti,org.apache.xerces.xni.parser,org.apache.xerces.xni,org.w3c.dom,org.xml.sax.helpers,org.xml.sax,javax.xml.stream,javax.xml.stream.events,javax.xml.namespace,org.apache.xerces.xs,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs.util,org.apache.xerces.impl.dv,org.apache.xerces.impl.xs,org.apache.xerces.impl.xs.identity,org.apache.xerces.impl.xpath,org.apache.xerces.impl.dv.xs,org.apache.xerces.xni.grammars,org.apache.xerces.parsers,org.apache.xerces.xs.datatypes,org.apache.xerces.impl\";version=2.11.0, \
-    org.apache.xerces.impl.dv.dtd;uses:=\"org.apache.xerces.impl.dv,org.apache.xerces.util\";version=2.11.0, \
-    org.apache.xerces.xs;uses:=\"org.w3c.dom.ls,org.w3c.dom,org.apache.xerces.xs.datatypes\";version=2.11.0, \
-    org.apache.xerces.impl.validation;uses:=\"org.apache.xerces.util,org.apache.xerces.impl.dv,org.apache.xerces.xni\";version=2.11.0, \
-    org.apache.xerces.impl.dtd;uses:=\"org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.impl.validation,org.apache.xerces.xni.grammars,org.apache.xerces.impl.dv,org.apache.xerces.impl.dtd.models,org.apache.xerces.xni.parser,org.apache.xerces.impl,org.apache.xerces.impl.msg\";version=2.11.0, \
-    org.apache.xerces.impl.xs.models;uses:=\"org.apache.xerces.xs,org.apache.xerces.impl.dtd.models,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni.parser,org.apache.xerces.impl,org.apache.xerces.xni\";version=2.11.0, \
-    org.apache.xerces.impl.xpath.regex;uses:=org.apache.xerces.util;version=2.11.0, \
-    org.apache.xerces.stax;uses:=\"javax.xml.namespace,javax.xml.stream,javax.xml.stream.events,org.apache.xerces.stax.events\";version=2.11.0, \
-    org.apache.xerces.dom;uses:=\"org.apache.xerces.parsers,org.apache.xerces.dom3.as,org.w3c.dom,org.apache.xerces.impl.xs,org.apache.xerces.xni,org.apache.xerces.impl.dv.xs,org.apache.xerces.impl,org.apache.xerces.impl.dtd,org.apache.xerces.util,org.w3c.dom.ls,org.apache.xml.serialize,org.w3c.dom.events,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.impl.validation,org.apache.xerces.impl.dv,org.apache.xerces.impl.msg,org.apache.xerces.impl.xs.util,org.apache.xerces.xs,org.apache.xerces.dom.events,org.w3c.dom.traversal,org.w3c.dom.ranges\";version=2.11.0, \
-    org.apache.xml.serialize;uses:=\"org.apache.xerces.util,org.w3c.dom.ls,org.xml.sax.ext,org.apache.xerces.dom,org.w3c.dom,org.xml.sax,org.apache.xerces.impl,sun.io,org.w3c.dom.html,org.apache.xerces.xni,org.xml.sax.helpers\";version=2.11.0, \
-    org.apache.xml.serializer;uses:=\"org.xml.sax.helpers,org.xml.sax,org.apache.xml.serializer.utils,javax.xml.transform,org.w3c.dom.ls,org.w3c.dom,org.xml.sax.ext,org.apache.xml.serializer.dom3\";version=2.7.2, \
-    org.apache.xml.serializer.utils;uses:=\"org.w3c.dom,org.xml.sax,javax.xml.transform\";version=2.7.2, \
-    org.apache.xml.serializer.dom3;uses:=\"org.apache.xml.serializer,org.w3c.dom.ls,org.apache.xml.serializer.utils,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers\";version=2.7.2, \
-    java_cup.runtime;version=2.7.2, \
-    org.apache.xalan;version=2.7.2, \
-    org.apache.xalan.xslt;uses:=\"org.w3c.dom,org.xml.sax,org.apache.xalan,org.xml.sax.helpers,javax.xml.transform.sax,org.apache.xalan.res,org.apache.xml.utils,org.apache.xalan.transformer,javax.xml.transform.dom,javax.xml.parsers,javax.xml.transform,org.apache.xalan.trace,javax.xml.transform.stream\";version=2.7.2, \
-    org.apache.xalan.transformer;uses:=\"org.apache.xml.dtm,org.xml.sax.ext,org.apache.xml.serializer,org.apache.xalan.serialize,org.xml.sax,org.apache.xml.utils,javax.xml.transform,org.apache.xpath,org.apache.xalan.templates,org.apache.xalan.res,org.apache.xpath.axes,org.apache.xpath.objects,org.w3c.dom,org.xml.sax.helpers,javax.xml.parsers,org.w3c.dom.traversal,javax.xml.transform.sax,org.apache.xml.dtm.ref.sax2dtm,org.apache.xml.dtm.ref,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.xpath.functions,org.apache.xalan.trace,org.apache.xalan.extensions\";version=2.7.2, \
-    org.apache.xalan.xsltc.trax;uses:=\"org.xml.sax.ext,org.xml.sax.helpers,org.w3c.dom,org.xml.sax,org.apache.xalan.xsltc.dom,org.apache.xml.serializer,org.apache.xalan.xsltc.runtime,javax.xml.parsers,javax.xml.transform.sax,javax.xml.transform,org.apache.xalan.xsltc.compiler.util,org.apache.xalan.xsltc.compiler,javax.xml,org.apache.xalan.xsltc,org.apache.xml.utils,javax.xml.transform.dom,org.apache.xalan.xsltc.runtime.output,org.apache.xml.dtm,javax.xml.transform.stream\";version=2.7.2, \
-    org.apache.xalan.xsltc.compiler.util;uses:=\"org.apache.bcel.generic,org.apache.xalan.xsltc.compiler,org.apache.bcel.classfile,org.apache.xml.utils\";version=2.7.2, \
-    org.apache.xalan.xsltc.cmdline.getopt;uses:=org.apache.xalan.xsltc.compiler.util;version=2.7.2, \
-    org.apache.xalan.lib;uses:=\"org.w3c.dom,org.apache.xml.dtm.ref,org.apache.xml.dtm,org.apache.xpath,org.apache.xpath.axes,org.apache.xalan.extensions,org.apache.xpath.objects,org.xml.sax,org.apache.xalan.res,org.apache.xml.utils,javax.xml.parsers,javax.xml.transform,org.apache.xalan.xslt,org.w3c.dom.traversal,org.xml.sax.helpers,org.apache.xml.serializer,javax.xml.transform.sax,org.apache.xalan.templates,org.apache.xalan.transformer,javax.xml.transform.stream\";version=2.7.2, \
-    org.apache.xalan.xsltc.runtime;uses:=\"org.apache.xml.serializer,org.w3c.dom,org.apache.xalan.xsltc.runtime.output,javax.xml.parsers,javax.xml.transform,org.apache.xml.dtm,org.apache.xalan.xsltc,org.apache.xalan.xsltc.dom,org.xml.sax,org.apache.xml.utils,javax.xml.transform.dom,org.apache.xml.dtm.ref\";version=2.7.2, \
-    org.apache.xalan.extensions;uses:=\"org.w3c.dom,org.apache.xpath,org.apache.xpath.objects,org.apache.xml.utils,javax.xml.transform,org.w3c.dom.traversal,org.apache.xpath.functions,org.apache.xalan.templates,org.apache.xalan.transformer,org.apache.xalan.res,org.apache.xml.dtm,org.apache.xml.dtm.ref,org.apache.xalan.trace,javax.xml.namespace,javax.xml.xpath,org.apache.xml.serializer,org.xml.sax,org.apache.xalan.serialize,org.apache.xpath.axes\";version=2.7.2, \
-    org.apache.xalan.processor;uses:=\"org.xml.sax.helpers,org.w3c.dom,org.apache.xalan.templates,org.xml.sax,org.apache.xml.utils,javax.xml.transform,javax.xml.transform.sax,org.apache.xalan.res,javax.xml.parsers,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.xpath,org.apache.xpath.compiler,org.apache.xalan.extensions,org.apache.xalan.transformer\";version=2.7.2, \
-    org.apache.xalan.xsltc.runtime.output;uses:=\"org.xml.sax.ext,org.apache.xml.serializer,org.w3c.dom,org.xml.sax,javax.xml.parsers,org.apache.xalan.xsltc.trax\";version=2.7.2, \
-    org.apache.xalan.templates;uses:=\"org.apache.xpath,org.xml.sax,org.apache.xalan.res,org.apache.xml.utils,org.apache.xalan.processor,javax.xml.transform,org.apache.xpath.compiler,org.apache.xpath.objects,org.apache.xpath.operations,org.apache.xpath.functions,org.apache.xpath.axes,org.apache.xalan.transformer,org.apache.xalan.trace,org.apache.xml.dtm,org.apache.xml.serializer,org.apache.xalan.serialize,org.apache.xml.dtm.ref,org.w3c.dom,org.apache.xalan.extensions,org.apache.xml.utils.res,org.xml.sax.helpers,org.apache.xpath.patterns\";version=2.7.2, \
-    org.apache.xalan.xsltc.compiler;uses:=\"org.apache.bcel.generic,org.apache.xalan.xsltc.compiler.util,org.apache.xml.utils,java_cup.runtime,org.apache.xml.serializer,org.apache.xalan.xsltc.runtime,org.xml.sax,org.apache.bcel.util,org.apache.bcel.classfile,javax.xml.parsers,org.apache.xml.dtm\";version=2.7.2, \
-    org.apache.xalan.res;uses:=org.apache.xpath.res;version=2.7.2, \
-    org.apache.xalan.trace;uses:=\"org.w3c.dom,org.apache.xpath,org.apache.xpath.objects,org.apache.xalan.templates,org.apache.xalan.transformer,org.xml.sax,org.apache.xml.utils,javax.xml.transform,org.apache.xml.dtm,org.apache.xml.dtm.ref\";version=2.7.2, \
-    org.apache.xalan.client;uses:=\"javax.xml.transform.stream,org.apache.xalan.res,javax.xml.transform\";version=2.7.2, \
-    org.apache.xalan.lib.sql;uses:=\"org.apache.xalan.res,org.w3c.dom,org.xml.sax,org.apache.xml.dtm,org.xml.sax.ext,org.apache.xml.utils,org.apache.xml.dtm.ref,javax.xml.transform,javax.naming,org.apache.xpath,org.apache.xalan.extensions,org.apache.xpath.objects\";version=2.7.2, \
-    org.apache.xalan.xsltc;uses:=\"org.apache.xml.dtm,org.apache.xml.serializer,org.w3c.dom,org.apache.xalan.xsltc.runtime,org.xml.sax\";version=2.7.2, \
-    org.apache.xalan.xsltc.cmdline;uses:=\"org.apache.xalan.xsltc.cmdline.getopt,org.apache.xalan.xsltc.compiler,org.apache.xalan.xsltc.compiler.util,org.apache.xml.serializer,javax.xml.transform.sax,org.apache.xalan.xsltc.runtime.output,javax.xml.parsers,javax.xml.transform,org.apache.xml.dtm,org.apache.xalan.xsltc,org.xml.sax,org.apache.xalan.xsltc.runtime,org.apache.xalan.xsltc.dom\";version=2.7.2, \
-    org.apache.xalan.serialize;uses:=\"org.apache.xml.serializer,org.xml.sax,org.w3c.dom,org.apache.xml.dtm,org.apache.xpath.objects,org.apache.xpath,org.apache.xml.utils,org.apache.xalan.transformer,javax.xml.transform\";version=2.7.2, \
-    org.apache.xalan.xsltc.dom;uses:=\"org.apache.xml.dtm,org.apache.xalan.xsltc.runtime,org.apache.xml.dtm.ref,org.xml.sax.ext,org.apache.xml.serializer,org.w3c.dom,org.apache.xalan.xsltc,org.xml.sax,org.apache.xml.utils,javax.xml.transform,org.apache.xalan.xsltc.util,javax.xml.transform.sax,javax.xml.parsers,javax.xml.transform.stream,org.apache.xalan.xsltc.trax,org.apache.xml.dtm.ref.sax2dtm,javax.xml.transform.dom,org.apache.xml.res\";version=2.7.2, \
-    org.apache.xalan.xsltc.util;version=2.7.2, \
-    org.apache.xml.dtm.ref.dom2dtm;uses:=\"org.w3c.dom,org.xml.sax,org.apache.xml.dtm,org.xml.sax.ext,org.apache.xml.res,org.apache.xml.utils,org.apache.xml.dtm.ref,javax.xml.transform.dom,javax.xml.transform\";version=2.7.2, \
-    org.apache.xml.dtm;uses:=\"org.xml.sax.ext,org.w3c.dom,org.xml.sax,org.apache.xml.utils,javax.xml.transform,org.apache.xml.res\";version=2.7.2, \
-    org.apache.xml.dtm.ref;uses:=\"org.apache.xml.res,org.xml.sax.ext,org.xml.sax,org.apache.xml.dtm,org.w3c.dom,org.apache.xml.utils,javax.xml.transform,org.xml.sax.helpers,javax.xml.transform.sax,org.apache.xml.dtm.ref.sax2dtm,org.apache.xml.dtm.ref.dom2dtm,javax.xml.parsers,javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom.traversal,org.apache.xpath,org.apache.xerces.parsers,org.apache.xml.serialize\";version=2.7.2, \
-    org.apache.xml.dtm.ref.sax2dtm;uses:=\"org.apache.xml.dtm,org.xml.sax.ext,org.apache.xml.res,org.xml.sax,org.apache.xml.utils,org.apache.xml.dtm.ref,javax.xml.transform,org.apache.xml.serializer\";version=2.7.2, \
-    org.apache.xml.res;version=2.7.2, \
-    org.apache.xml.serializer;uses:=\"org.xml.sax.helpers,org.xml.sax,org.apache.xml.serializer.utils,javax.xml.transform,org.w3c.dom,org.w3c.dom.ls,org.xml.sax.ext,org.apache.xml.serializer.dom3\";version=2.7.2, \
-    org.apache.xml.serializer.dom3;uses:=\"org.apache.xml.serializer,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.apache.xml.serializer.utils,org.xml.sax.ext,org.xml.sax.helpers\";version=2.7.2, \
-    org.apache.xml.utils.res;version=2.7.2, \
-    org.apache.xml.utils;uses:=\"org.w3c.dom,org.xml.sax,javax.xml.parsers,javax.xml.transform,org.xml.sax.ext,org.apache.xml.res,org.apache.xml.dtm.ref,org.xml.sax.helpers,javax.xml.transform.sax,org.apache.xml.dtm.ref.dom2dtm\";version=2.7.2, \
-    org.apache.xpath;uses:=\"org.apache.xpath.objects,org.apache.xml.utils,org.w3c.dom,javax.xml.transform,org.w3c.dom.traversal,org.apache.xml.dtm,org.xml.sax,org.apache.xalan.res,org.apache.xpath.functions,org.apache.xpath.axes,org.xml.sax.helpers,javax.xml.transform.sax,javax.xml.transform.stream,javax.xml.parsers,org.apache.xalan.templates,org.apache.xpath.compiler,org.apache.xalan.extensions,org.apache.xml.dtm.ref,org.apache.xml.dtm.ref.sax2dtm,org.apache.xpath.operations,org.apache.xpath.patterns\";version=2.7.2, \
-    org.apache.xpath.compiler;uses:=\"org.apache.xpath.operations,org.apache.xpath,org.apache.xpath.functions,org.apache.xalan.res,org.apache.xml.utils,javax.xml.transform,org.apache.xml.dtm,org.apache.xpath.objects,org.apache.xpath.axes,org.apache.xpath.patterns,org.apache.xalan.templates,org.apache.xpath.domapi\";version=2.7.2, \
-    org.apache.xpath.res;uses:=org.apache.xml.res;version=2.7.2, \
-    org.apache.xpath.objects;uses:=\"org.apache.xml.utils,org.apache.xml.dtm,org.apache.xpath,javax.xml.transform,org.w3c.dom,org.xml.sax,org.apache.xpath.axes,org.apache.xml.dtm.ref,org.w3c.dom.traversal,org.apache.xalan.res,org.xml.sax.ext\";version=2.7.2, \
-    org.apache.xpath.patterns;uses:=\"org.apache.xml.dtm,org.apache.xpath,org.apache.xpath.objects,org.apache.xpath.axes,javax.xml.transform\";version=2.7.2, \
-    org.apache.xpath.operations;uses:=\"org.apache.xpath,org.apache.xpath.objects,javax.xml.transform,org.apache.xml.utils,org.apache.xml.dtm,org.w3c.dom,org.apache.xalan.templates,org.apache.xalan.res,org.apache.xpath.axes\";version=2.7.2, \
-    org.apache.xpath.domapi;uses:=\"org.w3c.dom,org.apache.xpath.res,org.apache.xml.utils,org.w3c.dom.xpath,org.apache.xpath,javax.xml.transform,org.apache.xpath.objects,org.w3c.dom.events,org.w3c.dom.traversal\";version=2.7.2, \
-    org.apache.xpath.functions;uses:=\"org.apache.xpath,org.apache.xpath.objects,javax.xml.transform,org.apache.xalan.res,org.apache.xml.dtm,org.apache.xpath.axes,org.apache.xpath.patterns,org.apache.xalan.templates,org.apache.xml.utils,org.apache.xalan.transformer,org.apache.xpath.res,org.apache.xpath.compiler,org.xml.sax\";version=2.7.2, \
-    org.apache.xpath.jaxp;uses:=\"org.w3c.dom,javax.xml.namespace,org.apache.xpath.objects,org.apache.xpath,org.apache.xpath.functions,org.apache.xalan.res,org.apache.xml.utils,javax.xml.transform,javax.xml.xpath,javax.xml.parsers,org.w3c.dom.traversal,org.xml.sax\";version=2.7.2, \
-    org.apache.xpath.axes;uses:=\"org.apache.xml.dtm,org.apache.xpath.compiler,javax.xml.transform,org.apache.xpath,org.apache.xalan.res,org.apache.xpath.patterns,org.apache.xml.utils,org.w3c.dom,org.w3c.dom.traversal,org.apache.xpath.objects,org.apache.xpath.operations,org.apache.xpath.functions,org.xml.sax\";version=2.7.2, \
-    org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.1.1, \
-    org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=4.1.1, \
-    org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.1.1, \
-    org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=4.1.1
-
-org.osgi.framework.system.capabilities= \
- ${eecap-${java.specification.version}}, \
- ${${karaf.framework}-capabilities}, \
- ${karaf-capabilities}
-
-karaf-capabilities= \
- osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo
-
-felix-capabilities= \
- osgi.service;objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin, \
- osgi.service;objectClass:List<String>=org.osgi.service.resolver.Resolver, \
- osgi.service;objectClass:List<String>=org.osgi.service.startlevel.StartLevel
-
-equinox-capabilities= \
- osgi.service;objectClass:List<String>=java.lang.ClassLoader;equinox.classloader.type=contextClassLoader, \
- osgi.service;objectClass:List<String>=javax.xml.parsers.DocumentBuilderFactory, \
- osgi.service;objectClass:List<String>=javax.xml.parsers.SAXParserFactory, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog;performance=true, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=eclipse.home.location, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.configuration.area, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.install.area, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.instance.area, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.user.area, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.debug.DebugOptions, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.environment.EnvironmentInfo, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.localization.BundleLocalization, \
- osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService,org.eclipse.equinox.log.ExtendedLogReaderService", \
- osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.eclipse.equinox.log.ExtendedLogService", \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi, \
- osgi.service;objectClass:List<String>=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List<String>="bundleentry,bundleresource"
-
-eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0", \
- osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
- osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8,9.0", \
- osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0", \
- osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0"
-eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8", \
- osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
- osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8", \
- osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8", \
- osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8"
-
-#
-# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-#
-org.osgi.framework.bootdelegation = \
-    com.sun.*, \
-    javax.transaction, \
-    javax.transaction.*, \
-    javax.xml.crypto, \
-    javax.xml.crypto.*, \
-    sun.*, \
-    org.apache.html.dom, \
-    org.apache.wml.dom, \
-    org.apache.wml, \
-    org.apache.xerces.xpointer, \
-    org.apache.xerces.xni.grammars, \
-    org.apache.xerces.impl.xs.util, \
-    org.apache.xerces.jaxp.validation, \
-    org.apache.xerces.impl.dtd.models, \
-    org.apache.xerces.impl.xpath, \
-    org.apache.xerces.dom3.as, \
-    org.apache.xerces.impl.dv.xs, \
-    org.apache.xerces.util, \
-    org.apache.xerces.impl.xs.opti, \
-    org.apache.xerces.impl.xs.identity, \
-    org.apache.xerces.jaxp, \
-    org.apache.xerces.impl.dv, \
-    org.apache.xerces.xs.datatypes, \
-    org.apache.xerces.impl.msg, \
-    org.apache.xerces.dom.events, \
-    org.apache.xerces.xni, \
-    org.apache.xerces.impl.xs, \
-    org.apache.xerces.impl, \
-    org.apache.xerces.stax.events, \
-    org.apache.xerces.impl.io, \
-    org.apache.xerces.xinclude, \
-    org.apache.xerces.jaxp.datatype, \
-    org.apache.xerces.parsers, \
-    org.apache.xerces.impl.dv.util, \
-    org.apache.xerces.xni.parser, \
-    org.apache.xerces.impl.xs.traversers, \
-    org.apache.xerces.impl.dv.dtd, \
-    org.apache.xerces.xs, \
-    org.apache.xerces.impl.validation, \
-    org.apache.xerces.impl.dtd, \
-    org.apache.xerces.impl.xs.models, \
-    org.apache.xerces.impl.xpath.regex, \
-    org.apache.xerces.stax, \
-    org.apache.xerces.dom, \
-    org.apache.xml.serialize, \
-    org.apache.karaf.jaas.boot.principal, \
-    org.apache.karaf.jaas.boot
-
-# jVisualVM support
-# in order to use Karaf with jvisualvm, the org.osgi.framework.bootdelegation property has to contain the org.netbeans.lib.profiler.server package
-# and, so, it should look like:
-#
-# org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,org.netbeans.lib.profiler.server
-#
-# YourKit support
-# in order to use Karaf with YourKit, the org.osgi.framework.bootdelegation property has to contain the com.yourkit.* packages
-# and, so, it should look like:
-#
-# org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,com.yourkit.*
-#
-
-#
-# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar)
-#
-org.osgi.framework.bundle.parent=framework
-
-#
-# Definition of the default bundle start level
-#
-org.osgi.framework.startlevel.beginning=100
-karaf.startlevel.bundle=80
-
-#
-# The location of the Karaf shutdown port file used to stop instance
-#
-karaf.shutdown.port.file=${karaf.data}/port
-
-#
-# The location of the Karaf pid file
-#
-karaf.pid.file=${karaf.base}/karaf.pid
-
-#
-# Configuration FileMonitor properties
-#
-felix.fileinstall.enableConfigSave = true
-felix.fileinstall.dir    = ${karaf.etc}
-felix.fileinstall.filter = .*\\.(cfg|config)
-felix.fileinstall.poll   = 1000
-felix.fileinstall.noInitialDelay = true
-felix.fileinstall.log.level = 3
-felix.fileinstall.log.default = jul
-
-# Use cached urls for bundle CodeSource to avoid
-# problems with JCE cached informations, see KARAF-3974
-felix.bundlecodesource.usecachedurls = true
-
-#
-# Delay for writing the framework state to disk in equinox
-# must be  >= 1000 and <= 1800000
-#
-eclipse.stateSaveDelayInterval = 1000
-
-#
-# OBR Repository list
-# This property will be modified by the obr:addUrl and obr:removeUrl commands. 
-#
-obr.repository.url = 
-
-#
-# Start blueprint bundles synchronously when possible
-#
-org.apache.aries.blueprint.synchronous=true
-
-#
-# Do not weave all any classes by default
-#
-org.apache.aries.proxy.weaving.enabled=
-
-#
-# mvn url handler requires config instance configuration
-#
-org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
-
-#
-# Don't delay the console startup. Set to true if you want the console to start after all other bundles
-#
-karaf.delay.console=false
-
-#
-# Enable native Karaf support for systemd's watchdog.
-#
-#karaf.systemd.enabled=false

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/custom.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/custom.properties
deleted file mode 100644
index fbdb62a..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/custom.properties
+++ /dev/null
@@ -1,30 +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.
-#
-################################################################################
-
-#
-# All the values specified here will override the default values given
-# in config.properties.
-#
-
-karaf.systemBundlesStartLevel=50
-
-#
-# You can place any customized configuration here.
-#
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/distribution.info
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/distribution.info b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/distribution.info
deleted file mode 100644
index 17c0af7..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/distribution.info
+++ /dev/null
@@ -1,26 +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.
-#
-################################################################################
-
-#
-# This file contains the general platform information required by the itests to find out
-# about the current versions.
-#
-karafVersion=4.1.1-SNAPSHOT
-name=Apache Karaf
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/equinox-debug.properties
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/equinox-debug.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/equinox-debug.properties
deleted file mode 100644
index 01be178..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/equinox-debug.properties
+++ /dev/null
@@ -1,111 +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.
-
-
-#### Debugging options for org.eclipse.bundles
-
-# Turn on general debugging for org.eclipse.bundles
-org.eclipse.osgi/debug = false
-# Prints out class loading debug information
-org.eclipse.osgi/debug/loader = false
-# Prints out event (FrameworkEvent/BundleEvent/ServiceEvent) and listener debug information
-org.eclipse.osgi/debug/events = false
-# Prints out OSGi service debug information (registration/getting/ungetting etc.)
-org.eclipse.osgi/debug/services = false
-# Prints out bundle manifest parsing debug information
-org.eclipse.osgi/debug/manifest = false
-# Prints out LDAP filter debug information
-org.eclipse.osgi/debug/filter = false
-# Prints out security (PermissionAdmin service) debug information
-org.eclipse.osgi/debug/security = false
-# Prints out start level service debug information
-org.eclipse.osgi/debug/startlevel = false
-# Prints out package instance service debug information
-org.eclipse.osgi/debug/packageadmin = false
-# Prints out timing information for bundle activation
-org.eclipse.osgi/debug/bundleTime = false
-# Debug the loading of message bundles
-org.eclipse.osgi/debug/messageBundles = false
-
-# Eclipse adaptor options
-org.eclipse.osgi/eclipseadaptor/debug = false
-org.eclipse.osgi/eclipseadaptor/debug/location = false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin = false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver = false
-org.eclipse.osgi/eclipseadaptor/converter/debug = false
-
-### OSGi resolver options
-# Turns on debugging for the resolver
-org.eclipse.osgi/resolver/debug = false
-# Prints out wiring information after the resolver has completed the resolve process
-org.eclipse.osgi/resolver/wiring = false
-# Prints out Import-Package information
-org.eclipse.osgi/resolver/imports = false
-# Prints out Require-Bundle information
-org.eclipse.osgi/resolver/requires = false
-# Prints out package grouping information form the "uses" clause
-org.eclipse.osgi/resolver/grouping = false
-# Prints out cycle information
-org.eclipse.osgi/resolver/cycles = false
-# Prints out Eclipse-GenericRequire information
-org.eclipse.osgi/resolver/generics = false
-
-#### Profile settings
-org.eclipse.osgi/profile/startup = false
-org.eclipse.osgi/profile/benchmark = false
-org.eclipse.osgi/profile/debug = false
-
-# Override the default implemenation 
-org.eclipse.osgi/profile/impl = org.eclipse.osgi.internal.profile.DefaultProfileLogger
-
-# Append all profile messages to the filename specified
-org.eclipse.osgi/defaultprofile/logfilename =  
-
-# Output all profile log messages synchronously to the jvm console.
-# By default, all log messages are cached until the log buffer is
-# requested.
-org.eclipse.osgi/defaultprofile/logsynchronously = false
-
-# Specify the size of the default profile implementation log buffer.
-org.eclipse.osgi/defaultprofile/buffersize = 256
-
-#### Monitoring settings
-# monitor class loading
-org.eclipse.osgi/monitor/classes = false
-
-# monitor bundle activation
-org.eclipse.osgi/monitor/activation = false
-
-# monitor resource bundle (*.properties) loading
-org.eclipse.osgi/monitor/resources = false
-
-
-#### Trace settings
-# trace class loading - snapshot the execution stack when a class is loaded
-org.eclipse.osgi/trace/classLoading = false
-
-# trace location - file in which execution traces are written
-org.eclipse.osgi/trace/filename = runtime.traces
-
-# trace filters - Java properties file defining which classes should 
-# be traced (if trace/classLoading is true)
-# File format:
-# plugins=<comma separated list of plugins whose classes to trace>
-# packages=<comma separated list of package prefixes of classes to trace>
-# Note that there may be many 'plugins' and 'packages' lines in one file.
-org.eclipse.osgi/trace/filters = trace.properties
-
-# trace bundle activation - snapshot the execution stack when a bundle is activated
-org.eclipse.osgi/trace/activation = false

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/java.util.logging.properties
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/java.util.logging.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/java.util.logging.properties
deleted file mode 100644
index b7b50c5..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/java.util.logging.properties
+++ /dev/null
@@ -1,23 +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.
-#
-################################################################################
-
-# Empty java.util.logging.properties to prevent the log to stderr, so that
-# all logs will be delegated to pax logging JUL handler only
-
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.cfg
deleted file mode 100644
index b7ef60e..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#
-# Generic JMX ACL
-#
-# This file defines the roles required for MBean operations for MBeans that
-# do not have this defined explicitly.
-#
-# The definition of ACLs for JMX operations works as follows:
-#
-# The required roles for JMX operations are defined in configuration files
-# read via OSGi ConfigAdmin.
-#
-# JMX RBAC-related configuration is prefixed with jmx.acl and based on the
-# JMX ObjectName that it applies to. For example specific configuration for
-# an MBean with the following objectName: foo.bar:type=Test can be placed in
-# a configuration file called jmx.acl.foo.bar.Test.cfg. More generic
-# configuration can be placed in the domain (e.g. jmx.acl.foo.bar.cfg) or
-# at the top level (jmx.acl.cfg). A simple configuration file looks like
-# this:
-#   test : admin
-#   getVal : manager, viewer
-#
-# The system looks for required roles using the following process:
-# The most specific configuration file/pid is tried first. E.g. in the
-# above example the jmx.acl.foo.bar.Test.cfg is looked at first. In this
-# configuration, the system looks for a:
-#   1. Specific match for the current invocation, e.g. test(int)["17"] : role1
-#   2. Reg exp match for the current invocation, e.g. test(int)[/[0-9]/] : role2
-#   In both cases the passed argument is converted to a String for the
-# comparison.
-#   If any of the above match all the roles with matching definitions
-# are collected and allowed. If no matches are found the following is tried:
-#   3. Signature match for the invocation, e.g. test(int) : role3. If
-# matched the associated roles are used.
-#   4. Method name match for the invocation, e.g. test : role4. If matched
-# the associated roles are used.
-#   5. A method name wildcard match, e.g. te* : role5. For all the
-# wildcard matches found in the current configuration file, the roles
-# associated with the longest match are used. So if you have te* and * and
-# the method invoked is 'test', then the roles defined with te* are used,
-# not the ones defined with *.
-# If no matching definition is found in the current configuration file, a
-# more general configuration file is looked for. So jmx.acl.foo.bar.cfg is
-# tried next, this matches the domain of the MBean. If there is no match
-# found in the domain the most generic configuration file is consulted
-# (jmx.acl.cfg).
-# If a matching definition is found, this is used and the process will not
-# look for any other matching definitions. So the most specific definition
-# always takes precedence.
-#
-list* = viewer
-get* = viewer
-is* = viewer
-set* = admin
-* = admin
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.java.lang.Memory.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.java.lang.Memory.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.java.lang.Memory.cfg
deleted file mode 100644
index 85c6b4d..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.java.lang.Memory.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#
-# JMX ACL specific to the java.lang.Memory MBean
-#
-# For a description of the format of this file, see jmx.acl.cfg
-#
-gc = manager
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.bundle.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.bundle.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.bundle.cfg
deleted file mode 100644
index ef239ef..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.bundle.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-                #
-                # JMX ACL specific to the org.apache.karaf:type=bundle,name=* MBean which maps to the Karaf MBean
-                # to control OSGi bundles.
-                #
-                install = manager
-                refresh = manager
-                resolve = manager
-                restart = manager
-                setStartLevel(java.lang.String, int)[/([1-4])?[0-9]/,/.*/] = admin
-                setStartLevel = manager
-                start(java.lang.String)[/([1-4])?[0-9]/] = admin
-                start = manager
-                stop(java.lang.String)[/([1-4])?[0-9]/] = admin
-                stop = manager
-                uninstall(java.lang.String)["0"] = #this is a comment, no roles can perform this operation
-                uninstall = admin
-                update(java.lang.String)[/([1-4])?[0-9]/] = admin
-                update(java.lang.String,java.lang.String)[/([1-4])?[0-9]/,/.*/] = admin
-                update = manager
-            
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.config.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.config.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.config.cfg
deleted file mode 100644
index 082c942..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.config.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-
-                #
-                # JMX ACL specific to the org.apache.karaf:type=config,name=* MBean which maps to the Karaf MBean to interact with the
-                # OSGi Config Admin service.
-                #
-                # For a description of the format of this file, see jmx.acl.cfg
-                #
-                # By default, only an admin can make changes to the JMX ACL and shell command rules, but managers can make
-                # changes to other PIDs.
-                #
-                appendProperty(java.lang.String,java.lang.String,java.lang.String)[/jmx[.]acl.*/,/.*/,/.*/] = admin
-                appendProperty(java.lang.String,java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl.+/,/.*/,/.*/] = admin
-                appendProperty(java.lang.String,java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl.+/,/.*/,/.*/] = admin
-                appendProperty(java.lang.String,java.lang.String,java.lang.String) = manager
-                create(java.lang.String)[/jmx[.]acl.*/] = admin
-                create(java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl.+/] = admin
-                create(java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl.+/] = admin
-                create(java.lang.String) = manager
-                delete(java.lang.String)[/jmx[.]acl.*/] = admin
-                delete(java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl.+/] = admin
-                delete(java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl.+/] = admin
-                delete(java.lang.String) = manager
-                deleteProperty(java.lang.String,java.lang.String)[/jmx[.]acl.*/,/.*/] = admin
-                deleteProperty(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl.+/,/.*/] = admin
-                deleteProperty(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl.+/,/.*/] = admin
-                deleteProperty(java.lang.String,java.lang.String) = manager
-                setProperty(java.lang.String,java.lang.String,java.lang.String)[/jmx[.]acl.*/,/.*/,/.*/] = admin
-                setProperty(java.lang.String,java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl.+/,/.*/,/.*/] = admin
-                setProperty(java.lang.String,java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl.+/,/.*/,/.*/] = admin
-                setProperty(java.lang.String,java.lang.String,java.lang.String) = manager
-                update(java.lang.String,java.util.Map)[/jmx[.]acl.*/,/.*/] = admin
-                update(java.lang.String,java.util.Map)[/org[.]apache[.]karaf[.]command[.]acl.+/,/.*/] = admin
-                update(java.lang.String,java.util.Map)[/org[.]apache[.]karaf[.]service[.]acl.+/,/.*/] = admin
-                update(java.lang.String,java.util.Map) = manager
-            
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.security.jmx.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.security.jmx.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.security.jmx.cfg
deleted file mode 100644
index 98a6d83..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.security.jmx.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#
-# JMX ACL specific to the org.apache.karaf:type=security,area=jmx MBean which
-# can be used to find out whether the currently logged in JMX user can invoke
-# the requested JMX operations.
-#
-# For a description of the format of this file, see jmx.acl.cfg
-#
-canInvoke = viewer
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/525c99ad/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.osgi.compendium.cm.cfg
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.osgi.compendium.cm.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.osgi.compendium.cm.cfg
deleted file mode 100644
index 2bb4321..0000000
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.osgi.compendium.cm.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#
-# JMX ACL specific to osgi.compendium.cm MBean
-#
-# For a description of the format of this file, see jmx.acl.cfg
-#
-# This configuration file configures the management of ConfigAdmin via the standard ConfigAdmin MBean
-# Such that only an admin can make changes to the JMX ACL rules, but managers can make
-# changes to other PIDs.
-#
-createFactoryConfiguration(java.lang.String)[/jmx[.]acl.*/] = admin
-createFactoryConfiguration(java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-createFactoryConfiguration(java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-createFactoryConfiguration(java.lang.String) = manager
-createFactoryConfigurationForLocation(java.lang.String,java.lang.String)[/jmx[.]acl.*/,/.*/] = admin
-createFactoryConfigurationForLocation(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl[.].+/,/.*/] = admin
-createFactoryConfigurationForLocation(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl[.].+/,/.*/] = admin
-createFactoryConfigurationForLocation(java.lang.String,java.lang.String) = manager
-delete(java.lang.String)[/jmx[.]acl.*/] = admin
-delete(java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-delete(java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-delete(java.lang.String) = manager
-deleteConfigurations = admin
-deleteForLocation(java.lang.String,java.lang.String)[/jmx[.]acl.*/,/.*/] = admin
-deleteForLocation(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]command[.]acl[.].+/,/.*/] = admin
-deleteForLocation(java.lang.String,java.lang.String)[/org[.]apache[.]karaf[.]service[.]acl[.].+/,/.*/] = admin
-deleteForLocation(java.lang.String,java.lang.String) = manager
-update(java.lang.String,javax.management.openmbean.TabularData)[/jmx[.]acl.*/,/.*/] = admin
-update(java.lang.String,javax.management.openmbean.TabularData)[/org[.]apache[.]karaf[.]command[.]acl[.].+/,/.*/] = admin
-update(java.lang.String,javax.management.openmbean.TabularData)[/org[.]apache[.]karaf[.]service[.]acl[.].+/,/.*/] = admin
-update(java.lang.String,javax.management.openmbean.TabularData) = manager
-updateForLocation(java.lang.String,java.lang.String,javax.management.openmbean.TabularData)[/jmx[.]acl.*/,/.*/,/.*/] = admin
-updateForLocation(java.lang.String,java.lang.String,javax.management.openmbean.TabularData)[/org[.]apache[.]karaf[.]command[.]acl[.].+/,/.*/,/.*/] = admin
-updateForLocation(java.lang.String,java.lang.String,javax.management.openmbean.TabularData)[/org[.]apache[.]karaf[.]service[.]acl[.].+/,/.*/,/.*/] = admin
-updateForLocation(java.lang.String,java.lang.String,javax.management.openmbean.TabularData) = manager
-


Mime
View raw message