*** empty log message ***

5 files changed, 14 insertions, 8 deletions

diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index d8ecb24cd9..416886b893 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -8,7 +8,7 @@
 		<property name="supportingAudits" value="true"/>
 		<property name="verifyingRevisions" value="false"/>
 		<property name="rememberingKnownTypes" value="false"/>
-	
+		
 		<store type="db">
 			<!-- mode: OFF | EXPRESS | NORMAL | GUARANTEED -->
 			<invalidationStrategy mode="EXPRESS"/>
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index eaf2de6e13..3871c6bf47 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -19,7 +19,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console&#13;&#10;--launcher.XXMaxPermSize&#13;&#10;128M"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console&#13;&#10;-consoleLog&#13;&#10;--launcher.XXMaxPermSize&#13;&#10;128M"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Ddebug=true&#13;&#10;-Dnet4j.config=${resource_loc:/org.eclipse.emf.cdo.server.product/rootfiles/configuration}"/>
 <stringAttribute key="pde.version" value="3.3"/>
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml
index 9da83d9ccc..1242aa9908 100644
--- a/plugins/org.eclipse.emf.cdo.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml
@@ -36,6 +36,14 @@
       </repositoryFactory>
    </extension>
 
+   <extension
+         point="org.eclipse.emf.cdo.server.storeFactories">
+      <storeFactory
+            class="org.eclipse.emf.cdo.internal.server.NOOPStoreFactory"
+            storeType="noop">
+      </storeFactory>
+   </extension>
+
     <extension
 		id="app"
 		point="org.eclipse.core.runtime.applications"
diff --git a/plugins/org.eclipse.net4j.util/plugin.xml b/plugins/org.eclipse.net4j.util/plugin.xml
index b3c60fe936..697c1585f7 100644
--- a/plugins/org.eclipse.net4j.util/plugin.xml
+++ b/plugins/org.eclipse.net4j.util/plugin.xml
@@ -18,7 +18,6 @@
 <plugin>
 
    <extension-point id="factories" name="Factories" schema="schema/factories.exsd"/>
-   
    <extension-point id="elementProcessors" name="Element Processors" schema="schema/elementProcessors.exsd"/>
 
 </plugin>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
index 095dcf56bc..1d658ae4f8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
@@ -80,11 +80,6 @@ public class OSGiApplication implements IApplication
 
   public final void stop()
   {
-    if (stopLatch != null)
-    {
-      stopLatch.countDown();
-    }
-
     traceStop(applicationID);
 
     try
@@ -102,6 +97,10 @@ public class OSGiApplication implements IApplication
     }
 
     context = null;
+    if (stopLatch != null)
+    {
+      stopLatch.countDown();
+    }
   }
 
   protected void doStart() throws Exception