Applied patch (FELIX-201) to add support for Java 1.6.0 to the main
launcher and to the felix launcher plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@503517 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index 4da42aa..b12cb2d 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -305,3 +305,215 @@
org.xml.sax.ext; \
org.xml.sax.helpers; \
version="1.5.0"
+
+jre-1.6=, \
+ java.applet; \
+ java.awt; \
+ java.awt.color; \
+ java.awt.datatransfer; \
+ java.awt.dnd; \
+ java.awt.dnd.peer; \
+ java.awt.event; \
+ java.awt.font; \
+ java.awt.geom; \
+ java.awt.im; \
+ java.awt.image; \
+ java.awt.image.renderable; \
+ java.awt.im.spi; \
+ java.awt.peer; \
+ java.awt.print; \
+ java.beans; \
+ java.beans.beancontext; \
+ java.io; \
+ java.lang; \
+ java.lang.annotation; \
+ java.lang.instrument; \
+ java.lang.management; \
+ java.lang.ref; \
+ java.lang.reflect; \
+ java.math; \
+ java.net; \
+ java.nio; \
+ java.nio.channels; \
+ java.nio.channels.spi; \
+ java.nio.charset; \
+ java.nio.charset.spi; \
+ java.rmi; \
+ java.rmi.activation; \
+ java.rmi.dgc; \
+ java.rmi.registry; \
+ java.rmi.server; \
+ java.security; \
+ java.security.acl; \
+ java.security.cert; \
+ java.security.interfaces; \
+ java.security.spec; \
+ java.sql; \
+ java.text; \
+ java.text.spi; \
+ java.util; \
+ java.util.concurrent; \
+ java.util.concurrent.atomic; \
+ java.util.concurrent.locks; \
+ java.util.jar; \
+ java.util.logging; \
+ java.util.prefs; \
+ java.util.regex; \
+ java.util.spi; \
+ java.util.zip; \
+ javax.accessibility; \
+ javax.activation; \
+ javax.activity; \
+ javax.annotation; \
+ javax.annotation.processing; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.jws; \
+ javax.jws.soap; \
+ javax.lang.model; \
+ javax.lang.model.element; \
+ javax.lang.model.type; \
+ javax.lang.model.util; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.script; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.sasl; \
+ javax.smartcardio; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.tools; \
+ javax.transaction; \
+ javax.transaction.xa; \
+ javax.xml; \
+ javax.xml.bind; \
+ javax.xml.bind.annotation; \
+ javax.xml.bind.annotation.adapters; \
+ javax.xml.bind.attachment; \
+ javax.xml.bind.helpers; \
+ javax.xml.bind.util; \
+ javax.xml.crypto; \
+ javax.xml.crypto.dom; \
+ javax.xml.crypto.dsig; \
+ javax.xml.crypto.dsig.dom; \
+ javax.xml.crypto.dsig.keyinfo; \
+ javax.xml.crypto.dsig.spec; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.soap; \
+ javax.xml.stream; \
+ javax.xml.stream.events; \
+ javax.xml.stream.util; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.ws; \
+ javax.xml.ws.handler; \
+ javax.xml.ws.handler.soap; \
+ javax.xml.ws.http; \
+ javax.xml.ws.soap; \
+ javax.xml.ws.spi; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.jcp.xml.dsig.internal; \
+ org.jcp.xml.dsig.internal.dom; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.w3c.dom.xpath; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version=\"1.6.0\"
diff --git a/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java b/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
index 153f1c3..a2f4a70 100644
--- a/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
+++ b/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
@@ -339,6 +339,218 @@
"org.xml.sax.helpers;" +
"version=\"1.5.0\"";
+ private static final String JRE_1_6_PACKAGES =
+ "java.applet;" +
+ "java.awt;" +
+ "java.awt.color;" +
+ "java.awt.datatransfer;" +
+ "java.awt.dnd;" +
+ "java.awt.dnd.peer;" +
+ "java.awt.event;" +
+ "java.awt.font;" +
+ "java.awt.geom;" +
+ "java.awt.im;" +
+ "java.awt.image;" +
+ "java.awt.image.renderable;" +
+ "java.awt.im.spi;" +
+ "java.awt.peer;" +
+ "java.awt.print;" +
+ "java.beans;" +
+ "java.beans.beancontext;" +
+ "java.io;" +
+ "java.lang;" +
+ "java.lang.annotation;" +
+ "java.lang.instrument;" +
+ "java.lang.management;" +
+ "java.lang.ref;" +
+ "java.lang.reflect;" +
+ "java.math;" +
+ "java.net;" +
+ "java.nio;" +
+ "java.nio.channels;" +
+ "java.nio.channels.spi;" +
+ "java.nio.charset;" +
+ "java.nio.charset.spi;" +
+ "java.rmi;" +
+ "java.rmi.activation;" +
+ "java.rmi.dgc;" +
+ "java.rmi.registry;" +
+ "java.rmi.server;" +
+ "java.security;" +
+ "java.security.acl;" +
+ "java.security.cert;" +
+ "java.security.interfaces;" +
+ "java.security.spec;" +
+ "java.sql;" +
+ "java.text;" +
+ "java.text.spi;" +
+ "java.util;" +
+ "java.util.concurrent;" +
+ "java.util.concurrent.atomic;" +
+ "java.util.concurrent.locks;" +
+ "java.util.jar;" +
+ "java.util.logging;" +
+ "java.util.prefs;" +
+ "java.util.regex;" +
+ "java.util.spi;" +
+ "java.util.zip;" +
+ "javax.accessibility;" +
+ "javax.activation;" +
+ "javax.activity;" +
+ "javax.annotation;" +
+ "javax.annotation.processing;" +
+ "javax.imageio;" +
+ "javax.imageio.event;" +
+ "javax.imageio.metadata;" +
+ "javax.imageio.plugins.bmp;" +
+ "javax.imageio.plugins.jpeg;" +
+ "javax.imageio.spi;" +
+ "javax.imageio.stream;" +
+ "javax.jws;" +
+ "javax.jws.soap;" +
+ "javax.lang.model;" +
+ "javax.lang.model.element;" +
+ "javax.lang.model.type;" +
+ "javax.lang.model.util;" +
+ "javax.management;" +
+ "javax.management.loading;" +
+ "javax.management.modelmbean;" +
+ "javax.management.monitor;" +
+ "javax.management.openmbean;" +
+ "javax.management.relation;" +
+ "javax.management.remote;" +
+ "javax.management.remote.rmi;" +
+ "javax.management.timer;" +
+ "javax.naming;" +
+ "javax.naming.directory;" +
+ "javax.naming.event;" +
+ "javax.naming.ldap;" +
+ "javax.naming.spi;" +
+ "javax.print;" +
+ "javax.print.attribute;" +
+ "javax.print.attribute.standard;" +
+ "javax.print.event;" +
+ "javax.rmi;" +
+ "javax.rmi.CORBA;" +
+ "javax.rmi.ssl;" +
+ "javax.script;" +
+ "javax.security.auth;" +
+ "javax.security.auth.callback;" +
+ "javax.security.auth.kerberos;" +
+ "javax.security.auth.login;" +
+ "javax.security.auth.spi;" +
+ "javax.security.auth.x500;" +
+ "javax.security.sasl;" +
+ "javax.smartcardio;" +
+ "javax.sound.midi;" +
+ "javax.sound.midi.spi;" +
+ "javax.sound.sampled;" +
+ "javax.sound.sampled.spi;" +
+ "javax.sql;" +
+ "javax.sql.rowset;" +
+ "javax.sql.rowset.serial;" +
+ "javax.sql.rowset.spi;" +
+ "javax.swing;" +
+ "javax.swing.border;" +
+ "javax.swing.colorchooser;" +
+ "javax.swing.event;" +
+ "javax.swing.filechooser;" +
+ "javax.swing.plaf;" +
+ "javax.swing.plaf.basic;" +
+ "javax.swing.plaf.metal;" +
+ "javax.swing.plaf.multi;" +
+ "javax.swing.plaf.synth;" +
+ "javax.swing.table;" +
+ "javax.swing.text;" +
+ "javax.swing.text.html;" +
+ "javax.swing.text.html.parser;" +
+ "javax.swing.text.rtf;" +
+ "javax.swing.tree;" +
+ "javax.swing.undo;" +
+ "javax.tools;" +
+ "javax.transaction;" +
+ "javax.transaction.xa;" +
+ "javax.xml;" +
+ "javax.xml.bind;" +
+ "javax.xml.bind.annotation;" +
+ "javax.xml.bind.annotation.adapters;" +
+ "javax.xml.bind.attachment;" +
+ "javax.xml.bind.helpers;" +
+ "javax.xml.bind.util;" +
+ "javax.xml.crypto;" +
+ "javax.xml.crypto.dom;" +
+ "javax.xml.crypto.dsig;" +
+ "javax.xml.crypto.dsig.dom;" +
+ "javax.xml.crypto.dsig.keyinfo;" +
+ "javax.xml.crypto.dsig.spec;" +
+ "javax.xml.datatype;" +
+ "javax.xml.namespace;" +
+ "javax.xml.parsers;" +
+ "javax.xml.soap;" +
+ "javax.xml.stream;" +
+ "javax.xml.stream.events;" +
+ "javax.xml.stream.util;" +
+ "javax.xml.transform;" +
+ "javax.xml.transform.dom;" +
+ "javax.xml.transform.sax;" +
+ "javax.xml.transform.stax;" +
+ "javax.xml.transform.stream;" +
+ "javax.xml.validation;" +
+ "javax.xml.ws;" +
+ "javax.xml.ws.handler;" +
+ "javax.xml.ws.handler.soap;" +
+ "javax.xml.ws.http;" +
+ "javax.xml.ws.soap;" +
+ "javax.xml.ws.spi;" +
+ "javax.xml.xpath;" +
+ "org.ietf.jgss;" +
+ "org.jcp.xml.dsig.internal;" +
+ "org.jcp.xml.dsig.internal.dom;" +
+ "org.omg.CORBA;" +
+ "org.omg.CORBA_2_3;" +
+ "org.omg.CORBA_2_3.portable;" +
+ "org.omg.CORBA.DynAnyPackage;" +
+ "org.omg.CORBA.ORBPackage;" +
+ "org.omg.CORBA.portable;" +
+ "org.omg.CORBA.TypeCodePackage;" +
+ "org.omg.CosNaming;" +
+ "org.omg.CosNaming.NamingContextExtPackage;" +
+ "org.omg.CosNaming.NamingContextPackage;" +
+ "org.omg.Dynamic;" +
+ "org.omg.DynamicAny;" +
+ "org.omg.DynamicAny.DynAnyFactoryPackage;" +
+ "org.omg.DynamicAny.DynAnyPackage;" +
+ "org.omg.IOP;" +
+ "org.omg.IOP.CodecFactoryPackage;" +
+ "org.omg.IOP.CodecPackage;" +
+ "org.omg.Messaging;" +
+ "org.omg.PortableInterceptor;" +
+ "org.omg.PortableInterceptor.ORBInitInfoPackage;" +
+ "org.omg.PortableServer;" +
+ "org.omg.PortableServer.CurrentPackage;" +
+ "org.omg.PortableServer.POAManagerPackage;" +
+ "org.omg.PortableServer.POAPackage;" +
+ "org.omg.PortableServer.portable;" +
+ "org.omg.PortableServer.ServantLocatorPackage;" +
+ "org.omg.SendingContext;" +
+ "org.omg.stub.java.rmi;" +
+ "org.omg.stub.javax.management.remote.rmi;" +
+ "org.w3c.dom;" +
+ "org.w3c.dom.bootstrap;" +
+ "org.w3c.dom.css;" +
+ "org.w3c.dom.events;" +
+ "org.w3c.dom.html;" +
+ "org.w3c.dom.ls;" +
+ "org.w3c.dom.ranges;" +
+ "org.w3c.dom.stylesheets;" +
+ "org.w3c.dom.traversal;" +
+ "org.w3c.dom.views;" +
+ "org.w3c.dom.xpath;" +
+ "org.xml.sax;" +
+ "org.xml.sax.ext;" +
+ "org.xml.sax.helpers;" +
+ "version=\"1.6.0\"";
+
/**
* The name of the felix cache profile.
*
@@ -426,6 +638,10 @@
{
buf.append( JRE_1_5_PACKAGES );
}
+ else if ( version.indexOf( "1.6" ) != -1 )
+ {
+ buf.append( JRE_1_6_PACKAGES );
+ }
else
{
throw new IllegalStateException( "java.version = " + version + " is not recognized" );