From 7b861b5cf5c7f3fc738e8b45b1d75362330235fd Mon Sep 17 00:00:00 2001
From: Alexander Pelov <a_pelov@java.net>
Date: Thu, 1 Dec 2005 12:26:39 +0000
Subject: [PATCH] ResourcesService renamed to FileAccessService.

---
 lib/oscar.client.run.properties               |   2 +-
 lib/oscar.unit.test.properties                |   8 +-
 .../{resources => fileaccess}/Activator.java  |   2 +-
 .../FileAccessServiceImpl.java                |   4 +-
 .../TempFileManager.java                      |   2 +-
 .../impl/fileaccess/fileaccess.manifest.mf    |  22 ++
 .../fileaccess.metadata.xml}                  |   4 +-
 .../impl/history/DBStructSerializer.java      |   2 -
 .../impl/history/HistoryReaderImpl.java       |   2 +-
 .../impl/history/HistoryServiceImpl.java      |   2 +-
 .../impl/history/history.manifest.mf          |   7 +-
 .../impl/history/history.metadata.xml         |   2 +-
 .../communicator/impl/media/media.manifest.mf |   2 +-
 .../protocol/sip/sip.provider.manifest.mf     |   2 +-
 .../impl/resources/resources.manifest.mf      |  22 --
 .../FileAccessService.java                    |  12 +-
 .../history}/BidirectionalIterator.java       |   2 +-
 .../service/history/QueryResultSet.java       |   1 -
 .../communicator/util/EnumerationBase.java    | 124 --------
 .../sip/communicator/util/QuoteTokenizer.java | 288 ------------------
 .../FileAccessServiceLick.java}               |  18 +-
 .../TestFileAccessService.java                |  12 +-
 .../fileaccess.slick.manifest.mf}             |  12 +-
 .../slick/history/history.slick.manifest.mf   |   2 -
 .../slick/media/media.slick.manifest.mf       |   3 +-
 25 files changed, 68 insertions(+), 491 deletions(-)
 rename src/net/java/sip/communicator/impl/{resources => fileaccess}/Activator.java (83%)
 rename src/net/java/sip/communicator/impl/{resources => fileaccess}/FileAccessServiceImpl.java (98%)
 rename src/net/java/sip/communicator/impl/{resources => fileaccess}/TempFileManager.java (99%)
 create mode 100644 src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
 rename src/net/java/sip/communicator/impl/{resources/resources.metadata.xml => fileaccess/fileaccess.metadata.xml} (73%)
 delete mode 100644 src/net/java/sip/communicator/impl/resources/resources.manifest.mf
 rename src/net/java/sip/communicator/service/{resources => fileaccess}/FileAccessService.java (91%)
 rename src/net/java/sip/communicator/{util => service/history}/BidirectionalIterator.java (95%)
 delete mode 100644 src/net/java/sip/communicator/util/EnumerationBase.java
 delete mode 100644 src/net/java/sip/communicator/util/QuoteTokenizer.java
 rename test/net/java/sip/communicator/slick/{resources/ResourcesServicesLick.java => fileaccess/FileAccessServiceLick.java} (71%)
 rename test/net/java/sip/communicator/slick/{resources => fileaccess}/TestFileAccessService.java (94%)
 rename test/net/java/sip/communicator/slick/{resources/resources.slick.manifest.mf => fileaccess/fileaccess.slick.manifest.mf} (56%)

diff --git a/lib/oscar.client.run.properties b/lib/oscar.client.run.properties
index 7e68addd7..10ea5a7e4 100644
--- a/lib/oscar.client.run.properties
+++ b/lib/oscar.client.run.properties
@@ -45,7 +45,7 @@ oscar.auto.start.3= \
  file:sc-bundles/netaddr.jar
 
 oscar.auto.start.4= \
- file:sc-bundles/resources.jar \
+ file:sc-bundles/fileaccess.jar \
  file:sc-bundles/history.jar
 
 # Uncomment the following lines if you want to run the architect viewer
diff --git a/lib/oscar.unit.test.properties b/lib/oscar.unit.test.properties
index c3d582e63..a5a02aea6 100644
--- a/lib/oscar.unit.test.properties
+++ b/lib/oscar.unit.test.properties
@@ -50,20 +50,20 @@ oscar.auto.start.2= \
 
 oscar.auto.start.3= \
  file:sc-bundles/configuration.jar \
- file:sc-bundles/media.jar \
  file:sc-bundles/netaddr.jar
 
 oscar.auto.start.4= \
  file:sc-bundles/protocol-sip.jar \
- file:sc-bundles/resources.jar \
- file:sc-bundles/history.jar
+ file:sc-bundles/fileaccess.jar \
+ file:sc-bundles/history.jar \
+ file:sc-bundles/media.jar
 
 oscar.auto.start.5= \
  file:sc-bundles/slickless.jar \
  file:sc-bundles/configuration-slick.jar \
  file:sc-bundles/media-slick.jar \
  file:sc-bundles/netaddr-slick.jar \
- file:sc-bundles/resources-slick.jar \
+ file:sc-bundles/fileaccess-slick.jar \
  file:sc-bundles/history-slick.jar
 
 
diff --git a/src/net/java/sip/communicator/impl/resources/Activator.java b/src/net/java/sip/communicator/impl/fileaccess/Activator.java
similarity index 83%
rename from src/net/java/sip/communicator/impl/resources/Activator.java
rename to src/net/java/sip/communicator/impl/fileaccess/Activator.java
index 152811bde..e336c455e 100644
--- a/src/net/java/sip/communicator/impl/resources/Activator.java
+++ b/src/net/java/sip/communicator/impl/fileaccess/Activator.java
@@ -1,4 +1,4 @@
-package net.java.sip.communicator.impl.resources;
+package net.java.sip.communicator.impl.fileaccess;
 
 import org.ungoverned.gravity.servicebinder.GenericActivator;
 
diff --git a/src/net/java/sip/communicator/impl/resources/FileAccessServiceImpl.java b/src/net/java/sip/communicator/impl/fileaccess/FileAccessServiceImpl.java
similarity index 98%
rename from src/net/java/sip/communicator/impl/resources/FileAccessServiceImpl.java
rename to src/net/java/sip/communicator/impl/fileaccess/FileAccessServiceImpl.java
index 1dc551af8..58ca977f0 100644
--- a/src/net/java/sip/communicator/impl/resources/FileAccessServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/fileaccess/FileAccessServiceImpl.java
@@ -4,13 +4,13 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.resources;
+package net.java.sip.communicator.impl.fileaccess;
 
 import java.io.File;
 import java.io.IOException;
 
 import net.java.sip.communicator.service.configuration.ConfigurationService;
-import net.java.sip.communicator.service.resources.FileAccessService;
+import net.java.sip.communicator.service.fileaccess.FileAccessService;
 import net.java.sip.communicator.util.Assert;
 import net.java.sip.communicator.util.Logger;
 
diff --git a/src/net/java/sip/communicator/impl/resources/TempFileManager.java b/src/net/java/sip/communicator/impl/fileaccess/TempFileManager.java
similarity index 99%
rename from src/net/java/sip/communicator/impl/resources/TempFileManager.java
rename to src/net/java/sip/communicator/impl/fileaccess/TempFileManager.java
index a36512553..9ed912758 100644
--- a/src/net/java/sip/communicator/impl/resources/TempFileManager.java
+++ b/src/net/java/sip/communicator/impl/fileaccess/TempFileManager.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.resources;
+package net.java.sip.communicator.impl.fileaccess;
 
 import java.io.*;
 import java.util.logging.Level;
diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
new file mode 100644
index 000000000..977d9d231
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
@@ -0,0 +1,22 @@
+Bundle-Activator: net.java.sip.communicator.impl.fileaccess.Activator
+Bundle-Name: File Access Service Provider
+Bundle-Description: A bundle that implements the file access package.
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+Import-Package: org.ungoverned.gravity.servicebinder,
+ org.osgi.framework,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.fileaccess,
+ net.java.sip.communicator.impl.fileaccess,
+ org.w3c.dom,
+ org.xml.sax,
+ javax.xml.parsers,
+ org.apache.xml.serializer,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.stream,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.xml,
+Export-Package: net.java.sip.communicator.service.fileaccess,
+ net.java.sip.communicator.impl.fileaccess,
+Metadata-Location: /net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/resources/resources.metadata.xml b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml
similarity index 73%
rename from src/net/java/sip/communicator/impl/resources/resources.metadata.xml
rename to src/net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml
index aa37573f4..6c6e0accd 100644
--- a/src/net/java/sip/communicator/impl/resources/resources.metadata.xml
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <bundle>
-  <component class="net.java.sip.communicator.impl.resources.FileAccessServiceImpl">
-    <provides service="net.java.sip.communicator.service.resources.FileAccessService"/>
+  <component class="net.java.sip.communicator.impl.fileaccess.FileAccessServiceImpl">
+    <provides service="net.java.sip.communicator.service.fileaccess.FileAccessService"/>
     
     <!--
     	One and only one reference to a configuration service is needed.
diff --git a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
index df369b6b6..77a79fb2d 100644
--- a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
+++ b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
@@ -16,7 +16,6 @@
 import net.java.sip.communicator.service.history.History;
 import net.java.sip.communicator.service.history.HistoryID;
 import net.java.sip.communicator.service.history.records.HistoryRecordStructure;
-import net.java.sip.communicator.util.EnumerationBase;
 import net.java.sip.communicator.util.xml.XMLUtils;
 
 import org.w3c.dom.Document;
@@ -147,7 +146,6 @@ private HistoryRecordStructure loadStructure(Node root)
 		int count = nodes.getLength();
 		
 		ArrayList propertyNames = new ArrayList(count);
-		ArrayList propertyTypes = new ArrayList(count);
 		
 		for(int i = 0; i < count; i++) {
 			Node node = nodes.item(i);
diff --git a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
index dc801d485..8599ced01 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
@@ -12,11 +12,11 @@
 import java.util.List;
 import java.util.Vector;
 
+import net.java.sip.communicator.service.history.BidirectionalIterator;
 import net.java.sip.communicator.service.history.HistoryReader;
 import net.java.sip.communicator.service.history.QueryResultSet;
 import net.java.sip.communicator.service.history.DefaultQueryResultSet;
 import net.java.sip.communicator.service.history.records.HistoryRecord;
-import net.java.sip.communicator.util.BidirectionalIterator;
 
 import org.jaxen.JaxenException;
 import org.jaxen.Navigator;
diff --git a/src/net/java/sip/communicator/impl/history/HistoryServiceImpl.java b/src/net/java/sip/communicator/impl/history/HistoryServiceImpl.java
index 946aa9fb8..4652ba338 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryServiceImpl.java
@@ -19,11 +19,11 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import net.java.sip.communicator.service.configuration.ConfigurationService;
+import net.java.sip.communicator.service.fileaccess.FileAccessService;
 import net.java.sip.communicator.service.history.History;
 import net.java.sip.communicator.service.history.HistoryID;
 import net.java.sip.communicator.service.history.HistoryService;
 import net.java.sip.communicator.service.history.records.HistoryRecordStructure;
-import net.java.sip.communicator.service.resources.FileAccessService;
 import net.java.sip.communicator.util.Logger;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf
index 3b4897025..94cc63c9c 100644
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@@ -5,14 +5,11 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.ungoverned.gravity.servicebinder,
  org.osgi.framework,
- net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.impl.history,
- net.java.sip.communicator.service.history.query,
  net.java.sip.communicator.service.history.records,
- net.java.sip.communicator.service.protocol,
  org.w3c.dom,
  org.xml.sax,
  javax.xml.parsers,
@@ -27,7 +24,5 @@ Import-Package: org.ungoverned.gravity.servicebinder,
  org.jaxen.saxpath,
 Export-Package: net.java.sip.communicator.service.history,
  net.java.sip.communicator.impl.history,
- net.java.sip.communicator.service.history.query,
  net.java.sip.communicator.service.history.records,
- net.java.sip.communicator.service.protocol,
 Metadata-Location: /net/java/sip/communicator/impl/history/history.metadata.xml
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/history/history.metadata.xml b/src/net/java/sip/communicator/impl/history/history.metadata.xml
index 96f3d6500..7ac6d058f 100644
--- a/src/net/java/sip/communicator/impl/history/history.metadata.xml
+++ b/src/net/java/sip/communicator/impl/history/history.metadata.xml
@@ -11,7 +11,7 @@
     	bind-method="setConfigurationService" 
     	unbind-method="unsetConfigurationService" />
     	
-    <requires service="net.java.sip.communicator.service.resources.FileAccessService"
+    <requires service="net.java.sip.communicator.service.fileaccess.FileAccessService"
     	filter="" 
     	policy="static" 
     	cardinality="1..1" 
diff --git a/src/net/java/sip/communicator/impl/media/media.manifest.mf b/src/net/java/sip/communicator/impl/media/media.manifest.mf
index 947b2024d..b71488e25 100644
--- a/src/net/java/sip/communicator/impl/media/media.manifest.mf
+++ b/src/net/java/sip/communicator/impl/media/media.manifest.mf
@@ -19,5 +19,5 @@ Import-Package: org.ungoverned.gravity.servicebinder,
 Export-Package: net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,
  net.java.sip.communicator.impl.media,
- net.java.sip.communicator.impl.media.event,
+ net.java.sip.communicator.impl.media.configuration,
 Metadata-Location: /net/java/sip/communicator/impl/media/media.metadata.xml
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
index 85893e523..b01797843 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
@@ -4,4 +4,4 @@ Bundle-Description: A bundle that implements the Protocol Provider package over
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: net.java.sip.communicator.util,
-Export-Package: net.java.sip.communicator.protocol,
+Export-Package: net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/impl/resources/resources.manifest.mf b/src/net/java/sip/communicator/impl/resources/resources.manifest.mf
deleted file mode 100644
index f73bbc6c2..000000000
--- a/src/net/java/sip/communicator/impl/resources/resources.manifest.mf
+++ /dev/null
@@ -1,22 +0,0 @@
-Bundle-Activator: net.java.sip.communicator.impl.resources.Activator
-Bundle-Name: Resources Management Service Provider
-Bundle-Description: A bundle that implements the resource management package.
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.resources,
- net.java.sip.communicator.impl.resources,
- org.w3c.dom,
- org.xml.sax,
- javax.xml.parsers,
- org.apache.xml.serializer,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.stream,
- net.java.sip.communicator.util,
- net.java.sip.communicator.util.xml,
-Export-Package: net.java.sip.communicator.service.resources,
- net.java.sip.communicator.impl.resources,
-Metadata-Location: /net/java/sip/communicator/impl/resources/resources.metadata.xml
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/service/resources/FileAccessService.java b/src/net/java/sip/communicator/service/fileaccess/FileAccessService.java
similarity index 91%
rename from src/net/java/sip/communicator/service/resources/FileAccessService.java
rename to src/net/java/sip/communicator/service/fileaccess/FileAccessService.java
index 580d307ea..e4c99d40e 100644
--- a/src/net/java/sip/communicator/service/resources/FileAccessService.java
+++ b/src/net/java/sip/communicator/service/fileaccess/FileAccessService.java
@@ -4,14 +4,14 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.service.resources;
+package net.java.sip.communicator.service.fileaccess;
 
 import java.io.File;
 import java.io.IOException;
 
 /**
  * A service used to provide the basic functionality required to access the
- * undelaying file system.
+ * undelying file system.
  * 
  * Note: Never store unencrypted sensitive information, such as passwords,
  * personal data, credit card numbers, etc..
@@ -29,17 +29,19 @@ public interface FileAccessService {
 	 * The key of the configuration property containing the user home dir - if
 	 * it is not defined the system property is used
 	 */
-	public static final String CONFPROPERTYKEY_USER_HOME = "sipcommunicator.user.home";
+	public static final String CONFPROPERTYKEY_USER_HOME = 
+		"net.java.sip.communicator.user.home";
 
 	/**
 	 * The subdirectory of USER_HOME in which all user files will be stored
 	 */
-	public static final String CONFPROPERTYKEY_SIP_DIRECTORY = "sipcommunicator.user.home.sipdir";
+	public static final String CONFPROPERTYKEY_SIP_DIRECTORY = 
+		"net.java.sip.communicator.user.home.sip-communicator-home";
 
 	/**
 	 * The default subdirectory
 	 */
-	public static final String DEFAULT_SIP_DIRECTORY = ".sipcommunicator";
+	public static final String DEFAULT_SIP_DIRECTORY = "sip-communicator";
 
 	/**
 	 * This method returns a created temporary file. After you close this file
diff --git a/src/net/java/sip/communicator/util/BidirectionalIterator.java b/src/net/java/sip/communicator/service/history/BidirectionalIterator.java
similarity index 95%
rename from src/net/java/sip/communicator/util/BidirectionalIterator.java
rename to src/net/java/sip/communicator/service/history/BidirectionalIterator.java
index 19675e508..5d7cf7673 100644
--- a/src/net/java/sip/communicator/util/BidirectionalIterator.java
+++ b/src/net/java/sip/communicator/service/history/BidirectionalIterator.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.util;
+package net.java.sip.communicator.service.history;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/src/net/java/sip/communicator/service/history/QueryResultSet.java b/src/net/java/sip/communicator/service/history/QueryResultSet.java
index 968c0c605..ccf6f5998 100644
--- a/src/net/java/sip/communicator/service/history/QueryResultSet.java
+++ b/src/net/java/sip/communicator/service/history/QueryResultSet.java
@@ -9,7 +9,6 @@
 import java.util.NoSuchElementException;
 
 import net.java.sip.communicator.service.history.records.HistoryRecord;
-import net.java.sip.communicator.util.BidirectionalIterator;
 
 
 /**
diff --git a/src/net/java/sip/communicator/util/EnumerationBase.java b/src/net/java/sip/communicator/util/EnumerationBase.java
deleted file mode 100644
index 22d14ff17..000000000
--- a/src/net/java/sip/communicator/util/EnumerationBase.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.util;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-/**
- * The base class for all enumerated types. One uses this class by extending it
- * and defining "static final" constants, like this:
- * 
- * <code>
- * public class Color extends EnumerationBase {
- * 	
- *  public static final Color Red = new Color("Red");
- *  public static final Color Blue = new Color("Blue");
- *  public static final Color Green = new Color("Green");
- * 
- * 	protected Color(String description) {
- * 		super(description);
- *  }
- *  
- * }
- * </code>
- * 
- * 
- * Note: always compare the enum constants with <code>equals</code>, because
- * serialization and multiple class loaders can cause alot of hard to trace bugs
- * 
- * For more information on the issue see
- * 
- * @link http://www.javaworld.com/javaworld/javatips/jw-javatip122.html and
- * @link http://www.javaworld.com/javaworld/javatips/jw-javatip133.html
- * 
- * @author Alexander Pelov
- */
-public abstract class EnumerationBase {
-
-	private String description;
-
-	/**
-	 * Constructs an enumeration element
-	 * 
-	 * @param description
-	 *            The description of this element. Should be unique
-	 */
-	protected EnumerationBase(String description) {
-		Assert.assertNonNull(description, "Enumeration description should be non-null");
-
-		this.description = description;
-	}
-
-	public final String toString() {
-		return this.description;
-	}
-	
-	/**
-	 * This method searches through all static fields defined in a class
-	 * which are of type derived from EnumerationBase and returns the one whose 
-	 * description matches the desired one. It is the "inverse" of toString.
-	 * 
-	 * Typical usage: 
-	 *  WeekdaysEnumeration monday = (WeekdaysEnumeration)
-	 *  	EnumerationBase.fromString(WeekdaysEnumeration.class, "Monday");
-	 * 
-	 * Note: You should test to see the exact type of the object. A "blind" cast
-	 * may cause an exception if the object is of a type superior to the one
-	 * you are testing.
-	 * 
-	 * @param clazz The class whose static fields will be tested. The 
-	 * 			static fields defined in it and its parents will be tested
-	 * 			for description match.
-	 * @param description The desired description to be matched.
-	 * @return The field matching the description. Null if no field matches the
-	 * 			description.
-	 */
-	public static EnumerationBase fromString(Class clazz,
-			String description)
-	{
-		if(clazz == null || description == null) {
-			return null;
-		}
-		
-		EnumerationBase retVal = null;
-		
-		Field[] fields = clazz.getFields();
-		
-		for(int i = 0; i < fields.length; i++) {
-			if((Modifier.STATIC & fields[i].getModifiers()) != 0 &&
-					EnumerationBase.class.isAssignableFrom(fields[i].getType()))
-			{
-				try {
-					EnumerationBase e = (EnumerationBase)fields[i].get(null);
-					if(e.descriptionEquals(description)) {
-						retVal = e;
-						break;
-					}
-				} catch (Exception e) {}
-			}
-		}
-		
-		return retVal;
-	}
-
-	public boolean equals(Object obj) {
-		if (obj instanceof EnumerationBase) {
-			return this.description.equals(((EnumerationBase) obj).description);
-		}
-		return false;
-	}
-
-	public boolean descriptionEquals(String str) {
-		return this.description.equals(str);
-	}
-
-	public boolean descriptionEqualsIgnoreCase(String str) {
-		return this.description.equalsIgnoreCase(str);
-	}
-	
-}
diff --git a/src/net/java/sip/communicator/util/QuoteTokenizer.java b/src/net/java/sip/communicator/util/QuoteTokenizer.java
deleted file mode 100644
index 83a52b3bd..000000000
--- a/src/net/java/sip/communicator/util/QuoteTokenizer.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.util;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-/**
- * A tokenizer that takes in account the existence of " and ' and
- * does skips all delimeters enclosed in those characters.
- * 
- * Thus the following string:
- *  
- * <code>This is a "stupid 'hot' dog", boy!</code>
- *  
- * Parsed created with the default constructor will produce the
- * following tokens:
- * 
- * This is a
- * "stupid 'hot' dog",
- * boy! 
- * 
- * And the string:
- * <code>This is a 'smart "hot" dog', boy!</code>
- * 
- * This is a
- * 'stupid "hot" dog',
- * boy!
- * 
- * @author Alexander Pelov
- * 
- * TODO: TEST
- */
-public class QuoteTokenizer implements Enumeration {
-    
-    /**
-     * Delimeters defined for internal purposes.
-     */
-    private static final String DELIMS = "'\"";
-
-    /**
-     * The text to be tokenized.
-     */
-    private String text;
-    
-    /**
-     * Delimeters requested by the user.
-     */
-    private String delims;
-    
-    /**
-     * The number of tokens in the text.
-     */
-    private int tokens = -1;
-
-    /**
-     * Pointer to the current tokenizer position.
-     */
-    private int currentTokenEnd = -1;
-
-    /**
-     * Return the delimeters?
-     */
-    private boolean returnDelim;
-
-    /**
-     * Constructs a tokenizer using spaces and tabs as delimeters,
-     * not returning the delimeters as tokens.
-     * 
-     * @param text The text to be tokenized
-     */
-    public QuoteTokenizer(String text) {
-        this(text, " \t");
-    }
-
-    /**
-     * Constructs a tokenizer using the characters specified in delims
-     * as delimeters, not returning the delimeters as tokens.
-     * 
-     * @param text The text to be tokenized
-     * @param delims The delimeters in a string
-     */
-    public QuoteTokenizer(String text, String delims) {
-        this(text, delims, false);
-    }
-    
-    /**
-     * Constructs a tokenizer using the specified delimeters, specifying
-     * if the delimeters should be returned as tokens.
-     * 
-     * @param text The text to be tokenized
-     * @param delims The delimeters in a string
-     * @param returnDelim Flag specifying if the delimeters should be returned
-     */
-    public QuoteTokenizer(String text, String delims, boolean returnDelim) {
-        this.text = text;
-        this.delims = delims;
-        this.returnDelim = returnDelim;
-    }
-
-    /**
-     * Calculates the number of times that this tokenizer's 
-     * <code>nextToken</code> method can be called before it 
-     * generates an exception. The current position is not advanced.
-     * 
-     * @return Returns the number of tokens remaining in the 
-     * string using the current delimiter set
-     */
-    public int countTokens() {
-        // See if the tokens were already count
-        if(this.tokens == -1) {
-            this.tokens = performTokenCount();
-        }
-        
-        return this.tokens;
-    }
-    
-    /**
-     * Returns the same value as the <code>hasMoreTokens</code> method. 
-     * It exists so that this class can implement the Enumeration interface.
-     */
-    public boolean hasMoreElements() {
-        return this.hasMoreTokens();
-    }
-
-    /**
-     * Tests if there are more tokens available from this 
-     * tokenizer's string. If this method returns true, then a 
-     * subsequent call to nextToken with no argument will 
-     * successfully return a token.
-     * 
-     * @return Returns true if and only if there is at 
-     * least one token in the string after the current position; 
-     * false otherwise.
-     */
-    public boolean hasMoreTokens() {
-        return this.currentTokenEnd < this.text.length();
-    }
-
-    /**
-     * Returns the same value as the nextToken method, except that 
-     * its declared return value is Object rather than String. 
-     * It exists so that this class can implement the Enumeration interface.
-     * 
-     * @return Returns the next token in the string. 
-     * 
-     * @throws Throws NoSuchElementException - if there are no more 
-     * tokens in this tokenizer's string. 
-     */
-    public Object nextElement() {
-        return this.nextToken();
-    }
-
-    /**
-     * Returns the next token from this string tokenizer.
-     * 
-     * @return Returns the next token from this string tokenizer.
-     * @throws Throws NoSuchElementException - if there are no more 
-     * tokens in this tokenizer's string.
-     */
-    public String nextToken() throws NoSuchElementException {
-        if(!this.hasMoreTokens()) {
-            throw new NoSuchElementException();
-        }
-        
-        int tokStart = this.getTokenStart(this.currentTokenEnd);
-        int tokEnd = this.getTokenEnd(tokStart);
-        
-        this.currentTokenEnd = tokEnd;
-        return this.text.substring(tokStart, tokEnd);
-    }
-
-    /**
-     * Returns the next token in this string tokenizer's string. 
-     * First, the set of characters considered to be delimiters 
-     * by this StringTokenizer object is changed to be the characters 
-     * in the string delim. Then the next token in the string after 
-     * the current position is returned. The current position is 
-     * advanced beyond the recognized token. The new delimiter set 
-     * remains the default after this call.
-     * 
-     * @param delims - the new delimeters.
-     * @return Returns the next token, after switching to the 
-     * new delimiter set.
-     * 
-     * @throws Throws NoSuchElementException - if there are no more 
-     * tokens in this tokenizer's string.
-     */
-    public String nextToken(String delims) {
-        this.delims = delims;
-        this.tokens = -1;
-
-        return this.nextToken();
-    }
-    
-    /**
-     * Restarts the tokenizer.
-     */
-    public void reset() {
-        this.currentTokenEnd = -1;
-    }
-    
-    /**
-     * Restarts the tokenizer and sets new parameters.
-     */
-    public void reset(String delims, boolean returnDelim) {
-        this.reset();
-        this.delims = delims;
-        this.returnDelim = returnDelim;
-        this.tokens = -1;
-    }
-
-
-    private int performTokenCount() {
-        // No; Count them
-        int count = 1;
-        
-        int tokStart = this.getTokenStart(0);
-        int tokEnd = this.getTokenEnd(tokStart);
-        
-        int textLen = this.text.length();
-        while(tokEnd < textLen) {
-            tokStart = this.getTokenStart(tokEnd);
-            tokEnd = this.getTokenEnd(tokStart);
-            
-            count++;
-        }
-        
-        return count;
-    }
-    
-    private int getTokenStart(int prevTokenEnd) {
-        int tokenStart = prevTokenEnd;
-        
-        if(!this.returnDelim) {
-            int textLen = this.text.length();
-            while(tokenStart < textLen 
-                    && 
-                    this.delims.indexOf(this.text.charAt(tokenStart)) >= 0
-            ) {
-                tokenStart++;
-            }
-        }
-
-        return tokenStart;
-    }
-    
-    private int getTokenEnd(int tokenStart) {
-        return findNextDelim(tokenStart)+1;
-    }
-    
-    private int findNextDelim(int start) {
-        // The end of the token
-        int nextDelim;
-        
-        // Mark if a " or ' was met
-        char stringChar = 0;
-        
-        int textLen = this.text.length();
-        for(nextDelim = start; nextDelim < textLen; nextDelim++) {
-            char c = this.text.charAt(nextDelim);
-            
-            // Have we met a " or ' ?
-            if(stringChar == 0) {
-                // No;
-                if(this.delims.indexOf(c) >= 0) {
-                    // Found Delim!! Quit!
-                    break;
-                } else if(DELIMS.indexOf(c) >= 0) {
-                    stringChar = c; 
-                }
-            } else {
-                // Yes;
-                if(c == stringChar) {
-                    stringChar = 0;
-                }
-            }
-        }
-        
-        return nextDelim;
-    }
-
-        
-}
diff --git a/test/net/java/sip/communicator/slick/resources/ResourcesServicesLick.java b/test/net/java/sip/communicator/slick/fileaccess/FileAccessServiceLick.java
similarity index 71%
rename from test/net/java/sip/communicator/slick/resources/ResourcesServicesLick.java
rename to test/net/java/sip/communicator/slick/fileaccess/FileAccessServiceLick.java
index ffb64c2e7..684c0b38e 100644
--- a/test/net/java/sip/communicator/slick/resources/ResourcesServicesLick.java
+++ b/test/net/java/sip/communicator/slick/fileaccess/FileAccessServiceLick.java
@@ -1,21 +1,21 @@
-package net.java.sip.communicator.slick.resources;
+package net.java.sip.communicator.slick.fileaccess;
 
 import org.osgi.framework.*;
 import junit.framework.*;
-import net.java.sip.communicator.service.resources.FileAccessService;
+import net.java.sip.communicator.service.fileaccess.FileAccessService;
 
 import java.util.*;
 
 import net.java.sip.communicator.util.*;
 
 /**
- * This class launches the bundle of which test the resources bundle.
- * this bundle is a set of (j)unit tests. It should be launched by the
+ * This class launches the bundle which tests the fileaccess bundle.
+ * This bundle is a set of (j)unit tests. It should be launched by the
  * cruisecontrol module.
  *
  * @author Alexander Pelov
  */
-public class ResourcesServicesLick
+public class FileAccessServiceLick
     extends TestSuite
     implements BundleActivator
 {
@@ -26,15 +26,15 @@ public class ResourcesServicesLick
     public static TestCase tcase = new TestCase(){};
 
     /**
-     * Start the Resources Sevice Implementation Compatibility Kit.
+     * Start the File Access Sevice Implementation Compatibility Kit.
      *
      * @param bundleContext BundleContext
      * @throws Exception
      */
     public void start(BundleContext bundleContext) throws Exception
     {
-        ResourcesServicesLick.bc = bundleContext;
-        setName("ResourcesServicesLick");
+        FileAccessServiceLick.bc = bundleContext;
+        setName("FileAccessServiceLick");
         Hashtable properties = new Hashtable();
         properties.put("service.pid", getName());
 
@@ -54,6 +54,4 @@ public void stop(BundleContext bundlecontext) throws Exception
     {
     }
 
-
-
 }
diff --git a/test/net/java/sip/communicator/slick/resources/TestFileAccessService.java b/test/net/java/sip/communicator/slick/fileaccess/TestFileAccessService.java
similarity index 94%
rename from test/net/java/sip/communicator/slick/resources/TestFileAccessService.java
rename to test/net/java/sip/communicator/slick/fileaccess/TestFileAccessService.java
index 73be00d95..d8da85ae4 100644
--- a/test/net/java/sip/communicator/slick/resources/TestFileAccessService.java
+++ b/test/net/java/sip/communicator/slick/fileaccess/TestFileAccessService.java
@@ -1,4 +1,4 @@
-package net.java.sip.communicator.slick.resources;
+package net.java.sip.communicator.slick.fileaccess;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -7,7 +7,7 @@
 import java.util.Random;
 
 import junit.framework.TestCase;
-import net.java.sip.communicator.service.resources.FileAccessService;
+import net.java.sip.communicator.service.fileaccess.FileAccessService;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -52,7 +52,7 @@ public class TestFileAccessService extends TestCase {
     
 	public TestFileAccessService(String name) {
         super(name);
-        BundleContext context = ResourcesServicesLick.bc;
+        BundleContext context = FileAccessServiceLick.bc;
         ServiceReference ref = context.getServiceReference(
         	FileAccessService.class.getName());
         this.fileAccessService = (FileAccessService)context.getService(ref);
@@ -60,7 +60,7 @@ public TestFileAccessService(String name) {
 	
 	
 	/*
-	 * Test method for 'net.java.sip.communicator.service.resources.FileAccessServiceImpl.getTemporaryFile()'
+	 * Test method for 'net.java.sip.communicator.service.fileaccess.FileAccessServiceImpl.getTemporaryFile()'
 	 */
 	public void testCreateReadWriteTemporaryFile() {
 		try {
@@ -76,7 +76,7 @@ public void testCreateReadWriteTemporaryFile() {
 	}
 
     /*
-     * Test method for 'net.java.sip.communicator.service.resources.FileAccessServiceImpl.getTemporaryFile()'
+     * Test method for 'net.java.sip.communicator.service.fileaccess.FileAccessServiceImpl.getTemporaryFile()'
      */
     public void testCreateTemporaryDirectory() throws Exception {
         try {
@@ -87,7 +87,7 @@ public void testCreateTemporaryDirectory() throws Exception {
     }
 
     /*
-     * Test method for 'net.java.sip.communicator.service.resources.FileAccessServiceImpl.getTemporaryFile()'
+     * Test method for 'net.java.sip.communicator.service.fileaccess.FileAccessServiceImpl.getTemporaryFile()'
      */
     public void testCreateReadWriteFileInTemporaryDirectory() throws Exception {
         int testFiles = 10;
diff --git a/test/net/java/sip/communicator/slick/resources/resources.slick.manifest.mf b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
similarity index 56%
rename from test/net/java/sip/communicator/slick/resources/resources.slick.manifest.mf
rename to test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
index 74b88dc19..5d36ea4b9 100644
--- a/test/net/java/sip/communicator/slick/resources/resources.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
@@ -1,11 +1,11 @@
-Bundle-Activator: net.java.sip.communicator.slick.resources.ResourcesServicesLick
-Bundle-Name: Resources Services Implementation Compatibility Kit
-Bundle-Description: A Service Implementation Compatibility Kit for the Resources Services
+Bundle-Activator: net.java.sip.communicator.slick.fileaccess.FileAccessServiceLick
+Bundle-Name: File Access Service Implementation Compatibility Kit
+Bundle-Description: A Service Implementation Compatibility Kit for the File Access Services
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: junit.framework,
- net.java.sip.communicator.slick.resources,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.slick.fileaccess,
+ net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.configuration,
  org.osgi.framework,
  org.w3c.dom,
@@ -16,4 +16,4 @@ Import-Package: junit.framework,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  org.apache.xml.serializer,
-Export-Package: net.java.sip.communicator.slick.resources,
+Export-Package: net.java.sip.communicator.slick.fileaccess,
diff --git a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
index f77518be7..f8757c836 100644
--- a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
@@ -6,10 +6,8 @@ Bundle-Version: 0.0.1
 Import-Package: junit.framework,
  net.java.sip.communicator.slick.history,
  net.java.sip.communicator.service.history.records,
- net.java.sip.communicator.service.history.query,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.protocol,
  org.osgi.framework,
  org.w3c.dom,
  javax.xml.parsers,
diff --git a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
index b7cc1f4e4..7fa5bc7d4 100644
--- a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
@@ -5,10 +5,9 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: junit.framework,
  org.osgi.framework,
+ net.java.sip.communicator.slick.media,
  net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.configuration.event,
  net.java.sip.communicator.util,
  javax.media,
  javax.media.format,