Merge my changes from alpha2 branch (mostly improvements to SIMPLE, usage of transactions for contactlist.xml and fix the wrong location of jain-sip logs).

1 files changed, 7 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
index cf16fc4..e08bd69 100644
--- a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
+++ b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
@@ -17,6 +17,11 @@ import net.java.sip.communicator.util.*;
 public class ConfigurationActivator
     implements BundleActivator
 {
+    /**
+     * The current bundle context
+     */
+    public static BundleContext bundleContext;
+    
     private Logger logger = Logger.getLogger(ConfigurationServiceImpl.class);
     private ConfigurationServiceImpl impl = new ConfigurationServiceImpl();
 
@@ -30,7 +35,8 @@ public class ConfigurationActivator
     public void start(BundleContext bundleContext) throws Exception
     {
         logger.debug("Service Impl: " + getClass().getName() + " [  STARTED ]");
-
+        
+        this.bundleContext = bundleContext;
         impl.start();
 
         bundleContext.registerService(ConfigurationService.class.getName(),