Author: genspring
Date: Tue Sep  6 05:14:18 2011
New Revision: 1165499

URL: http://svn.apache.org/viewvc?rev=1165499&view=rev
Log:
GERONIMO-6139 Support Java 1.7 Runtime, use Ivan's proposal to add a profile for jre 1.7.

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1165499&r1=1165498&r2=1165499&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Tue Sep  6 05:14:18 2011
@@ -58,7 +58,7 @@ org.osgi.framework.system.packages.extra
 org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.management.remote.rmi,javax.rmi.ssl,javax.transaction,javax.transaction.*,com.ibm.security.*,org.apache.harmony.*,com.ibm.oti.*
 
 # OSGi Execution Environment
-org.osgi.framework.executionenvironment=OSGi/Minimum-1.2,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6
+org.osgi.framework.executionenvironment=OSGi/Minimum-1.2,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6,JavaSE-1.7
 
 # To enable the use of the startup.properties file to control the start level:
 karaf.auto.start=startup.properties
@@ -249,6 +249,178 @@ jre-1.6=, \
  org.xml.sax.helpers
 
 #
+# Java platform package export properties.
+#
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute
+jre-1.7=, \
+ javax.accessibility, \
+ javax.activity, \
+ javax.annotation.processing, \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ 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.net, \
+ javax.net.ssl, \
+ 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.cert, \
+ 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.nimbus, \
+ 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; version=1.1; partial=true; mandatory:=partial, \
+ javax.xml, \
+ 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; version=1.0, \
+ javax.xml.parsers, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.BiDirPolicy, \
+ org.omg.CONV_FRAME, \
+ org.omg.CORBA, \
+ org.omg.CORBA.ContainedPackage, \
+ org.omg.CORBA.ContainerPackage, \
+ org.omg.CORBA.InterfaceDefPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.PollableSetPackage, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CORBA.ValueDefPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA_2_4, \
+ org.omg.CORBA_2_4.portable, \
+ org.omg.CSI, \
+ org.omg.CSIIOP, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.CosTSInteroperation, \
+ org.omg.CosTransactions, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.GIOP, \
+ org.omg.GSSUP, \
+ org.omg.IIOP, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.MessageRouting, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerFactoryPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.SSLIOP, \
+ org.omg.Security, \
+ org.omg.SecurityLevel1, \
+ org.omg.SecurityLevel2, \
+ org.omg.SendingContext, \
+ org.omg.SendingContext.CodeBasePackage, \
+ org.omg.TimeBase, \
+ 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  
+
+#
 # Equinox: Disable bundle file number limit
 #
 osgi.bundlefile.limit=0