Author: gnodet
Date: Fri Apr 30 09:20:02 2010
New Revision: 939595
URL: http://svn.apache.org/viewvc?rev=939595&view=rev
Log:
FELIX-2310: Karaf framework environment is not set correctly
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties?rev=939595&r1=939594&r2=939595&view=diff
==============================================================================
---
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
(original)
+++
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
Fri Apr 30 09:20:02 2010
@@ -47,6 +47,9 @@ org.osgi.framework.system.packages.extra
# javax.transaction is needed to avoid class loader constraint violation when
using javax.sql
org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*
+# OSGi Execution Environment
+org.osgi.framework.executionenvironment=J2SE-1.5
+
# To enable the use of the startup.properties file to control the start level:
karaf.auto.start=startup.properties
#felix.auto.start=all