Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 97d560209 -> b48f1af48


http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jre.properties
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jre.properties
deleted file mode 100644
index 40c9895..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/jre.properties
+++ /dev/null
@@ -1,547 +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.
-#
-################################################################################
-
-#
-# Java platform package export properties.
-#
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute
-jre-1.6= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.0", \
- javax.annotation.processing;version="1.0", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- javax.xml.ws.http;version="2.2", \
- javax.xml.ws.soap;version="2.2", \
- javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.wsaddressing;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
- javax.xml.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute
-jre-1.7= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.0", \
- javax.annotation.processing;version="1.0", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- javax.xml.ws.http;version="2.2", \
- javax.xml.ws.soap;version="2.2", \
- javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.wsaddressing;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
- javax.xml.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers, \
- com.sun.nio.sctp
-
-jre-1.8= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.0", \
- javax.annotation.processing;version="1.0", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- javax.xml.ws.http;version="2.2", \
- javax.xml.ws.soap;version="2.2", \
- javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.wsaddressing;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
- javax.xml.xpath, \
- javafx.animation, \
- javafx.application, \
- javafx.beans, \
- javafx.beans.binding, \
- javafx.beans.property, \
- javafx.beans.property.adapter, \
- javafx.beans.value, \
- javafx.collections, \
- javafx.collections.transformation, \
- javafx.concurrent, \
- javafx.css, \
- javafx.embed.swing, \
- javafx.embed.swt, \
- javafx.event, \
- javafx.fxml, \
- javafx.geometry, \
- javafx.print, \
- javafx.scene, \
- javafx.scene.canvas, \
- javafx.scene.chart, \
- javafx.scene.control, \
- javafx.scene.control.cell, \
- javafx.scene.effect, \
- javafx.scene.image, \
- javafx.scene.input, \
- javafx.scene.layout, \
- javafx.scene.media, \
- javafx.scene.paint, \
- javafx.scene.shape, \
- javafx.scene.text, \
- javafx.scene.transform, \
- javafx.scene.web, \
- javafx.stage, \
- javafx.util, \
- javafx.util.converter, \
- netscape.javascript, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers, \
- com.sun.nio.sctp

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/keys.properties
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/keys.properties
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/keys.properties
deleted file mode 100644
index 5c19ea5..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/keys.properties
+++ /dev/null
@@ -1,36 +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 valid users who can log into Karaf. Each line have to 
be of
-# the format:
-#
-# USER=KEY,ROLE1,ROLE2,...
-#
-# All users and roles entered in this file are available after Karaf startup
-# and modifiable via the JAAS command group. These users reside in a JAAS 
domain
-# with the name "karaf"..
-#
-
-#
-# For security reason, the default auto-signed key is disabled.
-# The user guide describes how to generate/update the key.
-#
-#karaf=AAAAB3NzaC1kc3MAAACBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAAAAFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QAAAIEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoAAACBAKKSU2PFl/qOLxIwmBZPPIcJshVe7bVUpFvyl3BbJDow8rXfskl8wO63OzP/qLmcJM0+JbcRU/53JjTuyk31drV2qxhIOsLDC9dGCWj47Y7TyhPdXh/0dthTRBy6bqGtRPxGa7gJov1xm/UuYYXPIUR/3x9MAZvZ5xvE0kYXO+rx,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer,systembundles

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
deleted file mode 100644
index 4db1f4b..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
+++ /dev/null
@@ -1,4 +0,0 @@
-
-            org.apache.felix.eventadmin.AddTimestamp=true
-            org.apache.felix.eventadmin.AddSubject=true
-        
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin.cfg
deleted file mode 100644
index 8ab08dc..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin.cfg
+++ /dev/null
@@ -1,20 +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.
-#
-################################################################################
-org.apache.felix.eventadmin.AddTimestamp=true
-org.apache.felix.eventadmin.AddSubject=true

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.fileinstall-deploy.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.fileinstall-deploy.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.fileinstall-deploy.cfg
deleted file mode 100644
index 7f9f0ca..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.fileinstall-deploy.cfg
+++ /dev/null
@@ -1,25 +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.
-#
-################################################################################
-
-felix.fileinstall.dir           = ${karaf.base}/deploy
-felix.fileinstall.tmpdir        = ${karaf.data}/generated-bundles
-felix.fileinstall.poll          = 1000
-felix.fileinstall.start.level   = 80
-felix.fileinstall.active.level  = 80
-felix.fileinstall.log.level     = 3

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.bundle.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.bundle.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.bundle.cfg
deleted file mode 100644
index d50320e..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.bundle.cfg
+++ /dev/null
@@ -1,44 +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 configuration file defines the ACLs for commands in the bundle subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-# This configuration relies on the fact that 'system' bundles need to be 
managed
-# with the 
-#   -f (--force) 
-# flag. Operations with -f need admin permission. Most of these operations 
without
-# the 'force' option can be done by a manager.
-install = admin
-refresh[/.*[-][f].*/] = admin
-refresh = manager
-restart[/.*[-][f].*/] = admin
-restart = manager
-start[/.*[-][f].*/] = admin
-start = manager
-stop[/.*[-][f].*/] = admin
-stop = manager
-uninstall[/.*[-][f].*/] = admin
-uninstall = manager
-update[/.*[-][f].*/] = admin
-update = manager
-watch = admin

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.config.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.config.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.config.cfg
deleted file mode 100644
index e9a5be2..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.config.cfg
+++ /dev/null
@@ -1,45 +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 configuration file defines the ACLs for various commands in the config 
subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-
-cancel = manager
-delete = admin
-edit = manager
-edit[/.*jmx[.]acl.*/] = admin
-edit[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-edit[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-property-append = manager
-property-append[/.*jmx[.]acl.*/] = admin
-property-append[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-property-append[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-property-delete = manager
-property-delete[/.*jmx[.]acl.*/] = admin
-property-delete[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-property-delete[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-property-set = manager
-property-set[/.*jmx[.]acl.*/] = admin
-property-set[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
-property-set[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
-update = manager
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
deleted file mode 100644
index fd41ab9..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.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.
-#
-################################################################################
-
-#
-# This configuration file defines the ACLs for commands in the kar subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-install = admin
-uninstall = admin

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.jaas.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.jaas.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.jaas.cfg
deleted file mode 100644
index 0c0644b..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.jaas.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.
-#
-################################################################################
-
-#
-# This configuration file defines the ACLs for commands in the jaas subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-# Jaas commands commands have no effect until update is called.
-update = admin

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.kar.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.kar.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.kar.cfg
deleted file mode 100644
index fd41ab9..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.kar.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.
-#
-################################################################################
-
-#
-# This configuration file defines the ACLs for commands in the kar subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-install = admin
-uninstall = admin

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
deleted file mode 100644
index 5e909e5..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
+++ /dev/null
@@ -1,31 +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 configuration file defines the ACLs for scope bundles
-# 
-features=org.apache.karaf.features.command
-jaas=org.apache.karaf.jaas.command
-admin=org.apache.karaf.admin.command
-osgi=org.apache.karaf.shell.osgi
-log=org.apache.karaf.shell.log
-packages=org.apache.karaf.shell.packages
-config=org.apache.karaf.shell.config
-ssh=org.apache.karaf.shell.ssh
-shell=org.apache.karaf.shell.commands

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.shell.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.shell.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.shell.cfg
deleted file mode 100644
index 28880b6..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.shell.cfg
+++ /dev/null
@@ -1,29 +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 configuration file defines the ACLs for commands in the shell subshell
-# 
-# For an explanation of the syntax of this file, see the file:
-#   org.apache.karaf.command.acl.system.cfg
-#
-edit = admin
-exec = admin
-new = admin
-java = admin

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.system.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.system.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.system.cfg
deleted file mode 100644
index 7927798..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.system.cfg
+++ /dev/null
@@ -1,53 +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 configuration file defines the ACLs for commands in the system subshell
-#
-# The format of this file is as follows:
-# The name of the file corresponds to a Configuration Admin PID. This file is 
for PID:
-#    org.apache.karaf.command.acl.system
-# The prefix org.apache.karaf.command.acl. determines that this file defines 
ACLs for karaf
-# commands. The last word on the PID declares the scope that it applies to, 
i.e. this file
-# is for the 'system' scope.
-# Entries in this file map to commands within the defined scope. The simplest 
role definition
-# has the form:
-#   command = role1, role2, role3
-# Specific roles can also be declared for certain arguments to the command. 
This is done using
-# regular expression matching. 
-# All the arguments to the command are represented as a list using the 
following syntax:
-#   [arg1,arg2,arg3]
-# The matching is done after converting this list into a string. So the line
-#   start-level[/.*[0-9][0-9][0-9]+.*/] = manager
-# declares that a manager role is needed to set a start level with 3 digits or 
more. The .* 
-# wildcards at the beginning and end are used to match the '[' and ']' 
characters surrounding.
-# When looking for a match the regular-expression based ACLs are always 
checked first. If any
-# of them match the associated roles are used.
-#
-# If no match can be found based on reg-exp ACLs, a match is looked for based 
purely on the 
-# command name. 
-#
-# If no command-name match can be found it is assumed that the command does 
not need a specific 
-# role and can therefore be invoked by any user.
-
-property = admin
-shutdown = admin
-start-level[/.*[0-9][0-9][0-9]+.*/] = manager # manager can set startlevels 
above 100
-start-level[/[^0-9]*/] = viewer               # viewer can obtain the current 
start level
-start-level = admin                           # admin can set any start level, 
including < 100

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index ad6c26b..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,87 +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.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories = \
-    mvn:org.apache.karaf.features/spring/4.0.9-SNAPSHOT/xml/features, \
-    mvn:org.apache.karaf.features/enterprise/4.0.9-SNAPSHOT/xml/features, \
-    mvn:org.apache.karaf.features/standard/4.0.9-SNAPSHOT/xml/features, \
-    mvn:org.apache.karaf.features/framework/4.0.9-SNAPSHOT/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot = \
-    instance, \
-    package, \
-    log, \
-    ssh, \
-    aries-blueprint, \
-    framework, \
-    system, \
-    feature, \
-    shell, \
-    management, \
-    service, \
-    jaas, \
-    shell-compat, \
-    deployer, \
-    diagnostic, \
-    wrap, \
-    bundle, \
-    config, \
-    kar
-
-#
-# Resource repositories (OBR) that the features resolver can use
-# to resolve requirements/capabilities
-#
-# The format of the resourceRepositories is 
-# resourceRepositories=[xml:url|json:url],...
-# for Instance:
-#
-#resourceRepositories=xml:http://host/path/to/index.xml
-# or
-#resourceRepositories=json:http://host/path/to/index.json
-#
-
-#
-# Defines if the boot features are started in asynchronous mode (in a 
dedicated thread)
-#
-featuresBootAsynchronous=false
-
-#
-# Service requirements enforcement
-#
-# By default, the feature resolver checks the service 
requirements/capabilities of
-# bundles for new features (xml schema >= 1.3.0) in order to automatically 
installs
-# the required bundles.
-# The following flag can have those values:
-#   - disable: service requirements are completely ignored
-#   - default: service requirements are ignored for old features
-#   - enforce: service requirements are always verified
-#
-#serviceRequirements=default
-
-#
-# Store cfg file for config element in feature
-#
-#configCfgStore=true

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.repos.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.repos.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.repos.cfg
deleted file mode 100644
index f62d2bb..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.repos.cfg
+++ /dev/null
@@ -1,53 +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 describes the features repository URL
-# It could be directly installed using feature:repo-add command
-#
-enterprise=mvn:org.apache.karaf.features/enterprise/LATEST/xml/features
-spring=mvn:org.apache.karaf.features/spring/LATEST/xml/features
-cellar=mvn:org.apache.karaf.cellar/apache-karaf-cellar/LATEST/xml/features
-cave=mvn:org.apache.karaf.cave/apache-karaf-cave/LATEST/xml/features
-camel=mvn:org.apache.camel.karaf/apache-camel/LATEST/xml/features
-camel-extras=mvn:org.apache-extras.camel-extra.karaf/camel-extra/LATEST/xml/features
-cxf=mvn:org.apache.cxf.karaf/apache-cxf/LATEST/xml/features
-cxf-dosgi=mvn:org.apache.cxf.dosgi/cxf-dosgi/LATEST/xml/features
-cxf-dosgi-samples=mvn:org.apache.cxf.dosgi/cxf-dosgi-samples/LATEST/xml/features
-cxf-xkms=mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/LATEST/xml
-activemq=mvn:org.apache.activemq/activemq-karaf/LATEST/xml/features
-jclouds=mvn:org.apache.jclouds.karaf/jclouds-karaf/LATEST/xml/features
-openejb=mvn:org.apache.openejb/openejb-feature/LATEST/xml/features
-wicket=mvn:org.ops4j.pax.wicket/features/LATEST/xml/features
-hawtio=mvn:io.hawt/hawtio-karaf/LATEST/xml/features
-pax-cdi=mvn:org.ops4j.pax.cdi/pax-cdi-features/LATEST/xml/features
-pax-jdbc=mvn:org.ops4j.pax.jdbc/pax-jdbc-features/LATEST/xml/features
-pax-jpa=mvn:org.ops4j.pax.jpa/pax-jpa-features/LATEST/xml/features
-pax-web=mvn:org.ops4j.pax.web/pax-web-features/LATEST/xml/features
-pax-wicket=mvn:org.ops4j.pax.wicket/pax-wicket-features/LATEST/xml/features
-ecf=http://download.eclipse.org/rt/ecf/latest/site.p2/karaf-features.xml
-decanter=mvn:org.apache.karaf.decanter/apache-karaf-decanter/LATEST/xml/features
-eclipsesource-jaxrs=mvn:com.eclipsesource.jaxrs/features/LATEST/xml/features
-aries-jpa=mvn:org.apache.aries.jpa/jpa-features/LATEST/xml/features
-aries-rsa=mvn:org.apache.aries.rsa/rsa-features/LATEST/xml/features
-hibernate=mvn:org.hibernate/hibernate-osgi/LATEST/xml/karaf
-ignite=mvn:org.apache.ignite/ignite-osgi-karaf/LATEST/xml/features
-artemis=mvn:org.apache.activemq/artemis-features/LATEST/xml
-openjpa=mvn:org.apache.openjpa/openjpa-features/LATEST/xml/features
-brave=mvn:io.zipkin.brave.karaf/brave-features/LATEST/xml/features

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.jaas.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.jaas.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.jaas.cfg
deleted file mode 100644
index 19f3fa0..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.jaas.cfg
+++ /dev/null
@@ -1,61 +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.
-#
-################################################################################
-
-#
-# Boolean enabling / disabling encrypted passwords
-#
-encryption.enabled = false
-
-#
-# Encryption Service name
-#   the default one is 'basic'
-#   a more powerful one named 'jasypt' is available
-#       when installing the encryption feature
-#
-encryption.name =
-
-#
-# Encryption prefix
-#
-encryption.prefix = {CRYPT}
-
-#
-# Encryption suffix
-#
-encryption.suffix = {CRYPT}
-
-#
-# Set the encryption algorithm to use in Karaf JAAS login module
-# Supported encryption algorithms follow:
-#   MD2
-#   MD5
-#   SHA-1
-#   SHA-256
-#   SHA-384
-#   SHA-512
-#
-encryption.algorithm = MD5
-
-#
-# Encoding of the encrypted password.
-# Can be:
-#   hexadecimal
-#   base64
-#
-encryption.encoding = hexadecimal

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.kar.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.kar.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.kar.cfg
deleted file mode 100644
index f66d532..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.kar.cfg
+++ /dev/null
@@ -1,29 +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.
-#
-################################################################################
-
-#
-# Enable or disable the refresh of the bundles when installing
-# the features contained in a KAR file
-#
-noAutoRefreshBundles=false
-
-#
-# Directory where the kar are stored
-#
-#karStorage=${karaf.data}/kar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.log.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.log.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.log.cfg
deleted file mode 100644
index f1648da..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.log.cfg
+++ /dev/null
@@ -1,36 +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 configuration file is used to configure the default values for the 
log:display
-# and log:exception-display commands.
-#
-
-#
-# The number of log statements to be displayed using log:display. It also 
defines the number
-# of lines searched for exceptions using log:exception-display. You can 
override this value
-# at runtime using -n in log:display.
-#
-size = 500
-
-#
-# The pattern used to format the log statement when using log:display. This 
pattern is according
-# to the log4j layout. You can override this parameter at runtime using 
log:display with -p.
-#
-pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - 
%X{bundle.name} - %X{bundle.version} | %m%n

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
index 7303637..ae738c1 100644
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
+++ 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
@@ -119,4 +119,4 @@ objectName = connector:name=rmi
 #
 # Locate an existing MBean server if possible (usefull when Karaf is embedded)
 #
-#locateExistingMBeanServerIfPossible = true
+locateExistingMBeanServerIfPossible = true

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
index 3983df2..8ff6cd6 100644
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
+++ 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
@@ -75,7 +75,7 @@ hostKeyFormat = simple
 # 3: DEBUG
 # 4: TRACE
 #
-#logLevel=1
+#logLevel = 1
 
 #
 # Specify an additional welcome banner to be displayed when a user logs into 
the server.

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.logging.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 8f50bf5..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,67 +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.
-#
-################################################################################
-
-# Root logger
-log4j.rootLogger=INFO, out, osgi:*
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-# Avoid extensive logging
-log4j.logger.org.apache.aries.spifly.dynamic.bundle=WARN
-
-# Security audit logger
-log4j.logger.org.apache.karaf.jaas.modules.audit=INFO, audit
-log4j.additivity.org.apache.karaf.jaas.modules.audit=false
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t 
| %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | 
%-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j.appender.out.file=${karaf.data}/log/karaf.log
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=1MB
-log4j.appender.out.maxBackupIndex=10
-
-# Audit appender
-log4j.appender.audit=org.apache.log4j.RollingFileAppender
-log4j.appender.audit.layout=org.apache.log4j.PatternLayout
-log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t 
| %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j.appender.audit.file=${karaf.data}/security/audit.log
-log4j.appender.audit.append=true
-log4j.appender.audit.maxFileSize=1MB
-log4j.appender.audit.maxBackupIndex=10
-
-# Sift appender
-log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
-log4j.appender.sift.key=bundle.name
-log4j.appender.sift.default=karaf
-log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | 
%-16.16t | %-32.32c{1} | %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j.logger.shaded.org.eclipse.aether = TRACE
-#log4j.logger.shaded.org.apache.http.headers = DEBUG
-#log4j.logger.org.ops4j.pax.url.mvn = TRACE

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
deleted file mode 100644
index 4d97745..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ /dev/null
@@ -1,154 +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.
-#
-################################################################################
-
-#
-# see: https://ops4j1.jira.com/wiki/display/paxurl/Aether+Configuration
-#
-
-# If set to true, the following property will not allow any certificate to be 
used
-# when accessing Maven repositories through SSL
-#
-org.ops4j.pax.url.mvn.certificateCheck=true
-
-#
-# Path to the local Maven settings file.
-# The repositories defined in this file will be automatically added to the list
-# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
-# below is not set.
-# The following locations are checked for the existence of the settings.xml 
file
-#   * 1. looks for the specified url
-#   * 2. if not found looks for ${user.home}/.m2/settings.xml
-#   * 3. if not found looks for ${maven.home}/conf/settings.xml
-#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
-#
-# Properties prefixed with "org.ops4j.pax.url.mvn." have
-# higher priority except <proxies> element. HTTP proxies should be configured 
in
-# settings file
-#org.ops4j.pax.url.mvn.settings=
-
-#
-# Path to the local Maven repository which is used to avoid downloading
-# artifacts when they already exist locally.
-# The value of this property will be extracted from the settings.xml file
-# above, or defaulted to:
-#     System.getProperty( "user.home" ) + "/.m2/repository"
-# leaving this option commented makes the system dependent on external
-# configuration, which is not always desired
-# "localRepository" is the target location for artifacts downloaded from
-# "remote repositories"
-#org.ops4j.pax.url.mvn.localRepository=
-
-#
-# Default this to false. It's just weird to use undocumented repos
-# "false" means that http://repo1.maven.org/maven2@id=central won't be
-# implicitly used as remote repository
-#
-org.ops4j.pax.url.mvn.useFallbackRepositories=false
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# list of repositories searched in the first place, should contain
-# ${runtime.home}/${karaf.default.repository}.
-# if "org.ops4j.pax.url.mvn.localRepository" is defined and it's not
-# ~/.m2/repository, it's recommended (at least for dev purposes) to add
-# ~/.m2/repository to defaultRepositories
-# each of these repositories is checked by aether as "local repository". if
-# artifact isn't found, "repositories" are searched next
-#
-# Those repositories will be checked before iterating through the
-#    below list of repositories and even before the local repository
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.defaultRepositories=\
-    
file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots, \
-    file:${karaf.data}/kar@id=kar.repository@multi@snapshots, \
-    
file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots
-
-#
-# if "defaultLocalRepoAsRemote" is set do *any* value, localRepository will be
-# added to the list of remote repositories being searched for artifacts
-#
-#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote = true
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# list of repositories searched after resolution fails for 
"defaultRepositories"
-# These are true remote repositories accessed using maven/aether/wagon
-# mechanisms. If any repository contains required artifact, it is then written
-# to "localRepository"
-#
-# if this list is _prepended_ with '+' sign, all repositories from active
-# profiles defined in effective settings.xml file will be _appended_ to this
-# list
-# The default list includes the following repositories:
-#    http://repo1.maven.org/maven2@id=central
-#    http://repository.springsource.com/maven/bundles/release@id=spring.ebr
-#    
http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external
-#    http://zodiac.springsource.com/maven/bundles/release@id=gemini
-#    
http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
-#    
https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases
-#    
https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snapshots
-#    @noreleases : the repository does not contain any released artifacts
-#    @id=repository.id : the id for the repository, just like in the
-#        settings.xml this is optional but recommended
-#
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2@id=central, \
-    
http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, 
\
-    
http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external,
 \
-    http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
-    
http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases,
 \
-    
https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases,
 \
-    
https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases,
 \
-    
http://repository.springsource.com/maven/bundles/external@id=spring-ebr-repository@snapshots@noreleases
-
-#
-# Global policies override repository-specific settings (@checksum=..., 
@update=..., @releasesUpdate=..., ...)
-#
-#org.ops4j.pax.url.mvn.globalUpdatePolicy = daily
-#org.ops4j.pax.url.mvn.globalChecksumPolicy = warn
-
-#
-# socket and connection configuration (pax-url-aether 2.5.0)
-#
-# default value for connection and read timeouts, when socket.readTimeout and 
socket.connectionTimeout
-# are not specified
-org.ops4j.pax.url.mvn.timeout = 5000
-# timeout in ms when establishing http connection during artifact resolution
-org.ops4j.pax.url.mvn.socket.connectionTimeout = 5000
-# timeout in ms when reading data after connecting to remote repository
-org.ops4j.pax.url.mvn.socket.readTimeout = 30000
-# SO_KEEPALIVE option for sockets, defaults to false
-org.ops4j.pax.url.mvn.socket.keepAlive = false
-# SO_LINGER option for sockets, defaults to -1
-org.ops4j.pax.url.mvn.socket.linger = -1
-# SO_REUSEADDR option for sockets, defaults to false
-org.ops4j.pax.url.mvn.socket.reuseAddress = false
-# TCP_NODELAY option for sockets, defaults to true
-org.ops4j.pax.url.mvn.socket.tcpNoDelay = true
-# Configure buffer size for HTTP connections (output and input buffers), 
defaults to 8192 bytes
-org.ops4j.pax.url.mvn.connection.bufferSize = 8192
-# Number of connection retries after failure is detected in http client. 
httpclient uses default value "3"
-org.ops4j.pax.url.mvn.connection.retryCount = 3

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/profile.cfg
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/profile.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/profile.cfg
deleted file mode 100644
index 49fa0be..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/profile.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-repository.mvn\:org.apache.karaf.features/standard/4.0.9-SNAPSHOT/xml/features 
= mvn:org.apache.karaf.features/standard/4.0.9-SNAPSHOT/xml/features
-repository.mvn\:org.apache.karaf.features/framework/4.0.9-SNAPSHOT/xml/features
 = mvn:org.apache.karaf.features/framework/4.0.9-SNAPSHOT/xml/features
-feature.eventadmin = eventadmin
-feature.framework/4.0.9.SNAPSHOT = framework/4.0.9.SNAPSHOT
-repository.mvn\:org.apache.karaf.features/spring/4.0.9-SNAPSHOT/xml/features = 
mvn:org.apache.karaf.features/spring/4.0.9-SNAPSHOT/xml/features
-repository.mvn\:org.apache.karaf.features/enterprise/4.0.9-SNAPSHOT/xml/features
 = mvn:org.apache.karaf.features/enterprise/4.0.9-SNAPSHOT/xml/features
-feature.framework = framework
-feature.wrap = wrap
-feature.aries-blueprint = aries-blueprint
-feature.shell = shell
-feature.shell-compat = shell-compat
-feature.feature = feature
-feature.jaas = jaas
-feature.ssh = ssh
-feature.management = management
-feature.bundle = bundle
-feature.config = config
-feature.deployer = deployer
-feature.diagnostic = diagnostic
-feature.instance = instance
-feature.kar = kar
-feature.log = log
-feature.package = package
-feature.service = service
-feature.system = system
-feature.wrapper = wrapper
-bundle.mvn\:org.apache.karaf/demos/4.0.9-SNAPSHOT = 
mvn:org.apache.karaf/demos/4.0.9-SNAPSHOT
-attribute.parents = 97d90d5e-ba78-4463-a2a2-5b76fe9209f3 
6da0f1e8-1c2a-4f25-813a-65d2be5feb8b ad9bc1de-b1a8-4d15-a060-29d413ac179b

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/shell.init.script
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/shell.init.script
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/shell.init.script
deleted file mode 100644
index 35afc12..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/shell.init.script
+++ /dev/null
@@ -1,32 +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 script is run each time a shell is created.
-// You can define here closures or variables that will be available
-// in each session.
-//
-ld = { log:display $args } ;
-lde = { log:exception-display $args } ;
-la = { bundle:list -t 0 $args } ;
-ls = { service:list $args } ;
-cl = { config:list "(service.pid=$args)" } ;
-halt = { system:shutdown -h -f $args } ;
-help = { *:help $args | more } ;
-man = { help $args } ;
-log:list = { log:get ALL } ;
-service:get = { $.context getService ($.context getServiceReference $args) };

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/startup.properties
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/startup.properties
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/startup.properties
deleted file mode 100644
index cf50b27..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/startup.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Bundles to be started on startup, with startlevel
-mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.5 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.5 = 8
-mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.14 = 10
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.8 = 11
-mvn\:org.apache.felix/org.apache.felix.metatype/1.1.2 = 5
-mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.9-SNAPSHOT
 = 5
-mvn\:org.ops4j.pax.url/pax-url-aether/2.5.2 = 5
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.9-SNAPSHOT = 
15

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/main/resources/org/apache/karaf/instance/resources/etc/users.properties
----------------------------------------------------------------------
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/users.properties
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/users.properties
deleted file mode 100644
index 0657308..0000000
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/users.properties
+++ /dev/null
@@ -1,33 +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 users, groups, and roles.
-# Each line has to be of the format:
-#
-# USER=PASSWORD,ROLE1,ROLE2,...
-# USER=PASSWORD,_g_:GROUP,...
-# _g_\:GROUP=ROLE1,ROLE2,...
-#
-# All users, groups, and roles entered in this file are available after Karaf 
startup
-# and modifiable via the JAAS command group. These users reside in a JAAS 
domain
-# with the name "karaf".
-#
-karaf = karaf,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer,systembundles

http://git-wip-us.apache.org/repos/asf/karaf/blob/b48f1af4/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
----------------------------------------------------------------------
diff --git 
a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
 
b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
index 09e8ba6..9b2b136 100644
--- 
a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
+++ 
b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
@@ -99,8 +99,7 @@ public class InstanceServiceImplTest {
 
         assertFileExists(instance.getLocation(), 
"etc/java.util.logging.properties");
         assertFileExists(instance.getLocation(), 
"etc/org.apache.karaf.features.cfg");
-        assertFileExists(instance.getLocation(), 
"etc/org.apache.felix.fileinstall-deploy.cfg");
-        assertFileExists(instance.getLocation(), 
"etc/org.apache.karaf.log.cfg");
+        assertFileExists(instance.getLocation(), 
"etc/org.apache.karaf.shell.cfg");
         assertFileExists(instance.getLocation(), 
"etc/org.apache.karaf.management.cfg");
         assertFileExists(instance.getLocation(), 
"etc/org.ops4j.pax.logging.cfg");
         assertFileExists(instance.getLocation(), 
"etc/org.ops4j.pax.url.mvn.cfg");

Reply via email to