Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 46934 invoked from network); 30 Apr 2010 09:20:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Apr 2010 09:20:57 -0000 Received: (qmail 94096 invoked by uid 500); 30 Apr 2010 09:20:57 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 94008 invoked by uid 500); 30 Apr 2010 09:20:56 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 94000 invoked by uid 99); 30 Apr 2010 09:20:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Apr 2010 09:20:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Apr 2010 09:20:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D887D23888E3; Fri, 30 Apr 2010 09:20:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r939595 - /felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties Date: Fri, 30 Apr 2010 09:20:02 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100430092002.D887D23888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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