You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2018/07/06 14:07:56 UTC
[sling-org-apache-sling-launchpad-base] branch felix6 created (now
723c42a)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch felix6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git.
at 723c42a Update to felix framework 6.0.0 and delete embeded jre profiles.
This branch includes the following new commits:
new 0de0edb Adapt to felix 6.0
new 723c42a Update to felix framework 6.0.0 and delete embeded jre profiles.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-launchpad-base] 02/02: Update to felix
framework 6.0.0 and delete embeded jre profiles.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch felix6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git
commit 723c42aeb70e515a7f8b3881b9cab46b3bbae211
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Fri Jul 6 16:06:34 2018 +0200
Update to felix framework 6.0.0 and delete embeded jre profiles.
---
pom.xml | 4 +-
src/main/resources/jre-1.5.properties | 121 -------------------------------
src/main/resources/jre-1.6.properties | 129 ---------------------------------
src/main/resources/jre-1.7.properties | 131 ----------------------------------
src/main/resources/jre-1.8.properties | 131 ----------------------------------
src/main/resources/sling.properties | 78 +-------------------
6 files changed, 4 insertions(+), 590 deletions(-)
diff --git a/pom.xml b/pom.xml
index 96c0836..f6f9288 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
-->
- <version>5.6.10-2.6.27-SNAPSHOT</version>
+ <version>6.0.0-2.6.27-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Base</name>
@@ -234,7 +234,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/resources/jre-1.5.properties b/src/main/resources/jre-1.5.properties
deleted file mode 100644
index 3498335..0000000
--- a/src/main/resources/jre-1.5.properties
+++ /dev/null
@@ -1,121 +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.
-#
-
-# The file contains the Java 1.5 platform packages used as system packages
-# for the current platform.
-
-
-jre-1.5=, \
- javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_005_J2SE", \
- javax.activity;version="0.0.0.1_005_J2SE", \
- javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_005_J2SE", \
- javax.crypto.spec;uses:="javax.crypto";version="0.0.0.1_005_J2SE", \
- javax.crypto;uses:="javax.crypto.spec";version="0.0.0.1_005_J2SE", \
- javax.imageio.event;uses:="javax.imageio";version="0.0.0.1_005_J2SE", \
- javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.1_005_J2SE", \
- javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.1_005_J2SE", \
- javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.1_005_J2SE", \
- javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.1_005_J2SE", \
- javax.imageio.stream;uses:="javax.imageio";version="0.0.0.1_005_J2SE", \
- javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.1_005_J2SE", \
- javax.management.loading;uses:="javax.management";version="0.0.0.1_005_J2SE", \
- javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.1_005_J2SE", \
- javax.management.monitor;uses:="javax.management";version="0.0.0.1_005_J2SE", \
- javax.management.openmbean;uses:="javax.management";version="0.0.0.1_005_J2SE", \
- javax.management.relation;uses:="javax.management";version="0.0.0.1_005_J2SE", \
- javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.naming,org.omg.CORBA,org.omg.CORBA.portable,javax.rmi,javax.rmi.CORBA";version="0.0.0.1_005_J2SE", \
- javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.1_005_J2SE", \
- javax.management.timer;uses:="javax.management";version="0.0.0.1_005_J2SE", \
- javax.management;uses:="javax.management.loading";version="0.0.0.1_005_J2SE", \
- javax.naming.directory;uses:="javax.naming";version="0.0.0.1_005_J2SE", \
- javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_005_J2SE", \
- javax.naming.ldap;uses:="javax.naming,javax.naming.directory,javax.net.ssl,javax.naming.event";version="0.0.0.1_005_J2SE", \
- javax.naming.spi;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_005_J2SE", \
- javax.naming;uses:="javax.naming.spi";version="0.0.0.1_005_J2SE", \
- javax.net.ssl;uses:="javax.security.cert,javax.security.auth.x500,javax.net";version="0.0.0.1_005_J2SE", \
- javax.net;version="0.0.0.1_005_J2SE", \
- javax.print.attribute.standard;uses:="javax.print.attribute";version="0.0.0.1_005_J2SE", \
- javax.print.attribute;version="0.0.0.1_005_J2SE", \
- javax.print.event;uses:="javax.print,javax.print.attribute";version="0.0.0.1_005_J2SE", \
- javax.print;uses:="javax.print.attribute,javax.print.event,javax.print.attribute.standard";version="0.0.0.1_005_J2SE", \
- javax.rmi.CORBA;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,org.omg.SendingContext";version="0.0.0.1_005_J2SE", \
- javax.rmi.ssl;uses:="javax.net,javax.net.ssl";version="0.0.0.1_005_J2SE", \
- javax.rmi;uses:="org.omg.CORBA,javax.rmi.CORBA";version="0.0.0.1_005_J2SE", \
- javax.security.auth.callback;version="0.0.0.1_005_J2SE", \
- javax.security.auth.kerberos;uses:="javax.security.auth,javax.crypto";version="0.0.0.1_005_J2SE", \
- javax.security.auth.login;uses:="javax.security.auth,javax.security.auth.callback";version="0.0.0.1_005_J2SE", \
- javax.security.auth.spi;uses:="javax.security.auth.callback,javax.security.auth.login,javax.security.auth";version="0.0.0.1_005_J2SE", \
- javax.security.auth.x500;uses:="javax.security.auth";version="0.0.0.1_005_J2SE", \
- javax.security.auth;version="0.0.0.1_005_J2SE", \
- javax.security.cert;version="0.0.0.1_005_J2SE", \
- javax.security.sasl;uses:="javax.security.auth.callback";version="0.0.0.1_005_J2SE", \
- javax.sound.midi.spi;uses:="javax.sound.midi";version="0.0.0.1_005_J2SE", \
- javax.sound.midi;uses:="javax.sound.midi.spi";version="0.0.0.1_005_J2SE", \
- javax.sound.sampled.spi;uses:="javax.sound.sampled";version="0.0.0.1_005_J2SE", \
- javax.sound.sampled;uses:="javax.sound.sampled.spi";version="0.0.0.1_005_J2SE", \
- javax.sql.rowset.serial;uses:="javax.sql.rowset";version="0.0.0.1_005_J2SE", \
- javax.sql.rowset.spi;uses:="javax.sql,javax.naming,javax.sql.rowset";version="0.0.0.1_005_J2SE", \
- javax.sql.rowset;uses:="javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi";version="0.0.0.1_005_J2SE", \
- javax.sql;uses:="javax.transaction.xa";version="0.0.0.1_005_J2SE", \
- javax.swing.border;uses:="javax.swing";version="0.0.0.1_005_J2SE", \
- javax.swing.colorchooser;uses:="javax.swing.event,javax.swing,javax.swing.border";version="0.0.0.1_005_J2SE", \
- javax.swing.event;uses:="javax.swing,javax.swing.text,javax.swing.table,javax.swing.tree,javax.swing.undo";version="0.0.0.1_005_J2SE", \
- javax.swing.filechooser;uses:="javax.swing";version="0.0.0.1_005_J2SE", \
- javax.swing.plaf.basic;uses:="javax.swing.border,javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.event,javax.swing.colorchooser,javax.accessibility,javax.swing.filechooser,javax.swing.text.html,javax.sound.sampled,javax.swing.table,javax.swing.tree";version="0.0.0.1_005_J2SE", \
- javax.swing.plaf.metal;uses:="javax.swing.plaf,javax.swing,javax.swing.border,javax.swing.text,javax.swing.plaf.basic,javax.swing.filechooser,javax.swing.event,javax.accessibility,javax.swing.tree";version="0.0.0.1_005_J2SE", \
- javax.swing.plaf.multi;uses:="javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_005_J2SE", \
- javax.swing.plaf.synth;uses:="javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.plaf.basic,javax.swing.colorchooser,javax.swing.text,javax.xml.parsers,org.xml.sax,javax.swing.table,javax.swing.tree";version="0.0.0.1_005_J2SE", \
- javax.swing.plaf;uses:="javax.swing,javax.swing.border,javax.accessibility,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_005_J2SE", \
- javax.swing.table;uses:="javax.swing.event,javax.swing.plaf,javax.swing.border,javax.swing,javax.accessibility";version="0.0.0.1_005_J2SE", \
- javax.swing.text.html.parser;uses:="javax.swing.text.html,javax.swing.text";version="0.0.0.1_005_J2SE", \
- javax.swing.text.html;uses:="javax.swing.event,javax.swing.text,javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.undo";version="0.0.0.1_005_J2SE", \
- javax.swing.text.rtf;uses:="javax.swing.text";version="0.0.0.1_005_J2SE", \
- javax.swing.text;uses:="javax.swing.event,javax.swing.tree,javax.swing.undo,javax.swing,javax.swing.plaf,javax.swing.plaf.basic,javax.accessibility,javax.swing.text.html";version="0.0.0.1_005_J2SE", \
- javax.swing.tree;uses:="javax.swing.event,javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.basic";version="0.0.0.1_005_J2SE", \
- javax.swing.undo;uses:="javax.swing,javax.swing.event";version="0.0.0.1_005_J2SE", \
- javax.swing;uses:="javax.swing.event,javax.accessibility,javax.swing.text,javax.swing.plaf,javax.swing.border,javax.swing.tree,javax.swing.table,javax.swing.colorchooser,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.filechooser,javax.print.attribute,javax.swing.plaf.metal";version="0.0.0.1_005_J2SE", \
- org.ietf.jgss;version="0.0.0.1_005_J2SE", \
- org.omg.CORBA.DynAnyPackage;uses:="org.omg.CORBA";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA.ORBPackage;uses:="org.omg.CORBA";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA.TypeCodePackage;uses:="org.omg.CORBA";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA.portable;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA;uses:="org.omg.CORBA.portable,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA_2_3.portable,org.omg.CORBA.TypeCodePackage";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA_2_3.portable;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.CORBA_2_3;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.CosNaming.NamingContextExtPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.CosNaming.NamingContextPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.CosNaming";version="0.0.0.1_005_J2SE", \
- org.omg.CosNaming;uses:="org.omg.CORBA.portable,org.omg.CORBA,org.omg.PortableServer,org.omg.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPackage";version="0.0.0.1_005_J2SE", \
- org.omg.Dynamic;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.DynamicAny.DynAnyFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.DynamicAny.DynAnyPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.DynamicAny;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage";version="0.0.0.1_005_J2SE", \
- org.omg.IOP.CodecFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.IOP.CodecPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.IOP;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage";version="0.0.0.1_005_J2SE", \
- org.omg.Messaging;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableInterceptor.ORBInitInfoPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableInterceptor;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.CORBA_2_3.portable,org.omg.Dynamic";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer.CurrentPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer.POAManagerPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer.POAPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer.ServantLocatorPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer.portable;uses:="org.omg.CORBA,org.omg.PortableServer";version="0.0.0.1_005_J2SE", \
- org.omg.PortableServer;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.portable,org.omg.CORBA_2_3,org.omg.PortableServer.ServantLocatorPackage";version="0.0.0.1_005_J2SE", \
- org.omg.SendingContext;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_005_J2SE", \
- org.omg.stub.java.rmi;uses:="javax.rmi.CORBA";version="0.0.0.1_005_J2SE"
\ No newline at end of file
diff --git a/src/main/resources/jre-1.6.properties b/src/main/resources/jre-1.6.properties
deleted file mode 100644
index 56de602..0000000
--- a/src/main/resources/jre-1.6.properties
+++ /dev/null
@@ -1,129 +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.
-#
-
-# The file contains the Java 1.6 platform packages used as system packages
-# for the current platform.
-
-
-jre-1.6=, \
- javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_006_JavaSE", \
- javax.activity;version="0.0.0.1_006_JavaSE", \
- javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_006_JavaSE", \
- javax.annotation;version="0.0.0.1_006_JavaSE", \
- javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_006_JavaSE", \
- javax.crypto.spec;uses:="javax.crypto";version="0.0.0.1_006_JavaSE", \
- javax.crypto;uses:="javax.crypto.spec";version="0.0.0.1_006_JavaSE", \
- javax.imageio.event;uses:="javax.imageio";version="0.0.0.1_006_JavaSE", \
- javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.1_006_JavaSE", \
- javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.1_006_JavaSE", \
- javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.1_006_JavaSE", \
- javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.1_006_JavaSE", \
- javax.imageio.stream;uses:="javax.imageio";version="0.0.0.1_006_JavaSE", \
- javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.1_006_JavaSE", \
- javax.lang.model.element;uses:="javax.lang.model.type";version="0.0.0.1_006_JavaSE", \
- javax.lang.model.type;uses:="javax.lang.model.element";version="0.0.0.1_006_JavaSE", \
- javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.1_006_JavaSE", \
- javax.lang.model;version="0.0.0.1_006_JavaSE", \
- javax.management.loading;uses:="javax.management";version="0.0.0.1_006_JavaSE", \
- javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.1_006_JavaSE", \
- javax.management.monitor;uses:="javax.management,javax.management.openmbean";version="0.0.0.1_006_JavaSE", \
- javax.management.openmbean;uses:="javax.management";version="0.0.0.1_006_JavaSE", \
- javax.management.relation;uses:="javax.management";version="0.0.0.1_006_JavaSE", \
- javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,org.omg.CORBA,javax.rmi.ssl,org.omg.CORBA.portable,javax.rmi,javax.rmi.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.1_006_JavaSE", \
- javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.1_006_JavaSE", \
- javax.management.timer;uses:="javax.management";version="0.0.0.1_006_JavaSE", \
- javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.1_006_JavaSE", \
- javax.naming.directory;uses:="javax.naming";version="0.0.0.1_006_JavaSE", \
- javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_006_JavaSE", \
- javax.naming.ldap;uses:="javax.naming,javax.naming.directory,javax.net.ssl,javax.naming.event";version="0.0.0.1_006_JavaSE", \
- javax.naming.spi;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_006_JavaSE", \
- javax.naming;uses:="javax.naming.spi";version="0.0.0.1_006_JavaSE", \
- javax.net.ssl;uses:="javax.security.cert,javax.security.auth.x500,javax.net";version="0.0.0.1_006_JavaSE", \
- javax.net;version="0.0.0.1_006_JavaSE", \
- javax.print.attribute.standard;uses:="javax.print.attribute";version="0.0.0.1_006_JavaSE", \
- javax.print.attribute;version="0.0.0.1_006_JavaSE", \
- javax.print.event;uses:="javax.print,javax.print.attribute";version="0.0.0.1_006_JavaSE", \
- javax.print;uses:="javax.print.attribute,javax.print.event,javax.print.attribute.standard";version="0.0.0.1_006_JavaSE", \
- javax.rmi.CORBA;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,org.omg.SendingContext";version="0.0.0.1_006_JavaSE", \
- javax.rmi.ssl;uses:="javax.net,javax.net.ssl";version="0.0.0.1_006_JavaSE", \
- javax.rmi;uses:="org.omg.CORBA,javax.rmi.CORBA";version="0.0.0.1_006_JavaSE", \
- javax.script;version="0.0.0.1_006_JavaSE", \
- javax.security.auth.callback;version="0.0.0.1_006_JavaSE", \
- javax.security.auth.kerberos;uses:="javax.security.auth,javax.crypto";version="0.0.0.1_006_JavaSE", \
- javax.security.auth.login;uses:="javax.security.auth,javax.security.auth.callback";version="0.0.0.1_006_JavaSE", \
- javax.security.auth.spi;uses:="javax.security.auth.callback,javax.security.auth.login,javax.security.auth";version="0.0.0.1_006_JavaSE", \
- javax.security.auth.x500;uses:="javax.security.auth";version="0.0.0.1_006_JavaSE", \
- javax.security.auth;version="0.0.0.1_006_JavaSE", \
- javax.security.cert;version="0.0.0.1_006_JavaSE", \
- javax.security.sasl;uses:="javax.security.auth.callback";version="0.0.0.1_006_JavaSE", \
- javax.sound.midi.spi;uses:="javax.sound.midi";version="0.0.0.1_006_JavaSE", \
- javax.sound.midi;uses:="javax.sound.midi.spi";version="0.0.0.1_006_JavaSE", \
- javax.sound.sampled.spi;uses:="javax.sound.sampled";version="0.0.0.1_006_JavaSE", \
- javax.sound.sampled;uses:="javax.sound.sampled.spi";version="0.0.0.1_006_JavaSE", \
- javax.sql.rowset.serial;uses:="javax.sql.rowset";version="0.0.0.1_006_JavaSE", \
- javax.sql.rowset.spi;uses:="javax.sql,javax.naming,javax.sql.rowset";version="0.0.0.1_006_JavaSE", \
- javax.sql.rowset;uses:="javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi";version="0.0.0.1_006_JavaSE", \
- javax.sql;uses:="javax.transaction.xa";version="0.0.0.1_006_JavaSE", \
- javax.swing.border;uses:="javax.swing";version="0.0.0.1_006_JavaSE", \
- javax.swing.colorchooser;uses:="javax.swing.event,javax.swing,javax.swing.border";version="0.0.0.1_006_JavaSE", \
- javax.swing.event;uses:="javax.swing,javax.swing.text,javax.swing.table,javax.swing.tree,javax.swing.undo";version="0.0.0.1_006_JavaSE", \
- javax.swing.filechooser;uses:="javax.swing";version="0.0.0.1_006_JavaSE", \
- javax.swing.plaf.basic;uses:="javax.swing.border,javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.event,javax.swing.colorchooser,javax.accessibility,javax.swing.filechooser,javax.swing.text.html,javax.sound.sampled,javax.swing.table,javax.swing.tree";version="0.0.0.1_006_JavaSE", \
- javax.swing.plaf.metal;uses:="javax.swing.plaf,javax.swing,javax.swing.border,javax.swing.text,javax.swing.plaf.basic,javax.swing.filechooser,javax.swing.event,javax.swing.tree";version="0.0.0.1_006_JavaSE", \
- javax.swing.plaf.multi;uses:="javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_006_JavaSE", \
- javax.swing.plaf.synth;uses:="javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.border,javax.swing.plaf.basic,javax.swing.colorchooser,javax.swing.event,javax.xml.parsers,org.xml.sax,javax.swing.table,javax.swing.tree";version="0.0.0.1_006_JavaSE", \
- javax.swing.plaf;uses:="javax.swing,javax.swing.border,javax.accessibility,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_006_JavaSE", \
- javax.swing.table;uses:="javax.swing.event,javax.swing.plaf,javax.swing.border,javax.swing,javax.accessibility";version="0.0.0.1_006_JavaSE", \
- javax.swing.text.html.parser;uses:="javax.swing.text.html,javax.swing.text";version="0.0.0.1_006_JavaSE", \
- javax.swing.text.html;uses:="javax.swing.event,javax.swing.text,javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.undo";version="0.0.0.1_006_JavaSE", \
- javax.swing.text.rtf;uses:="javax.swing.text";version="0.0.0.1_006_JavaSE", \
- javax.swing.text;uses:="javax.swing.event,javax.swing.tree,javax.swing.undo,javax.swing,javax.swing.plaf,javax.swing.plaf.basic,javax.print,javax.print.attribute,javax.accessibility,javax.swing.text.html";version="0.0.0.1_006_JavaSE", \
- javax.swing.tree;uses:="javax.swing.event,javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.basic";version="0.0.0.1_006_JavaSE", \
- javax.swing.undo;uses:="javax.swing,javax.swing.event";version="0.0.0.1_006_JavaSE", \
- javax.swing;uses:="javax.swing.event,javax.accessibility,javax.swing.text,javax.swing.plaf,javax.swing.border,javax.swing.tree,javax.swing.table,javax.swing.colorchooser,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.filechooser,javax.print,javax.print.attribute,javax.swing.plaf.metal";version="0.0.0.1_006_JavaSE", \
- javax.tools;uses:="javax.lang.model.element,javax.annotation.processing,javax.lang.model";version="0.0.0.1_006_JavaSE", \
- org.ietf.jgss;version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA.DynAnyPackage;uses:="org.omg.CORBA";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA.ORBPackage;uses:="org.omg.CORBA";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA.TypeCodePackage;uses:="org.omg.CORBA";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA.portable;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA;uses:="org.omg.CORBA.portable,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA_2_3.portable,org.omg.CORBA.TypeCodePackage";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA_2_3.portable;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.CORBA_2_3;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.CosNaming.NamingContextExtPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.CosNaming.NamingContextPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.CosNaming";version="0.0.0.1_006_JavaSE", \
- org.omg.CosNaming;uses:="org.omg.CORBA.portable,org.omg.CORBA,org.omg.PortableServer,org.omg.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPackage";version="0.0.0.1_006_JavaSE", \
- org.omg.Dynamic;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.DynamicAny.DynAnyFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.DynamicAny.DynAnyPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.DynamicAny;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage";version="0.0.0.1_006_JavaSE", \
- org.omg.IOP.CodecFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.IOP.CodecPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.IOP;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage";version="0.0.0.1_006_JavaSE", \
- org.omg.Messaging;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableInterceptor.ORBInitInfoPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableInterceptor;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.CORBA_2_3.portable,org.omg.Dynamic";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer.CurrentPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer.POAManagerPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer.POAPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer.ServantLocatorPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer.portable;uses:="org.omg.CORBA,org.omg.PortableServer";version="0.0.0.1_006_JavaSE", \
- org.omg.PortableServer;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.portable,org.omg.CORBA_2_3,org.omg.PortableServer.ServantLocatorPackage";version="0.0.0.1_006_JavaSE", \
- org.omg.SendingContext;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_006_JavaSE", \
- org.omg.stub.java.rmi;uses:="javax.rmi.CORBA";version="0.0.0.1_006_JavaSE"
\ No newline at end of file
diff --git a/src/main/resources/jre-1.7.properties b/src/main/resources/jre-1.7.properties
deleted file mode 100755
index d99d349..0000000
--- a/src/main/resources/jre-1.7.properties
+++ /dev/null
@@ -1,131 +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.
-#
-
-# The file contains the Java 1.7 platform packages used as system packages
-# for the current platform.
-
-
-
-jre-1.7=, \
- javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_007_JavaSE", \
- javax.activity;version="0.0.0.1_007_JavaSE", \
- javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_007_JavaSE", \
- javax.annotation;version="0.0.0.1_007_JavaSE", \
- javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_007_JavaSE", \
- javax.crypto.spec;uses:="javax.crypto";version="0.0.0.1_007_JavaSE", \
- javax.crypto;uses:="javax.crypto.spec";version="0.0.0.1_007_JavaSE", \
- javax.imageio.event;uses:="javax.imageio";version="0.0.0.1_007_JavaSE", \
- javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.1_007_JavaSE", \
- javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.1_007_JavaSE", \
- javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.1_007_JavaSE", \
- javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.1_007_JavaSE", \
- javax.imageio.stream;uses:="javax.imageio";version="0.0.0.1_007_JavaSE", \
- javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.1_007_JavaSE", \
- javax.lang.model.element;uses:="javax.lang.model.type,javax.lang.model";version="0.0.0.1_007_JavaSE", \
- javax.lang.model.type;uses:="javax.lang.model.element,javax.lang.model";version="0.0.0.1_007_JavaSE", \
- javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.1_007_JavaSE", \
- javax.lang.model;version="0.0.0.1_007_JavaSE", \
- javax.management.loading;uses:="javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.1_007_JavaSE", \
- javax.management.monitor;uses:="javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management.openmbean;uses:="javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management.relation;uses:="javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,javax.rmi.ssl,org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,javax.rmi.CORBA,javax.rmi";version="0.0.0.1_007_JavaSE", \
- javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management.timer;uses:="javax.management";version="0.0.0.1_007_JavaSE", \
- javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.1_007_JavaSE", \
- javax.naming.directory;uses:="javax.naming";version="0.0.0.1_007_JavaSE", \
- javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_007_JavaSE", \
- javax.naming.ldap;uses:="javax.naming,javax.naming.directory,javax.net.ssl,javax.naming.event";version="0.0.0.1_007_JavaSE", \
- javax.naming.spi;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_007_JavaSE", \
- javax.naming;uses:="javax.naming.spi";version="0.0.0.1_007_JavaSE", \
- javax.net.ssl;uses:="javax.security.cert,javax.security.auth.x500,javax.net";version="0.0.0.1_007_JavaSE", \
- javax.net;version="0.0.0.1_007_JavaSE", \
- javax.print.attribute.standard;uses:="javax.print.attribute";version="0.0.0.1_007_JavaSE", \
- javax.print.attribute;version="0.0.0.1_007_JavaSE", \
- javax.print.event;uses:="javax.print,javax.print.attribute";version="0.0.0.1_007_JavaSE", \
- javax.print;uses:="javax.print.attribute,javax.print.event,javax.print.attribute.standard";version="0.0.0.1_007_JavaSE", \
- javax.rmi.CORBA;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,org.omg.SendingContext";version="0.0.0.1_007_JavaSE", \
- javax.rmi.ssl;uses:="javax.net,javax.net.ssl";version="0.0.0.1_007_JavaSE", \
- javax.rmi;uses:="org.omg.CORBA,javax.rmi.CORBA";version="0.0.0.1_007_JavaSE", \
- javax.script;version="0.0.0.1_007_JavaSE", \
- javax.security.auth.callback;version="0.0.0.1_007_JavaSE", \
- javax.security.auth.kerberos;uses:="javax.security.auth,javax.crypto";version="0.0.0.1_007_JavaSE", \
- javax.security.auth.login;uses:="javax.security.auth,javax.security.auth.callback";version="0.0.0.1_007_JavaSE", \
- javax.security.auth.spi;uses:="javax.security.auth.callback,javax.security.auth.login,javax.security.auth";version="0.0.0.1_007_JavaSE", \
- javax.security.auth.x500;uses:="javax.security.auth";version="0.0.0.1_007_JavaSE", \
- javax.security.auth;version="0.0.0.1_007_JavaSE", \
- javax.security.cert;version="0.0.0.1_007_JavaSE", \
- javax.security.sasl;uses:="javax.security.auth.callback";version="0.0.0.1_007_JavaSE", \
- javax.sound.midi.spi;uses:="javax.sound.midi";version="0.0.0.1_007_JavaSE", \
- javax.sound.midi;uses:="javax.sound.midi.spi";version="0.0.0.1_007_JavaSE", \
- javax.sound.sampled.spi;uses:="javax.sound.sampled";version="0.0.0.1_007_JavaSE", \
- javax.sound.sampled;uses:="javax.sound.sampled.spi";version="0.0.0.1_007_JavaSE", \
- javax.sql.rowset.serial;uses:="javax.sql.rowset";version="0.0.0.1_007_JavaSE", \
- javax.sql.rowset.spi;uses:="javax.sql,javax.naming,javax.sql.rowset";version="0.0.0.1_007_JavaSE", \
- javax.sql.rowset;uses:="javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi";version="0.0.0.1_007_JavaSE", \
- javax.sql;uses:="javax.transaction.xa";version="0.0.0.1_007_JavaSE", \
- javax.swing.border;uses:="javax.swing";version="0.0.0.1_007_JavaSE", \
- javax.swing.colorchooser;uses:="javax.swing,javax.swing.border,javax.swing.event,javax.swing.text";version="0.0.0.1_007_JavaSE", \
- javax.swing.event;uses:="javax.swing,javax.swing.text,javax.swing.table,javax.swing.tree,javax.swing.undo";version="0.0.0.1_007_JavaSE", \
- javax.swing.filechooser;uses:="javax.swing";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf.basic;uses:="javax.swing.border,javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.event,javax.swing.colorchooser,javax.accessibility,javax.swing.filechooser,javax.swing.text.html,javax.sound.sampled,javax.swing.table,javax.swing.plaf.synth,javax.swing.tree";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf.metal;uses:="javax.swing.plaf,javax.swing,javax.swing.border,javax.swing.text,javax.swing.plaf.basic,javax.swing.filechooser,javax.swing.event,javax.swing.tree";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf.multi;uses:="javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf.nimbus;uses:="javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.plaf.synth";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf.synth;uses:="javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.border,javax.swing.plaf.basic,javax.swing.colorchooser,javax.swing.event,javax.xml.parsers,org.xml.sax,org.xml.sax.helpers,javax.swing.table,javax.swing.tree";version="0.0.0.1_007_JavaSE", \
- javax.swing.plaf;uses:="javax.swing,javax.swing.border,javax.accessibility,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_007_JavaSE", \
- javax.swing.table;uses:="javax.swing.event,javax.swing.plaf,javax.swing.border,javax.swing,javax.accessibility";version="0.0.0.1_007_JavaSE", \
- javax.swing.text.html.parser;uses:="javax.swing.text,javax.swing.text.html";version="0.0.0.1_007_JavaSE", \
- javax.swing.text.html;uses:="javax.swing.event,javax.swing.text,javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.undo";version="0.0.0.1_007_JavaSE", \
- javax.swing.text.rtf;uses:="javax.swing.text";version="0.0.0.1_007_JavaSE", \
- javax.swing.text;uses:="javax.swing.event,javax.swing.tree,javax.swing.undo,javax.swing,javax.swing.plaf,javax.swing.plaf.basic,javax.print,javax.print.attribute,javax.accessibility,javax.swing.text.html";version="0.0.0.1_007_JavaSE", \
- javax.swing.tree;uses:="javax.swing.event,javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.basic";version="0.0.0.1_007_JavaSE", \
- javax.swing.undo;uses:="javax.swing,javax.swing.event";version="0.0.0.1_007_JavaSE", \
- javax.swing;uses:="javax.swing.event,javax.accessibility,javax.swing.text,javax.swing.plaf,javax.swing.border,javax.swing.tree,javax.swing.table,javax.swing.colorchooser,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.filechooser,javax.print,javax.print.attribute,javax.swing.plaf.metal";version="0.0.0.1_007_JavaSE", \
- javax.tools;uses:="javax.lang.model.element,javax.annotation.processing,javax.lang.model";version="0.0.0.1_007_JavaSE", \
- org.ietf.jgss;version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA.DynAnyPackage;uses:="org.omg.CORBA";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA.ORBPackage;uses:="org.omg.CORBA";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA.TypeCodePackage;uses:="org.omg.CORBA";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA.portable;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA;uses:="org.omg.CORBA.portable,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA_2_3.portable,org.omg.CORBA.TypeCodePackage";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA_2_3.portable;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.CORBA_2_3;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.CosNaming.NamingContextExtPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.CosNaming.NamingContextPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.CosNaming";version="0.0.0.1_007_JavaSE", \
- org.omg.CosNaming;uses:="org.omg.CORBA.portable,org.omg.CORBA,org.omg.PortableServer,org.omg.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPackage";version="0.0.0.1_007_JavaSE", \
- org.omg.Dynamic;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.DynamicAny.DynAnyFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.DynamicAny.DynAnyPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.DynamicAny;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage";version="0.0.0.1_007_JavaSE", \
- org.omg.IOP.CodecFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.IOP.CodecPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.IOP;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage";version="0.0.0.1_007_JavaSE", \
- org.omg.Messaging;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableInterceptor.ORBInitInfoPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableInterceptor;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.CORBA_2_3.portable,org.omg.Dynamic";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer.CurrentPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer.POAManagerPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer.POAPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer.ServantLocatorPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer.portable;uses:="org.omg.CORBA,org.omg.PortableServer";version="0.0.0.1_007_JavaSE", \
- org.omg.PortableServer;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.portable,org.omg.CORBA_2_3,org.omg.PortableServer.ServantLocatorPackage";version="0.0.0.1_007_JavaSE", \
- org.omg.SendingContext;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_007_JavaSE", \
- org.omg.stub.java.rmi;uses:="javax.rmi.CORBA";version="0.0.0.1_007_JavaSE"
\ No newline at end of file
diff --git a/src/main/resources/jre-1.8.properties b/src/main/resources/jre-1.8.properties
deleted file mode 100755
index 88b9938..0000000
--- a/src/main/resources/jre-1.8.properties
+++ /dev/null
@@ -1,131 +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.
-#
-
-# The file contains the Java 1.8 platform packages used as system packages
-# for the current platform.
-
-
-
-jre-1.8=, \
- javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_008_JavaSE", \
- javax.activity;version="0.0.0.1_008_JavaSE", \
- javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_008_JavaSE", \
- javax.annotation;version="0.0.0.1_008_JavaSE", \
- javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_008_JavaSE", \
- javax.crypto.spec;uses:="javax.crypto";version="0.0.0.1_008_JavaSE", \
- javax.crypto;uses:="javax.crypto.spec";version="0.0.0.1_008_JavaSE", \
- javax.imageio.event;uses:="javax.imageio";version="0.0.0.1_008_JavaSE", \
- javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.1_008_JavaSE", \
- javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.1_008_JavaSE", \
- javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.1_008_JavaSE", \
- javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.1_008_JavaSE", \
- javax.imageio.stream;uses:="javax.imageio";version="0.0.0.1_008_JavaSE", \
- javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.1_008_JavaSE", \
- javax.lang.model.element;uses:="javax.lang.model.type,javax.lang.model";version="0.0.0.1_008_JavaSE", \
- javax.lang.model.type;uses:="javax.lang.model.element,javax.lang.model";version="0.0.0.1_008_JavaSE", \
- javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.1_008_JavaSE", \
- javax.lang.model;version="0.0.0.1_008_JavaSE", \
- javax.management.loading;uses:="javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.1_008_JavaSE", \
- javax.management.monitor;uses:="javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management.openmbean;uses:="javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management.relation;uses:="javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,javax.rmi.ssl,org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,javax.rmi.CORBA,javax.rmi";version="0.0.0.1_008_JavaSE", \
- javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management.timer;uses:="javax.management";version="0.0.0.1_008_JavaSE", \
- javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.1_008_JavaSE", \
- javax.naming.directory;uses:="javax.naming";version="0.0.0.1_008_JavaSE", \
- javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_008_JavaSE", \
- javax.naming.ldap;uses:="javax.naming,javax.naming.directory,javax.net.ssl,javax.naming.event";version="0.0.0.1_008_JavaSE", \
- javax.naming.spi;uses:="javax.naming,javax.naming.directory";version="0.0.0.1_008_JavaSE", \
- javax.naming;uses:="javax.naming.spi";version="0.0.0.1_008_JavaSE", \
- javax.net.ssl;uses:="javax.security.cert,javax.security.auth.x500,javax.net";version="0.0.0.1_008_JavaSE", \
- javax.net;version="0.0.0.1_008_JavaSE", \
- javax.print.attribute.standard;uses:="javax.print.attribute";version="0.0.0.1_008_JavaSE", \
- javax.print.attribute;version="0.0.0.1_008_JavaSE", \
- javax.print.event;uses:="javax.print,javax.print.attribute";version="0.0.0.1_008_JavaSE", \
- javax.print;uses:="javax.print.attribute,javax.print.event,javax.print.attribute.standard";version="0.0.0.1_008_JavaSE", \
- javax.rmi.CORBA;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,org.omg.SendingContext";version="0.0.0.1_008_JavaSE", \
- javax.rmi.ssl;uses:="javax.net,javax.net.ssl";version="0.0.0.1_008_JavaSE", \
- javax.rmi;uses:="org.omg.CORBA,javax.rmi.CORBA";version="0.0.0.1_008_JavaSE", \
- javax.script;version="0.0.0.1_008_JavaSE", \
- javax.security.auth.callback;version="0.0.0.1_008_JavaSE", \
- javax.security.auth.kerberos;uses:="javax.security.auth,javax.crypto";version="0.0.0.1_008_JavaSE", \
- javax.security.auth.login;uses:="javax.security.auth,javax.security.auth.callback";version="0.0.0.1_008_JavaSE", \
- javax.security.auth.spi;uses:="javax.security.auth.callback,javax.security.auth.login,javax.security.auth";version="0.0.0.1_008_JavaSE", \
- javax.security.auth.x500;uses:="javax.security.auth";version="0.0.0.1_008_JavaSE", \
- javax.security.auth;version="0.0.0.1_008_JavaSE", \
- javax.security.cert;version="0.0.0.1_008_JavaSE", \
- javax.security.sasl;uses:="javax.security.auth.callback";version="0.0.0.1_008_JavaSE", \
- javax.sound.midi.spi;uses:="javax.sound.midi";version="0.0.0.1_008_JavaSE", \
- javax.sound.midi;uses:="javax.sound.midi.spi";version="0.0.0.1_008_JavaSE", \
- javax.sound.sampled.spi;uses:="javax.sound.sampled";version="0.0.0.1_008_JavaSE", \
- javax.sound.sampled;uses:="javax.sound.sampled.spi";version="0.0.0.1_008_JavaSE", \
- javax.sql.rowset.serial;uses:="javax.sql.rowset";version="0.0.0.1_008_JavaSE", \
- javax.sql.rowset.spi;uses:="javax.sql,javax.naming,javax.sql.rowset";version="0.0.0.1_008_JavaSE", \
- javax.sql.rowset;uses:="javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi";version="0.0.0.1_008_JavaSE", \
- javax.sql;uses:="javax.transaction.xa";version="0.0.0.1_008_JavaSE", \
- javax.swing.border;uses:="javax.swing";version="0.0.0.1_008_JavaSE", \
- javax.swing.colorchooser;uses:="javax.swing,javax.swing.border,javax.swing.event,javax.swing.text";version="0.0.0.1_008_JavaSE", \
- javax.swing.event;uses:="javax.swing,javax.swing.text,javax.swing.table,javax.swing.tree,javax.swing.undo";version="0.0.0.1_008_JavaSE", \
- javax.swing.filechooser;uses:="javax.swing";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf.basic;uses:="javax.swing.border,javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.event,javax.swing.colorchooser,javax.accessibility,javax.swing.filechooser,javax.swing.text.html,javax.sound.sampled,javax.swing.table,javax.swing.plaf.synth,javax.swing.tree";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf.metal;uses:="javax.swing.plaf,javax.swing,javax.swing.border,javax.swing.text,javax.swing.plaf.basic,javax.swing.filechooser,javax.swing.event,javax.swing.tree";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf.multi;uses:="javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf.nimbus;uses:="javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.plaf.synth";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf.synth;uses:="javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.border,javax.swing.plaf.basic,javax.swing.colorchooser,javax.swing.event,javax.xml.parsers,org.xml.sax,org.xml.sax.helpers,javax.swing.table,javax.swing.tree";version="0.0.0.1_008_JavaSE", \
- javax.swing.plaf;uses:="javax.swing,javax.swing.border,javax.accessibility,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.1_008_JavaSE", \
- javax.swing.table;uses:="javax.swing.event,javax.swing.plaf,javax.swing.border,javax.swing,javax.accessibility";version="0.0.0.1_008_JavaSE", \
- javax.swing.text.html.parser;uses:="javax.swing.text,javax.swing.text.html";version="0.0.0.1_008_JavaSE", \
- javax.swing.text.html;uses:="javax.swing.event,javax.swing.text,javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.undo";version="0.0.0.1_008_JavaSE", \
- javax.swing.text.rtf;uses:="javax.swing.text";version="0.0.0.1_008_JavaSE", \
- javax.swing.text;uses:="javax.swing.event,javax.swing.tree,javax.swing.undo,javax.swing,javax.swing.plaf,javax.swing.plaf.basic,javax.print,javax.print.attribute,javax.accessibility,javax.swing.text.html";version="0.0.0.1_008_JavaSE", \
- javax.swing.tree;uses:="javax.swing.event,javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.basic";version="0.0.0.1_008_JavaSE", \
- javax.swing.undo;uses:="javax.swing,javax.swing.event";version="0.0.0.1_008_JavaSE", \
- javax.swing;uses:="javax.swing.event,javax.accessibility,javax.swing.text,javax.swing.plaf,javax.swing.border,javax.swing.tree,javax.swing.table,javax.swing.colorchooser,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.filechooser,javax.print,javax.print.attribute,javax.swing.plaf.metal";version="0.0.0.1_008_JavaSE", \
- javax.tools;uses:="javax.lang.model.element,javax.annotation.processing,javax.lang.model";version="0.0.0.1_008_JavaSE", \
- org.ietf.jgss;version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA.DynAnyPackage;uses:="org.omg.CORBA";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA.ORBPackage;uses:="org.omg.CORBA";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA.TypeCodePackage;uses:="org.omg.CORBA";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA.portable;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA;uses:="org.omg.CORBA.portable,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA_2_3.portable,org.omg.CORBA.TypeCodePackage";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA_2_3.portable;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.CORBA_2_3;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.CosNaming.NamingContextExtPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.CosNaming.NamingContextPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.CosNaming";version="0.0.0.1_008_JavaSE", \
- org.omg.CosNaming;uses:="org.omg.CORBA.portable,org.omg.CORBA,org.omg.PortableServer,org.omg.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPackage";version="0.0.0.1_008_JavaSE", \
- org.omg.Dynamic;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.DynamicAny.DynAnyFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.DynamicAny.DynAnyPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.DynamicAny;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage";version="0.0.0.1_008_JavaSE", \
- org.omg.IOP.CodecFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.IOP.CodecPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.IOP;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage";version="0.0.0.1_008_JavaSE", \
- org.omg.Messaging;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableInterceptor.ORBInitInfoPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableInterceptor;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.CORBA_2_3.portable,org.omg.Dynamic";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer.CurrentPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer.POAManagerPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer.POAPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer.ServantLocatorPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer.portable;uses:="org.omg.CORBA,org.omg.PortableServer";version="0.0.0.1_008_JavaSE", \
- org.omg.PortableServer;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.portable,org.omg.CORBA_2_3,org.omg.PortableServer.ServantLocatorPackage";version="0.0.0.1_008_JavaSE", \
- org.omg.SendingContext;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.1_008_JavaSE", \
- org.omg.stub.java.rmi;uses:="javax.rmi.CORBA";version="0.0.0.1_008_JavaSE"
\ No newline at end of file
diff --git a/src/main/resources/sling.properties b/src/main/resources/sling.properties
index 3f95152..aca484a 100644
--- a/src/main/resources/sling.properties
+++ b/src/main/resources/sling.properties
@@ -92,7 +92,6 @@ org.apache.sling.commons.log.file = ${sling.home}/logs/error.log
org.apache.sling.commons.log.file.number = 5
org.apache.sling.commons.log.file.size = '.'yyyy-MM-dd
-
#
# To enable the current server side debugging in the Rhino interpreter
# set the org.apache.sling.scripting.javascript.debug property to true.
@@ -104,7 +103,6 @@ org.apache.sling.commons.log.file.size = '.'yyyy-MM-dd
# Logging configuration for the SCR (if installed)
ds.loglevel = ${org.apache.sling.commons.log.level}
-
#
# Space separated list of URLs to the OSGi Bundle Repository files.
# The referred to repository contains referrals to other repositories
@@ -124,7 +122,6 @@ sling.installer.dir = ${sling.launchpad}/installer
# below the application home directory.
org.osgi.framework.storage = ${sling.launchpad}/felix
-
#
# Default initial framework start level
org.osgi.framework.startlevel.beginning=30
@@ -142,38 +139,9 @@ org.osgi.framework.startlevel.beginning=30
# a start level
felix.startlevel.bundle=20
-# Enable Apache Felix URL handlers (see SLING-862)
-felix.service.urlhandlers=true
-
-#
-# Include JRE package list
-sling.include.jre = jre-${java.specification.version}.properties
-
-sling.jre-jpms= \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.base}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.compiler}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.desktop}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.management}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.management.rmi}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.naming}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.rmi}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.scripting}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.security.jgss}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.security.sasl}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.smartcardio}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.sql}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.sql.rowset}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.xml.ws.annotation}} \
- {dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.corba}}
-
-#
# Framework system packages to be visible
-org.osgi.framework.system.packages= \
- ${osgi-core-packages}, \
- ${osgi-compendium-services}, \
+org.osgi.framework.system.packages.extra= \
org.apache.sling.launchpad.api;version=1.2.0 \
- ${jre-${java.specification.version}} \
- {dollar}{sling.jre-{dollar}{felix.detect.jpms}} \
${org.apache.sling.launcher.system.packages}
# Boot delegation packages never included anywhere (usually sun.*,com.sun.*)
@@ -185,7 +153,7 @@ org.osgi.framework.system.packages= \
org.osgi.framework.bootdelegation=com.yourkit.*, \
${org.apache.sling.launcher.bootdelegation}
-#
+
# SLING-1925: boot delegate sun.reflect package
# SLING-2891: Broaden to all sun and com.sun packages
sling.bootdelegation.sun = sun.*,com.sun.*
@@ -199,50 +167,8 @@ sling.bootdelegation.weblogic = weblogic.xml.*
# IBM WebSphere XML factory support (SLING-2466)
sling.bootdelegation.ibm = com.ibm.xml.*
-#
# Extra framework capabilities
# If you modify this and are running within a war, make sure to
# also add the servlet contract capability (see SLING-5374)
org.osgi.framework.system.capabilities.extra= \
${org.apache.sling.launcher.system.capabilities.extra}
-
-#
-# Package Specifications for org.osgi.framework.system.packages
-# osgi-core-packages : OSGi Core Specification packages
-# osgi-compendium-services : OSGi Compendium Specification packages
-#
-# Note: These properties are actually prefixed with "sling." and are renamed
-# to their correct equivalent (without the "sling." prefix) when loading
-# the properties to launch the framework. This is done to be able to
-# overwrite the values from the sling.properties file in case of an
-# OSGi API update.
-
-# Only provide the OSGi packages contained in the Apache Felix framework itself
-sling.osgi-core-packages= \
- org.osgi.framework;version="1.9", \
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto", \
- org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework", \
- org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring", \
- org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework", \
- org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring", \
- org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework", \
- org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource", \
- org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework", \
- org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto", \
- org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource", \
- org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto", \
- org.osgi.resource;version="1.0", \
- org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto", \
- org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework", \
- org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework", \
- org.osgi.service.url;version="1.0", \
- org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource", \
- org.osgi.dto;version="1.1"
-
-# For compatibility we add util.tracker here, although starting
-# with R5 it's officially part of the framework.
-sling.osgi-compendium-services= \
- org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework"
-
-felix.systempackages.substitution=true
-felix.systempackages.calculate.uses=true
[sling-org-apache-sling-launchpad-base] 01/02: Adapt to felix 6.0
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch felix6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git
commit 0de0edbd2c43373f953defe4a4127be9cf2e780b
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Jun 21 17:59:32 2018 +0200
Adapt to felix 6.0
---
pom.xml | 2 +-
.../sling/launchpad/base/impl/SlingFelix.java | 28 +--------------
.../bootstrapcommands/UninstallBundleCommand.java | 8 ++---
src/main/resources/sling.properties | 42 +++++++++++-----------
4 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2c14e3e..96c0836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>5.9.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
index f77f86c..66bb354 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
@@ -27,9 +27,6 @@ import java.util.Map;
import java.util.Properties;
import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.Logger;
-import org.apache.felix.framework.util.FelixConstants;
-import org.apache.felix.framework.util.Util;
import org.apache.sling.launchpad.base.shared.Loader;
import org.apache.sling.launchpad.base.shared.Notifiable;
import org.osgi.framework.Bundle;
@@ -46,33 +43,10 @@ public class SlingFelix extends Felix {
private Method getBundleMethod;
public SlingFelix(final Notifiable notifiable, @SuppressWarnings("rawtypes") final Map props) throws Exception {
- super(getPropsAndDefaultProps(props));
+ super(props);
this.notifiable = notifiable;
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
- private static Map getPropsAndDefaultProps(final Map props) {
- final Logger logger = (Logger)props.get(FelixConstants.LOG_LOGGER_PROP);
- if ( logger != null ) {
- final Properties fullProps = new Properties();
- final Properties defaultProps = Util.loadDefaultProperties(logger);
- fullProps.putAll(defaultProps);
- fullProps.putAll(props);
-
- // replace variables
- for(final Object name : defaultProps.keySet()) {
- if ( !props.containsKey(name) ) {
- final String value = (String)fullProps.get(name);
- final String substValue = Util.substVars(value, name.toString(), null, fullProps);
- fullProps.put(name, substValue);
- }
- }
-
- return fullProps;
- }
- return props;
- }
-
@Override
public void update() throws BundleException {
update(null);
diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommand.java b/src/main/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommand.java
index 74bf38d..100d0d2 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommand.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommand.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.felix.framework.Logger;
-import org.apache.felix.framework.util.VersionRange;
+import org.osgi.framework.VersionRange;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -56,7 +56,7 @@ class UninstallBundleCommand implements Command {
if (!versionRangeStr.contains(",")) {
versionRangeStr = "[" + versionRangeStr + "," + versionRangeStr + "]";
}
- this.versionRange = VersionRange.parse(versionRangeStr);
+ this.versionRange = new VersionRange(versionRangeStr);
}
/**
@@ -97,7 +97,7 @@ class UninstallBundleCommand implements Command {
boolean refreshSystemBundle = false;
for(final Bundle b : ctx.getBundles()) {
if (b.getSymbolicName().equals(bundleSymbolicName)) {
- if (versionRange == null || versionRange.isInRange(b.getVersion())) {
+ if (versionRange == null || versionRange.includes(b.getVersion())) {
logger.log(Logger.LOG_INFO,
this + ": uninstalling bundle version " + b.getVersion());
final String fragmentHostHeader = getFragmentHostHeader(b);
@@ -152,4 +152,4 @@ class UninstallBundleCommand implements Command {
public String toString() {
return getClass().getSimpleName() + " " + bundleSymbolicName + " " + (versionRange != null ? versionRange : "");
}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/sling.properties b/src/main/resources/sling.properties
index d4f833f..3f95152 100644
--- a/src/main/resources/sling.properties
+++ b/src/main/resources/sling.properties
@@ -219,30 +219,30 @@ org.osgi.framework.system.capabilities.extra= \
# Only provide the OSGi packages contained in the Apache Felix framework itself
sling.osgi-core-packages= \
- org.osgi.dto; version=1.0.0, \
- org.osgi.framework; version=1.8.0, \
- org.osgi.framework.dto; version=1.8.0, \
- org.osgi.framework.hooks.bundle; version=1.1.0, \
- org.osgi.framework.hooks.resolver; version=1.0.0, \
- org.osgi.framework.hooks.service; version=1.1.0, \
- org.osgi.framework.hooks.weaving; version=1.1.0, \
- org.osgi.framework.launch; version=1.2.0, \
- org.osgi.framework.namespace; version=1.1.0, \
- org.osgi.framework.startlevel; version=1.0.0, \
- org.osgi.framework.startlevel.dto; version=1.0.0, \
- org.osgi.framework.wiring; version=1.2.0, \
- org.osgi.framework.wiring.dto; version=1.2.0, \
- org.osgi.resource; version=1.0.0, \
- org.osgi.resource.dto; version=1.0.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.resolver; version=1.0.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0
+ org.osgi.framework;version="1.9", \
+ org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto", \
+ org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring", \
+ org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring", \
+ org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework", \
+ org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource", \
+ org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework", \
+ org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto", \
+ org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource", \
+ org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto", \
+ org.osgi.resource;version="1.0", \
+ org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto", \
+ org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework", \
+ org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.service.url;version="1.0", \
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource", \
+ org.osgi.dto;version="1.1"
# For compatibility we add util.tracker here, although starting
# with R5 it's officially part of the framework.
sling.osgi-compendium-services= \
- org.osgi.util.tracker; version=1.5.1
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework"
felix.systempackages.substitution=true
-
+felix.systempackages.calculate.uses=true