Index: xword/XWikiLib/LoginData.cs
===================================================================
--- xword/XWikiLib/LoginData.cs	(revision 0)
+++ xword/XWikiLib/LoginData.cs	(revision 0)
@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO.IsolatedStorage;
+using System.IO;
+
+namespace XWiki
+{
+    /// <summary>
+    /// Provindes functionality for storing authentication data. 
+    /// </summary>
+    public class LoginData
+    {
+        public const string XWORD_LOGIN_DATA_FILENAME = "XWordLoginData";
+
+        private string filename;
+
+        /// <summary>
+        /// Creates an instance of the <code>LoginData</code>.
+        /// </summary>
+        /// <param name="filename">
+        /// Name of the file in which the authentication data will be stored.
+        /// Default is <code>LoginData.XWORD_LOGIN_DATA_FILENAME</code>;
+        /// </param>
+        public LoginData(string filename)
+        {
+            if (filename != null)
+            {
+                this.filename = filename;
+            }
+            else
+            {
+                this.filename = XWORD_LOGIN_DATA_FILENAME;
+            }
+        }
+
+        /// <summary>
+        /// Writes the user credentials to the disk for automatic login
+        /// </summary>
+        /// <param name="credentials">Array of strings containing the credentials</param>
+        /// <returns>True if the operation is uscessfull. False otherwise.</returns>
+        public bool WriteCredentials(String[] credentials)
+        {
+            IsolatedStorageFile isFile = null;
+            IsolatedStorageFileStream stream = null;
+            StreamWriter writer = null;
+
+            bool successfulWrite = false;
+
+            try
+            {
+
+                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
+                stream = new IsolatedStorageFileStream(filename, FileMode.Create, isFile);
+                writer = new StreamWriter(stream);
+                foreach (String s in credentials)
+                {
+                    writer.WriteLine(s);
+                }
+                successfulWrite = true;
+            }
+            catch (IOException ioException)
+            {
+                Log.Exception(ioException);
+            }
+            catch (Exception exception)
+            {
+                Log.Exception(exception);
+            }
+            finally
+            {
+                if (writer != null)
+                {
+                    writer.Close();
+                }
+                if (stream != null)
+                {
+                    stream.Close();
+                }
+                if (isFile != null)
+                {
+                    isFile.Dispose();
+                    isFile.Close();
+                }
+            }
+
+            return successfulWrite;
+        }
+        /// <summary>
+        /// Gets the last used credentials.
+        /// </summary>
+        /// <returns>Array of strings containing the last used credentials</returns>
+        public String[] GetCredentials()
+        {
+            String[] credentials = new String[3];
+            IsolatedStorageFile isFile = null;
+            IsolatedStorageFileStream stream = null;
+            StreamReader reader = null;
+            try
+            {
+                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
+                stream = new IsolatedStorageFileStream(filename, FileMode.Open, isFile);
+                reader = new StreamReader(stream);
+                int i = 0;
+                while (!reader.EndOfStream)
+                {
+                    String s = reader.ReadLine();
+                    credentials[i] = s;
+                    i++;
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.ExceptionSummary(ex);
+                credentials = null;
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.Close();
+                }
+                if (stream != null)
+                {
+                    stream.Close();
+                }
+                if (isFile != null)
+                {
+                    isFile.Dispose();
+                    isFile.Close();
+                }
+
+            }
+            return credentials;
+        }
+
+        /// <summary>
+        /// Erases the last saved credentials form isolated storage.
+        /// </summary>
+        public void ClearCredentials()
+        {
+            IsolatedStorageFile isFile = null;
+            try
+            {
+                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
+                isFile.DeleteFile(filename);
+            }
+            catch (IsolatedStorageException ex)
+            {
+                Log.ExceptionSummary(ex);
+            }
+            finally
+            {
+                if (isFile != null)
+                {
+                    isFile.Dispose();
+                    isFile.Close();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Specifies if the last user saved his credentials for autologin.
+        /// </summary>
+        /// <returns></returns>
+        public bool CanAutoLogin()
+        {
+            IsolatedStorageFile isFile = null;
+            bool canAutoLogin = false;
+
+            try
+            {
+                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
+                canAutoLogin = (isFile.GetFileNames(filename).Length > 0);
+            }
+            catch (Exception exception)
+            {
+                Log.Exception(exception);
+            }
+            finally
+            {
+                if (isFile != null)
+                {
+                    isFile.Dispose();
+                    isFile.Close();
+                }
+            }
+
+            return canAutoLogin;
+        }
+
+
+    }
+}
Index: xword/XWikiLib/XWikiLib.csproj
===================================================================
--- xword/XWikiLib/XWikiLib.csproj	(revision 22911)
+++ xword/XWikiLib/XWikiLib.csproj	(working copy)
@@ -61,6 +61,7 @@
   <ItemGroup>
     <Compile Include="Logging\Log.cs" />
     <Compile Include="Logging\UserNotifier.cs" />
+    <Compile Include="LoginData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
Index: xword/XWord/AddinSettingsFormManager.cs
===================================================================
--- xword/XWord/AddinSettingsFormManager.cs	(revision 22911)
+++ xword/XWord/AddinSettingsFormManager.cs	(working copy)
@@ -184,7 +184,7 @@
             addin.serverURL = addinSettingsForm.ServerURL;
             addin.username = addinSettingsForm.UserName;
             addin.password = addinSettingsForm.Password;
-            LoginData loginData = new LoginData();
+            LoginData loginData = new LoginData(LoginData.XWORD_LOGIN_DATA_FILENAME);
             addin.Client = XWikiClientFactory.CreateXWikiClient(addin.ClientType,
                 addin.serverURL, addin.username, addin.password);
 
Index: xword/XWord/Login.cs
===================================================================
--- xword/XWord/Login.cs	(revision 22911)
+++ xword/XWord/Login.cs	(working copy)
@@ -1,174 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Security = System.Security;
-using System.IO;
-using System.IO.IsolatedStorage;
-using XWiki;
-
-namespace XWord
-{
-    /// <summary>
-    /// Provindes functionality for storing authentication data. 
-    /// </summary>
-    public class LoginData
-    {
-        private string filename = "XWordLoginData";
-
-        /// <summary>
-        /// Writes the user credentials to the disk for automatic login
-        /// </summary>
-        /// <param name="credentials">Array of strings containing the credentials</param>
-        /// <returns>True if the operation is uscessfull. False otherwise.</returns>
-        public bool WriteCredentials(String[] credentials)
-        {
-            IsolatedStorageFile isFile = null;
-            IsolatedStorageFileStream stream = null;
-            StreamWriter writer = null;
-
-            bool successfulWrite = false;
-
-            try
-            {
-
-                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
-                stream = new IsolatedStorageFileStream(filename, FileMode.Create, isFile);
-                writer = new StreamWriter(stream);
-                foreach (String s in credentials)
-                {
-                    writer.WriteLine(s);
-                }
-                successfulWrite = true;
-            }
-            catch (IOException ioException)
-            {
-                Log.Exception(ioException);
-            }
-            catch (Exception exception)
-            {
-                Log.Exception(exception);
-            }
-            finally
-            {
-                if (writer != null)
-                {
-                    writer.Close();
-                }
-                if (stream != null)
-                {
-                    stream.Close();
-                }
-                if (isFile != null)
-                {
-                    isFile.Dispose();
-                    isFile.Close();
-                }
-            }
-
-            return successfulWrite;
-        }
-        /// <summary>
-        /// Gets the last used credentials.
-        /// </summary>
-        /// <returns>Array of strings containing the last used credentials</returns>
-        public String[] GetCredentials()
-        {
-            String[] credentials = new String[3];
-            IsolatedStorageFile isFile=null;
-            IsolatedStorageFileStream stream = null;
-            StreamReader reader = null;
-            try
-            {
-                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
-                stream = new IsolatedStorageFileStream(filename, FileMode.Open, isFile);
-                reader = new StreamReader(stream);
-                int i = 0;
-                while (!reader.EndOfStream)
-                {
-                    String s = reader.ReadLine();
-                    credentials[i] = s;
-                    i++;
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.ExceptionSummary(ex);
-                credentials = null;
-            }
-            finally
-            {
-                if (reader != null)
-                { 
-                    reader.Close(); 
-                }
-                if (stream != null)
-                {
-                    stream.Close();
-                }
-                if (isFile != null)
-                {
-                    isFile.Dispose();
-                    isFile.Close();
-                }
-
-            }
-            return credentials;
-        }
-
-        /// <summary>
-        /// Erases the last saved credentials form isolated storage.
-        /// </summary>
-        public void ClearCredentials()
-        {
-            IsolatedStorageFile isFile=null;
-            try
-            {
-                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
-                isFile.DeleteFile(filename);
-            }
-            catch (IsolatedStorageException ex)
-            {
-                Log.ExceptionSummary(ex);
-            }
-            finally
-            {
-                if (isFile != null)
-                {
-                    isFile.Dispose();
-                    isFile.Close();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Specifies if the last user saved his credentials for autologin.
-        /// </summary>
-        /// <returns></returns>
-        public bool CanAutoLogin()
-        {
-            IsolatedStorageFile isFile=null;
-            bool canAutoLogin = false;
-
-            try
-            {
-                isFile = IsolatedStorageFile.GetUserStoreForAssembly();
-                canAutoLogin = (isFile.GetFileNames(filename).Length > 0);
-            }
-            catch (Exception exception)
-            {
-                Log.Exception(exception);
-            }
-            finally
-            {
-                if (isFile != null)
-                {
-                    isFile.Dispose();
-                    isFile.Close();
-                }
-            }
-
-            return canAutoLogin;
-        }
-    }
-}
Index: xword/XWord/XWikiAddIn.cs
===================================================================
--- xword/XWord/XWikiAddIn.cs	(revision 22911)
+++ xword/XWord/XWikiAddIn.cs	(working copy)
@@ -683,7 +683,7 @@
         /// <returns></returns>
         private bool AutoLogin()
         {
-            LoginData loginData = new LoginData();
+            LoginData loginData = new LoginData(LoginData.XWORD_LOGIN_DATA_FILENAME);
             bool canAutoLogin = loginData.CanAutoLogin();
             if (canAutoLogin)
             {
Index: xword/XWord/XWord.csproj
===================================================================
--- xword/XWord/XWord.csproj	(revision 22911)
+++ xword/XWord/XWord.csproj	(working copy)
@@ -218,7 +218,6 @@
     <Compile Include="LoadingDialog.Designer.cs">
       <DependentUpon>LoadingDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="Login.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>