Load CredentialsService at an early stage in unit tests, don't create systray without UIService

lib/felix.unit.test.properties

@@ -40,24 +40,27 @@ org.osgi.framework.system.packages.extra= \
 # file:lib/bundle/tablelayout.jar \
 #
 
-felix.auto.start.1= \
+felix.auto.start.10= \
  file:lib/bundle/junit.jar
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/bundlerepository.jar \
 # file:lib/bundle/servicebinder.jar \
 
-felix.auto.start.2= \
+felix.auto.start.20= \
  reference:file:sc-bundles/util.jar \
  reference:file:lib/bundle/log4j.jar \
  reference:file:lib/bundle/commons-logging.jar
 
-felix.auto.start.3= \
+felix.auto.start.30= \
  reference:file:sc-bundles/fileaccess.jar
 
-felix.auto.start.4= \
+felix.auto.start.31= \
+ reference:file:sc-bundles/configuration.jar
+
+felix.auto.start.40= \
  reference:file:sc-bundles/hid.jar \
- reference:file:sc-bundles/configuration.jar \
  reference:file:sc-bundles/ui-service.jar \
+ reference:file:sc-bundles/credentialsstorage.jar \
  reference:file:sc-bundles/argdelegation-service.jar \
  reference:file:sc-bundles/resourcemanager.jar \
  reference:file:sc-bundles/defaultresources.jar \
@@ -69,7 +72,7 @@ felix.auto.start.4= \
  reference:file:sc-bundles/sysactivitynotifications.jar \
  reference:file:sc-bundles/contactsource.jar
 
-felix.auto.start.5= \
+felix.auto.start.50= \
  reference:file:sc-bundles/bouncycastle.jar \
  reference:file:sc-bundles/zrtp4j.jar \
  reference:file:sc-bundles/googlecontacts.jar \
@@ -80,7 +83,7 @@ felix.auto.start.5= \
  reference:file:sc-bundles/json.jar \
  reference:file:sc-bundles/certificate.jar
 
-felix.auto.start.6= \
+felix.auto.start.60= \
  reference:file:sc-bundles/contactlist.jar \
  reference:file:sc-bundles/history.jar \
  reference:file:sc-bundles/protocol-icq.jar \
@@ -97,11 +100,10 @@ felix.auto.start.6= \
  reference:file:sc-bundles/filehistory.jar \
  reference:file:sc-bundles/metahistory.jar \
  reference:file:sc-bundles/notification.jar \
- reference:file:sc-bundles/credentialsstorage.jar \
  reference:file:sc-bundles/plugin-nimbuzzavatars.jar \
  reference:file:sc-bundles/osdependent.jar
 
-felix.auto.start.7= \
+felix.auto.start.70= \
  reference:file:sc-bundles/slickless.jar \
  reference:file:sc-bundles/configuration-slick.jar \
  reference:file:sc-bundles/netaddr-slick.jar \

src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java

@@ -151,6 +151,9 @@ public SystrayServiceJdicImpl()
      */
     private void initSystray()
     {
+        if(OsDependentActivator.getUIService() == null)
+            return;
+
         menu = TrayMenuFactory.createTrayMenu(this, systray.isSwing());
 
         boolean isMac = OSUtils.IS_MAC;