Bug 385851 - Adds org.osgi.framework.system.capabilities section and some more imports available in Equinox R4.2.2.
diff --git a/jetty-server/src/main/dist/configuration/java-server.profile b/jetty-server/src/main/dist/configuration/java-server.profile
index 9fea1b4..8d5c5a6 100644
--- a/jetty-server/src/main/dist/configuration/java-server.profile
+++ b/jetty-server/src/main/dist/configuration/java-server.profile
@@ -75,6 +75,7 @@
javax.swing.plaf.basic,\
javax.swing.plaf.metal,\
javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
javax.swing.plaf.synth,\
javax.swing.table,\
javax.swing.text,\
@@ -145,6 +146,9 @@
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.spi.http,\
+ javax.xml.ws.spi.http;version="2.1.1",\
+ javax.xml.ws.wsaddressing,\
javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
org.eclipse.virgo.kernel.equinox.extensions,\
@@ -189,26 +193,35 @@
org.w3c.dom.ranges,\
org.w3c.dom.stylesheets,\
org.w3c.dom.traversal,\
- org.w3c.dom.views ,\
+ org.w3c.dom.views,\
org.w3c.dom.xpath,\
org.xml.sax,\
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
org.eclipse.virgo.nano.authentication,\
- com.sun.*,\
+ javax.*,\
javax.xml.*,\
org.apache.xerces.jaxp.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
org.w3c.*,\
org.xml.*,\
- sun.*
+ sun.*,\
+ com.sun.*
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JRE-1.1,\
J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6,\
JavaSE-1.7
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7"
osgi.java.profile.name = Virgo-Java7
diff --git a/kernel/src/main/dist/configuration/java-server.profile b/kernel/src/main/dist/configuration/java-server.profile
index 9fea1b4..8d5c5a6 100644
--- a/kernel/src/main/dist/configuration/java-server.profile
+++ b/kernel/src/main/dist/configuration/java-server.profile
@@ -75,6 +75,7 @@
javax.swing.plaf.basic,\
javax.swing.plaf.metal,\
javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
javax.swing.plaf.synth,\
javax.swing.table,\
javax.swing.text,\
@@ -145,6 +146,9 @@
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.spi.http,\
+ javax.xml.ws.spi.http;version="2.1.1",\
+ javax.xml.ws.wsaddressing,\
javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
org.eclipse.virgo.kernel.equinox.extensions,\
@@ -189,26 +193,35 @@
org.w3c.dom.ranges,\
org.w3c.dom.stylesheets,\
org.w3c.dom.traversal,\
- org.w3c.dom.views ,\
+ org.w3c.dom.views,\
org.w3c.dom.xpath,\
org.xml.sax,\
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
org.eclipse.virgo.nano.authentication,\
- com.sun.*,\
+ javax.*,\
javax.xml.*,\
org.apache.xerces.jaxp.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
org.w3c.*,\
org.xml.*,\
- sun.*
+ sun.*,\
+ com.sun.*
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JRE-1.1,\
J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6,\
JavaSE-1.7
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7"
osgi.java.profile.name = Virgo-Java7
diff --git a/nano/src/main/dist/configuration/java-server.profile b/nano/src/main/dist/configuration/java-server.profile
index 9fea1b4..8d5c5a6 100644
--- a/nano/src/main/dist/configuration/java-server.profile
+++ b/nano/src/main/dist/configuration/java-server.profile
@@ -75,6 +75,7 @@
javax.swing.plaf.basic,\
javax.swing.plaf.metal,\
javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
javax.swing.plaf.synth,\
javax.swing.table,\
javax.swing.text,\
@@ -145,6 +146,9 @@
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.spi.http,\
+ javax.xml.ws.spi.http;version="2.1.1",\
+ javax.xml.ws.wsaddressing,\
javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
org.eclipse.virgo.kernel.equinox.extensions,\
@@ -189,26 +193,35 @@
org.w3c.dom.ranges,\
org.w3c.dom.stylesheets,\
org.w3c.dom.traversal,\
- org.w3c.dom.views ,\
+ org.w3c.dom.views,\
org.w3c.dom.xpath,\
org.xml.sax,\
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
org.eclipse.virgo.nano.authentication,\
- com.sun.*,\
+ javax.*,\
javax.xml.*,\
org.apache.xerces.jaxp.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
org.w3c.*,\
org.xml.*,\
- sun.*
+ sun.*,\
+ com.sun.*
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JRE-1.1,\
J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6,\
JavaSE-1.7
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7"
osgi.java.profile.name = Virgo-Java7
diff --git a/tomcat-server/src/main/dist/configuration/java-server.profile b/tomcat-server/src/main/dist/configuration/java-server.profile
index 9fea1b4..8d5c5a6 100644
--- a/tomcat-server/src/main/dist/configuration/java-server.profile
+++ b/tomcat-server/src/main/dist/configuration/java-server.profile
@@ -75,6 +75,7 @@
javax.swing.plaf.basic,\
javax.swing.plaf.metal,\
javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
javax.swing.plaf.synth,\
javax.swing.table,\
javax.swing.text,\
@@ -145,6 +146,9 @@
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.spi.http,\
+ javax.xml.ws.spi.http;version="2.1.1",\
+ javax.xml.ws.wsaddressing,\
javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
org.eclipse.virgo.kernel.equinox.extensions,\
@@ -189,26 +193,35 @@
org.w3c.dom.ranges,\
org.w3c.dom.stylesheets,\
org.w3c.dom.traversal,\
- org.w3c.dom.views ,\
+ org.w3c.dom.views,\
org.w3c.dom.xpath,\
org.xml.sax,\
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
org.eclipse.virgo.nano.authentication,\
- com.sun.*,\
+ javax.*,\
javax.xml.*,\
org.apache.xerces.jaxp.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
org.w3c.*,\
org.xml.*,\
- sun.*
+ sun.*,\
+ com.sun.*
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JRE-1.1,\
J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6,\
JavaSE-1.7
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7"
osgi.java.profile.name = Virgo-Java7
