You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/10/10 20:08:59 UTC
svn commit: r1764174 - in /felix/trunk/prefs: pom.xml
src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
Author: cziegeler
Date: Mon Oct 10 20:08:59 2016
New Revision: 1764174
URL: http://svn.apache.org/viewvc?rev=1764174&view=rev
Log:
FELIX-2984 : org.osgi.service.log should not be mandatory
Modified:
felix/trunk/prefs/pom.xml
felix/trunk/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
Modified: felix/trunk/prefs/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/pom.xml?rev=1764174&r1=1764173&r2=1764174&view=diff
==============================================================================
--- felix/trunk/prefs/pom.xml (original)
+++ felix/trunk/prefs/pom.xml Mon Oct 10 20:08:59 2016
@@ -95,12 +95,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.log</artifactId>
- <version>1.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.prefs</artifactId>
<version>1.1.1</version>
</dependency>
Modified: felix/trunk/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java?rev=1764174&r1=1764173&r2=1764174&view=diff
==============================================================================
--- felix/trunk/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java (original)
+++ felix/trunk/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java Mon Oct 10 20:08:59 2016
@@ -32,7 +32,6 @@ import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.log.LogService;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.PreferencesService;
import org.osgi.util.tracker.ServiceTracker;
@@ -59,9 +58,6 @@ public class PreferencesManager
/** The backing store service tracker. */
protected ServiceTracker<BackingStore, BackingStore> storeTracker;
- /** The service tracker for the log service. */
- protected ServiceTracker logTracker;
-
/** The default store which is used if no service can be found. */
protected BackingStore defaultStore;
@@ -96,10 +92,6 @@ public class PreferencesManager
public void start(final BundleContext context) throws Exception {
this.context = context;
- // track the log service using a ServiceTracker
- this.logTracker = new ServiceTracker(context, LogService.class.getName(), null);
- this.logTracker.open();
-
// create the tracker for our backing store
this.storeTracker = new ServiceTracker<BackingStore, BackingStore>(context, BackingStore.class, null);
this.storeTracker.open();
@@ -131,11 +123,6 @@ public class PreferencesManager
}
this.defaultStore = null;
- // stop tracking log service
- if (this.logTracker != null) {
- this.logTracker.close();
- this.logTracker = null;
- }
this.context = null;
}
@@ -195,14 +182,6 @@ public class PreferencesManager
}
}
- protected void log(final int level, final String message, final Throwable t) {
- final LogService log = (LogService) this.logTracker.getService();
- if (log != null) {
- log.log(level, message, t);
- return;
- }
- }
-
/**
* @see org.apache.felix.prefs.BackingStoreManager#getStore()
*/