You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/04/30 11:50:30 UTC
svn commit: r1591225 -
/sling/trunk/launchpad/base/src/main/resources/sling.properties
Author: cziegeler
Date: Wed Apr 30 09:50:29 2014
New Revision: 1591225
URL: http://svn.apache.org/r1591225
Log:
SLING-3476 : Update to latest Felix Framework
Modified:
sling/trunk/launchpad/base/src/main/resources/sling.properties
Modified: sling/trunk/launchpad/base/src/main/resources/sling.properties
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=1591225&r1=1591224&r2=1591225&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Wed Apr 30 09:50:29 2014
@@ -113,7 +113,7 @@ ds.factory.enabled = true
obr.repository.url = http://sling.apache.org/obr/repository.xml
#
-# Felix Configuration Admin File Persistence Configuration file directory
+# Apache Felix Configuration Admin File Persistence Configuration file directory
felix.cm.dir = ${sling.launchpad}/config
#
@@ -121,7 +121,7 @@ felix.cm.dir = ${sling.launchpad}/config
sling.installer.dir = ${sling.launchpad}/installer
#
-# Felix Framework profile directory. This is by default the "felix" directory
+# OSGi Framework profile directory. This is by default the "felix" directory
# below the application home directory.
org.osgi.framework.storage = ${sling.launchpad}/felix
@@ -143,7 +143,7 @@ org.osgi.framework.startlevel.beginning=
# a start level
felix.startlevel.bundle=20
-# Enable Felix URL handlers (see SLING-862)
+# Enable Apache Felix URL handlers (see SLING-862)
felix.service.urlhandlers=true
#
@@ -204,7 +204,7 @@ sling.bootdelegation.ibm = com.ibm.xml.*
# overwrite the values from the sling.properties file in case of an
# OSGi API update.
-# Only provide the OSGi packages contained in the Felix framework itself
+# Only provide the OSGi packages contained in the Apache Felix framework itself
sling.osgi-core-packages= \
org.osgi.framework; version=1.7.0, \
org.osgi.framework.hooks.bundle; version=1.1.0, \
@@ -220,6 +220,6 @@ sling.osgi-core-packages= \
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0
-# Only provide the tracker (from the felix framework)
+# Only provide the tracker (from the Apache felix framework)
sling.osgi-compendium-services= \
org.osgi.util.tracker;version="1.5.1"
\ No newline at end of file