Move UUID initialization to Provisioning plugin.

2 files changed, 9 insertions, 13 deletions

diff --git a/src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java b/src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java
index 2b95559..4232006 100644
--- a/src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java
@@ -46,12 +46,6 @@ public class ConfigurationServiceImpl
         = "net.java.sip.communicator.SYS_PROPS_FILE_NAME";
 
     /**
-     * Name of the UUID property.
-     */
-    private static final String UUID_PROPERTY
-        = "net.java.sip.communicator.UUID";
-
-    /**
      * A reference to the currently used configuration file.
      */
     private File configurationFile = null;
@@ -568,13 +562,6 @@ public class ConfigurationServiceImpl
         {
             logger.error("Failed to load the configuration file", ex);
         }
-
-        String uuid = (String)getProperty(UUID_PROPERTY);
-        if(uuid == null || uuid.equals(""))
-        {
-            uuid = UUID.randomUUID().toString();
-            setProperty(UUID_PROPERTY, uuid);
-        }
     }
 
     /*
diff --git a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
index 5e2de4f..fa72ea2 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
+++ b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
@@ -138,6 +138,15 @@ public class ProvisioningActivator
 
         ProvisioningActivator.bundleContext = bundleContext;
 
+        String uuid = (String)getConfigurationService().getProperty(
+                PROVISIONING_UUID_PROP);
+
+        if(uuid == null || uuid.equals(""))
+        {
+            uuid = UUID.randomUUID().toString();
+            getConfigurationService().setProperty(PROVISIONING_UUID_PROP, uuid);
+        }
+
         Dictionary<String, String> properties = new Hashtable<String, String>();
         properties.put( ConfigurationForm.FORM_TYPE,
                         ConfigurationForm.ADVANCED_TYPE);