You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/06/19 13:34:08 UTC
karaf git commit: [KARAF-3791] Fix etc/config.properties,
especially used by instances
Repository: karaf
Updated Branches:
refs/heads/master a34b90bdc -> e0254b6ac
[KARAF-3791] Fix etc/config.properties, especially used by instances
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e0254b6a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e0254b6a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e0254b6a
Branch: refs/heads/master
Commit: e0254b6acd9678689d9fe3d61e505135c785f36c
Parents: a34b90b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jun 19 13:33:32 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jun 19 13:33:32 2015 +0200
----------------------------------------------------------------------
.../resources/etc/config.properties | 137 ++++++++++++++++++-
1 file changed, 134 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e0254b6a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index aebf6b7..f203154 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -85,8 +85,92 @@ org.osgi.framework.system.packages= \
# Extra packages appended after standard packages
#
org.osgi.framework.system.packages.extra= \
- org.apache.karaf.branding, \
- sun.misc
+ javax.annotation.security;version=1.2, \
+ javax.annotation.sql;version=1.2, \
+ javax.annotation;version=1.2, \
+ javax.xml.datatype;uses:=javax.xml.namespace;version=1.4, \
+ javax.xml.namespace;version=1.4, \
+ javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=1.4, \
+ javax.xml.soap;uses:=\"javax.activation,javax.xml.namespace,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom\";version=1.3, \
+ 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, \
+ javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=1.2, \
+ javax.xml.transform.dom;uses:=\"javax.xml.transform,org.w3c.dom\";version=1.4, \
+ javax.xml.transform.sax;uses:=\"javax.xml.transform,org.xml.sax,org.xml.sax.ext\";version=1.4, \
+ javax.xml.transform.stax;uses:=\"javax.xml.stream,javax.xml.transform\";version=1.4, \
+ javax.xml.transform.stream;uses:=javax.xml.transform;version=1.4, \
+ javax.xml.transform;version=1.4, \
+ javax.xml.validation;uses:=\"javax.xml.transform,org.w3c.dom,org.w3c.dom.ls,org.xml.sax\";version=1.4, \
+ javax.xml.ws.handler.soap;uses:=\"javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.ws.handler\";version=2.2, \
+ javax.xml.ws.handler;uses:=\"javax.xml.namespace,javax.xml.ws\";version=2.2, \
+ javax.xml.ws.http;uses:=javax.xml.ws;version=2.2, \
+ javax.xml.ws.soap;uses:=\"javax.xml.soap,javax.xml.ws,javax.xml.ws.spi\";version=2.2, \
+ javax.xml.ws.spi.http;version=2.2, \
+ javax.xml.ws.spi;uses:=\"javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom\";version=2.2, \
+ javax.xml.ws.wsaddressing;uses:=\"javax.xml.bind.annotation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c.dom\";version=2.2, \
+ javax.xml.ws;uses:=\"javax.xml.bind,javax.xml.bind.annotation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,javax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom\";version=2.2, \
+ javax.xml.xpath;uses:=\"javax.xml.namespace,org.xml.sax\";version=1.4, \
+ javax.xml;version=1.4, \
+ org.apache.html.dom;uses:=\"org.apache.xerces.dom,org.w3c.dom,org.xml.sax\";version=2.11.0, \
+ org.apache.karaf.branding, \
+ org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=${karaf.osgi.version}, \
+ org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=${karaf.osgi.version}, \
+ org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=${karaf.osgi.version}, \
+ 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=${karaf.osgi.version}, \
+ 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.dom.events;uses:=\"org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views\";version=2.11.0, \
+ org.apache.xerces.dom3.as;uses:=\"org.w3c.dom,org.w3c.dom.ls\";version=2.11.0, \
+ org.apache.xerces.dom;uses:=\"org.apache.xerces.dom3.as,org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.traversal\";version=2.11.0, \
+ org.apache.xerces.impl.dtd.models;uses:=org.apache.xerces.xni;version=2.11.0, \
+ org.apache.xerces.impl.dtd;uses:=\"org.apache.xerces.impl,org.apache.xerces.impl.dtd.models,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser\";version=2.11.0, \
+ org.apache.xerces.impl.dv.dtd;uses:=org.apache.xerces.impl.dv;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.impl.dv.xs;uses:=\"javax.xml.datatype,org.apache.xerces.impl.dv,org.apache.xerces.impl.xs,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom\";version=2.11.0, \
+ org.apache.xerces.impl.dv;uses:=\"org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xs\";version=2.11.0, \
+ org.apache.xerces.impl.io;uses:=org.apache.xerces.util;version=2.11.0, \
+ org.apache.xerces.impl.msg;uses:=org.apache.xerces.util;version=2.11.0, \
+ org.apache.xerces.impl.validation;uses:=\"org.apache.xerces.impl.dv,org.apache.xerces.util,org.apache.xerces.xni\";version=2.11.0, \
+ org.apache.xerces.impl.xpath.regex;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.impl.xs.identity;uses:=\"org.apache.xerces.impl.xpath,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xs\";version=2.11.0, \
+ org.apache.xerces.impl.xs.models;uses:=\"org.apache.xerces.impl.dtd.models,org.apache.xerces.impl.xs,org.apache.xerces.xni,org.apache.xerces.xni.parser\";version=2.11.0, \
+ org.apache.xerces.impl.xs.opti;uses:=\"org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.parsers,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.w3c.dom\";version=2.11.0, \
+ org.apache.xerces.impl.xs.traversers;uses:=\"org.apache.xerces.impl.dv,org.apache.xerces.impl.xs,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.w3c.dom\";version=2.11.0, \
+ org.apache.xerces.impl.xs.util;uses:=\"org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom.ls\";version=2.11.0, \
+ org.apache.xerces.impl.xs;uses:=\"org.apache.xerces.dom,org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.dv.xs,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs.identity,org.apache.xerces.impl.xs.models,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom,org.w3c.dom.ls\";version=2.11.0, \
+ org.apache.xerces.impl;uses:=\"org.apache.xerces.impl.dtd,org.apache.xerces.impl.validation,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.xml.sax\";version=2.11.0, \
+ org.apache.xerces.jaxp.datatype;uses:=javax.xml.datatype;version=2.11.0, \
+ org.apache.xerces.jaxp.validation;uses:=\"javax.xml.transform,javax.xml.validation,org.apache.xerces.xni.grammars,org.w3c.dom.ls,org.xml.sax\";version=2.11.0, \
+ org.apache.xerces.jaxp;uses:=\"javax.xml.parsers,javax.xml.validation,org.apache.xerces.parsers,org.apache.xerces.xs,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=2.11.0, \
+ org.apache.xerces.parsers;uses:=\"org.apache.xerces.dom,org.apache.xerces.dom3.as,org.apache.xerces.impl,org.apache.xerces.impl.dtd,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xinclude,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext\";version=2.11.0, \
+ org.apache.xerces.stax.events;uses:=\"javax.xml.namespace,javax.xml.stream,javax.xml.stream.events\";version=2.11.0, \
+ org.apache.xerces.stax;uses:=\"javax.xml.namespace,javax.xml.stream,javax.xml.stream.events\";version=2.11.0, \
+ org.apache.xerces.util;uses:=\"javax.xml.namespace,javax.xml.stream,org.apache.xerces.dom,org.apache.xerces.impl,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext\";version=2.11.0, \
+ org.apache.xerces.xinclude;uses:=\"org.apache.xerces.impl,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xpointer\";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.xni.parser;uses:=org.apache.xerces.xni;version=2.11.0, \
+ org.apache.xerces.xni;uses:=org.apache.xerces.xni.parser;version=2.11.0, \
+ org.apache.xerces.xpointer;uses:=\"org.apache.xerces.impl,org.apache.xerces.util,org.apache.xerces.xinclude,org.apache.xerces.xni,org.apache.xerces.xni.parser\";version=2.11.0, \
+ org.apache.xerces.xs.datatypes;uses:=\"javax.xml.datatype,javax.xml.namespace,org.apache.xerces.xni,org.apache.xerces.xs\";version=2.11.0, \
+ org.apache.xerces.xs;uses:=\"org.apache.xerces.xs.datatypes,org.w3c.dom,org.w3c.dom.ls\";version=2.11.0, \
+ org.apache.xml.serialize;uses:=\"org.apache.xerces.dom,org.apache.xerces.util,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext\";version=2.11.0, \
+ org.w3c.dom.bootstrap;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom.css;uses:=\"org.w3c.dom,org.w3c.dom.stylesheets,org.w3c.dom.views\";version=1.0, \
+ org.w3c.dom.events;uses:=\"org.w3c.dom,org.w3c.dom.views\";version=1.0, \
+ org.w3c.dom.html;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom.ls;uses:=\"org.w3c.dom,org.w3c.dom.events,org.w3c.dom.traversal\";version=1.0, \
+ org.w3c.dom.ranges;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom.stylesheets;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom.traversal;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom.views;version=1.0, \
+ org.w3c.dom.xpath;uses:=org.w3c.dom;version=1.0, \
+ org.w3c.dom;version=1.0, \
+ org.xml.sax.ext;uses:=\"org.xml.sax,org.xml.sax.helpers\";version=2.0.2, \
+ org.xml.sax.helpers;uses:=org.xml.sax;version=2.0.2, \
+ org.xml.sax;version=2.0.2, \
+ sun.misc
+
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
@@ -113,7 +197,54 @@ eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
#
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
#
-org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*
+org.osgi.framework.bootdelegation=\
+ com.sun.*, \
+ javax.transaction, \
+ javax.transaction.*, \
+ javax.xml.crypto, \
+ javax.xml.crypto.*, \
+ org.apache.html.dom, \
+ org.apache.karaf.jaas.boot, \
+ org.apache.karaf.jaas.boot.principal, \
+ org.apache.wml, \
+ org.apache.wml.dom, \
+ org.apache.xerces.dom, \
+ org.apache.xerces.dom.events, \
+ org.apache.xerces.dom3.as, \
+ org.apache.xerces.impl, \
+ org.apache.xerces.impl.dtd, \
+ org.apache.xerces.impl.dtd.models, \
+ org.apache.xerces.impl.dv, \
+ org.apache.xerces.impl.dv.dtd, \
+ org.apache.xerces.impl.dv.util, \
+ org.apache.xerces.impl.dv.xs, \
+ org.apache.xerces.impl.io, \
+ org.apache.xerces.impl.msg, \
+ org.apache.xerces.impl.validation, \
+ org.apache.xerces.impl.xpath, \
+ org.apache.xerces.impl.xpath.regex, \
+ org.apache.xerces.impl.xs, \
+ org.apache.xerces.impl.xs.identity, \
+ org.apache.xerces.impl.xs.models, \
+ org.apache.xerces.impl.xs.opti, \
+ org.apache.xerces.impl.xs.traversers, \
+ org.apache.xerces.impl.xs.util, \
+ org.apache.xerces.jaxp, \
+ org.apache.xerces.jaxp.datatype, \
+ org.apache.xerces.jaxp.validation, \
+ org.apache.xerces.parsers, \
+ org.apache.xerces.stax, \
+ org.apache.xerces.stax.events, \
+ org.apache.xerces.util, \
+ org.apache.xerces.xinclude, \
+ org.apache.xerces.xni, \
+ org.apache.xerces.xni.grammars, \
+ org.apache.xerces.xni.parser, \
+ org.apache.xerces.xpointer, \
+ org.apache.xerces.xs, \
+ org.apache.xerces.xs.datatypes, \
+ org.apache.xml.serialize, \
+ sun.*
# 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