You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/09/01 15:54:23 UTC

karaf git commit: Fix for regression caused by KARAF-3956

Repository: karaf
Updated Branches:
  refs/heads/master 0c322fa3f -> 59c11e4de


Fix for regression caused by KARAF-3956

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

Branch: refs/heads/master
Commit: 59c11e4deebd6940136149a44f8485a941653e28
Parents: 0c322fa
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Sep 1 15:54:05 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Sep 1 15:54:05 2015 +0200

----------------------------------------------------------------------
 .../resources/etc/config.properties             | 177 +------------------
 .../resources/resources/etc/system.properties   |   3 -
 .../apache/karaf/profile/assembly/Builder.java  |  16 +-
 3 files changed, 15 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/59c11e4d/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 e344f19..1153359 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
@@ -78,141 +78,19 @@ org.osgi.framework.system.packages= \
  org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
  org.osgi.service.url;version="1.0",\
  org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
- org.apache.karaf.version;version="${karaf.osgi.version}", \
+ org.apache.karaf.version;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}",\
  ${jre-${java.specification.version}}
 
 #
 # Extra packages appended after standard packages
 #
 org.osgi.framework.system.packages.extra= \
-      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.apache.xalan.extensions; version="2.7.2", \
-      org.apache.xalan.xsltc.compiler; version="2.7.2", \
-      org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \
-      org.apache.xalan.xsltc.util; version="2.7.2", \
-      org.apache.xalan.transformer; version="2.7.2", \
-      org.apache.xalan.xsltc.trax; version="2.7.2", \
-      org.apache.xalan.processor; version="2.7.2", \
-      org.apache.xalan.lib; version="2.7.2", \
-      org.apache.xalan.trace; version="2.7.2", \
-      org.apache.xalan.xsltc.compiler.util; version="2.7.2", \
-      org.apache.xalan.templates; version="2.7.2", \
-      org.apache.xalan.xsltc; version="2.7.2", \
-      org.apache.xalan.xsltc.runtime; version="2.7.2", \
-      org.apache.xalan; version="2.7.2", \
-      org.apache.xalan.xslt; version="2.7.2", \
-      org.apache.xalan.lib.sql; version="2.7.2", \
-      org.apache.xalan.xsltc.runtime.output; version="2.7.2", \
-      org.apache.xalan.xsltc.dom; version="2.7.2", \
-      org.apache.xalan.client; version="2.7.2", \
-      org.apache.xalan.xsltc.cmdline; version="2.7.2", \
-      org.apache.xalan.serialize; version="2.7.2", \
-      org.apache.xalan.res; version="2.7.2", \
-      org.apache.xml.dtm.ref; version="2.7.2", \
-      org.apache.xml.dtm; version="2.7.2", \
-      org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \
-      org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \
-      org.apache.xml.res; version="2.7.2", \
-      org.apache.xml.serializer.dom3; version="2.7.2", \
-      org.apache.xml.serializer; version="2.7.2", \
-      org.apache.xml.serializer.utils; version="2.7.2", \
-      org.apache.xml.utils.res; version="2.7.2", \
-      org.apache.xml.utils; version="2.7.2", \
-      org.apache.xpath.functions; version="2.7.2", \
-      org.apache.xpath.jaxp; version="2.7.2", \
-      org.apache.xpath.patterns; version="2.7.2", \
-      org.apache.xpath.objects; version="2.7.2", \
-      org.apache.xpath.res; version="2.7.2", \
-      org.apache.xpath; version="2.7.2", \
-      org.apache.xpath.axes; version="2.7.2", \
-      org.apache.xpath.compiler; version="2.7.2", \
-      org.apache.xpath.operations; version="2.7.2", \
-      org.apache.xpath.domapi; version="2.7.2", \
-      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.apache.karaf.branding, \
+ org.apache.karaf.jaas.boot.principal, \
+ org.apache.karaf.jaas.boot, \
+ sun.misc
 
 org.osgi.framework.system.capabilities= \
  ${eecap-${java.specification.version}}, \
@@ -245,47 +123,6 @@ org.osgi.framework.bootdelegation=\
       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

http://git-wip-us.apache.org/repos/asf/karaf/blob/59c11e4d/assemblies/features/base/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/system.properties b/assemblies/features/base/src/main/resources/resources/etc/system.properties
index e329bb0..8e3cb68 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/system.properties
+++ b/assemblies/features/base/src/main/resources/resources/etc/system.properties
@@ -99,9 +99,6 @@ jline.nobell = true
 org.apache.servicemix.specs.debug = false
 org.apache.servicemix.specs.timeout = 0
 
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
-
 #
 # Settings for the OSGi 4.3 Weaving
 # By default, we will not weave any classes. Change this setting to include classes

http://git-wip-us.apache.org/repos/asf/karaf/blob/59c11e4d/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index f5b69d4..35e62bd 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -495,8 +495,8 @@ public class Builder {
         downloadLibraries(downloader, configProperties, libraries);
         downloader.await();
         // Reformat clauses
-        reformatClauses(configProperties, "org.osgi.framework.system.packages.extra");
-        reformatClauses(configProperties, "org.osgi.framework.bootdelegation");
+        reformatClauses(configProperties, Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA);
+        reformatClauses(configProperties, Constants.FRAMEWORK_BOOTDELEGATION);
         configProperties.save();
 
         //
@@ -818,8 +818,8 @@ public class Builder {
             downloadLibraries(downloader, configProperties, libraries);
             downloader.await();
             // Reformat clauses
-            reformatClauses(configProperties, "org.osgi.framework.system.packages.extra");
-            reformatClauses(configProperties, "org.osgi.framework.bootdelegation");
+            reformatClauses(configProperties, Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA);
+            reformatClauses(configProperties, Constants.FRAMEWORK_BOOTDELEGATION);
             configProperties.save();
         }
 
@@ -1161,14 +1161,14 @@ public class Builder {
         attributes.putValue(Constants.BUNDLE_SYMBOLICNAME, "system.bundle");
         attributes.putValue(Constants.BUNDLE_VERSION, "0.0.0");
 
-        String exportPackages = configProps.getProperty("org.osgi.framework.system.packages");
-        if (configProps.containsKey("org.osgi.framework.system.packages.extra")) {
-            exportPackages += "," + configProps.getProperty("org.osgi.framework.system.packages.extra");
+        String exportPackages = configProps.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES);
+        if (configProps.containsKey(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA)) {
+            exportPackages += "," + configProps.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA);
         }
         exportPackages = exportPackages.replaceAll(",\\s*,", ",");
         attributes.putValue(Constants.EXPORT_PACKAGE, exportPackages);
 
-        String systemCaps = configProps.getProperty("org.osgi.framework.system.capabilities");
+        String systemCaps = configProps.getProperty(Constants.FRAMEWORK_SYSTEMCAPABILITIES);
         attributes.putValue(Constants.PROVIDE_CAPABILITY, systemCaps);
 
         final Hashtable<String, String> headers = new Hashtable<>();