Reorganized annotation packages - Avoid bug from CM (FELIX-1545), which may miss some conf updates.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@942916 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
index 0cef411..2429e63 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
@@ -145,11 +145,16 @@
             Properties props = new Properties();
             props.put(key, val);
             try {
+                // Avoid bug from FELIX-1545
+                Thread.sleep(500);
                 m_conf.update(props);
             }
             catch (IOException e) {
                 Assert.fail("Could not update configuration: " + e.getMessage());
             }
+            catch (InterruptedException e)
+            {
+            }
         }
         
         public void stop() {