[Releng] Consolidate .options files

10 files changed, 20 insertions, 63 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn/.options b/plugins/org.eclipse.emf.cdo.dawn/.options
index 3a060dd125..92572d819a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.options
+++ b/plugins/org.eclipse.emf.cdo.dawn/.options
@@ -1,17 +1,3 @@
 # Debugging and tracing options
 
 org.eclipse.emf.cdo.dawn/debug = true
-
-org.eclipse.emf.cdo.dawn/debug.session = true
-org.eclipse.emf.cdo.dawn/debug.session.model = true
-org.eclipse.emf.cdo.dawn/debug.session.revision = true
-
-org.eclipse.emf.cdo.dawn/debug.view = true
-org.eclipse.emf.cdo.dawn/debug.view.transaction = true
-org.eclipse.emf.cdo.dawn/debug.view.audit = true
-
-org.eclipse.emf.cdo.dawn/debug.object = true
-org.eclipse.emf.cdo.dawn/debug.object.statemachine = true
-org.eclipse.emf.cdo.dawn/debug.object.store = true
-
-org.eclipse.emf.cdo.dawn/load.resource.before.notification = true
diff --git a/plugins/org.eclipse.emf.cdo.dawn/plugin.xml b/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
index 9aaeab004a..1bbf5c6a75 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
@@ -11,25 +11,25 @@
 	  Martin Fluegge - initial API and implementation
 -->
 <plugin>
-   <extension-point id="org.eclipse.emf.cdo.dawn.listeners" name="DawnListeners" schema="schema/org.eclipse.emf.cdo.dawn.listeners.exsd"/>
-   <extension-point id="org.eclipse.emf.cdo.dawn.editpartstylizers" name="Dawn EditPart Stylizers" schema="schema/org.eclipse.emf.cdo.dawn.editpartstylizers.exsd"/>
-   <extension-point id="org.eclipse.emf.cdo.dawn.elementstylizerfactory" name="DawnElementStylizerFactory" schema="schema/org.eclipse.emf.cdo.dawn.elementstylizerfactory.exsd"/>
-   <extension
-         point="org.eclipse.emf.ecore.extension_parser">
+   <extension-point id="listeners" name="DawnListeners" schema="schema/org.eclipse.emf.cdo.dawn.listeners.exsd"/>
+   <extension-point id="editpartstylizers" name="Dawn EditPart Stylizers" schema="schema/org.eclipse.emf.cdo.dawn.editpartstylizers.exsd"/>
+   <extension-point id="elementstylizerfactory" name="Dawn Element Stylizer Factory" schema="schema/org.eclipse.emf.cdo.dawn.elementstylizerfactory.exsd"/>
+   
+   <extension point="org.eclipse.emf.ecore.extension_parser">
       <parser
             class="org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl"
             type="org.eclipse.emf.cdo.dawn.dawnresourceparser">
       </parser>
    </extension>
-   <extension
-         point="org.eclipse.emf.ecore.protocol_parser">
+   
+   <extension point="org.eclipse.emf.ecore.protocol_parser">
       <parser
             class="org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl"
             protocolName="dawn">
       </parser>
    </extension>
- <extension
-          point="org.eclipse.ui.views">
+   
+   <extension point="org.eclipse.ui.views">
        <category
              id="org.eclipse.emf.cdo.dawn.ui"
              name="Dawn">
@@ -84,8 +84,8 @@
           </action>
        </objectContribution>
 	</extension>-->
-    <extension
-          point="org.eclipse.ui.preferencePages">
+	
+    <extension point="org.eclipse.ui.preferencePages">
        <page
              category="org.eclipse.emf.cdo.ui.CDOPreferencePage"
              class="org.eclipse.emf.cdo.dawn.preferences.DawnRemotePreferencePage"
@@ -93,14 +93,14 @@
              name="Dawn Remote Preferences">
        </page>
     </extension>
-    <extension
-          point="org.eclipse.core.runtime.preferences">
+    
+    <extension point="org.eclipse.core.runtime.preferences">
        <initializer
              class="org.eclipse.emf.cdo.dawn.preferences.PreferenceInitializer">
        </initializer>
     </extension>
-   <!-- <extension
-          point="org.eclipse.ui.commands">
+    
+   <!-- <extension point="org.eclipse.ui.commands">
        <command
              id="org.eclipse.emf.cdo.dawn.handleConflict"
              name="HandleConflict">
@@ -114,4 +114,5 @@
              name="UnlockObjects">
        </command>
     </extension>-->
+    
 </plugin>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/internal/dawn/bundle/OM.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/internal/dawn/bundle/OM.java
index e887353141..3f40b714d0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/internal/dawn/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/internal/dawn/bundle/OM.java
@@ -26,6 +26,10 @@ public abstract class OM
 
   public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
 
+  /**
+   * @deprecated
+   */
+  @Deprecated
   public static final OMTracer DEBUG_OBJECT = DEBUG.tracer("object"); //$NON-NLS-1$
 
   public static final OMLogger LOG = BUNDLE.logger();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/.options b/plugins/org.eclipse.emf.cdo.server.net4j/.options
index 34c8a92780..10378ae640 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/.options
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/.options
@@ -2,10 +2,3 @@
 
 org.eclipse.emf.cdo.server.net4j/debug = true
 org.eclipse.emf.cdo.server.net4j/debug.protocol = true
-org.eclipse.emf.cdo.server.net4j/debug.repository = true
-org.eclipse.emf.cdo.server.net4j/debug.session = true
-org.eclipse.emf.cdo.server.net4j/debug.transaction = true
-org.eclipse.emf.cdo.server.net4j/debug.revision = true
-org.eclipse.emf.cdo.server.net4j/debug.resource = true
-org.eclipse.emf.cdo.server.net4j/debug.store = true
-org.eclipse.emf.cdo.server.net4j/debug.types = true
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
index ccca5b4fbb..f3dc51f7b7 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
@@ -31,8 +31,6 @@ public abstract class OM
 
   public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
 
-  public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
-
   public static final OMLogger LOG = BUNDLE.logger();
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.server/.options b/plugins/org.eclipse.emf.cdo.server/.options
index 83038cb0e0..1ea3f46f26 100644
--- a/plugins/org.eclipse.emf.cdo.server/.options
+++ b/plugins/org.eclipse.emf.cdo.server/.options
@@ -1,11 +1,6 @@
 # Debugging and tracing options
 
 org.eclipse.emf.cdo.server/debug = true
-org.eclipse.emf.cdo.server/debug.protocol = true
 org.eclipse.emf.cdo.server/debug.repository = true
 org.eclipse.emf.cdo.server/debug.session = true
 org.eclipse.emf.cdo.server/debug.transaction = true
-org.eclipse.emf.cdo.server/debug.revision = true
-org.eclipse.emf.cdo.server/debug.resource = true
-org.eclipse.emf.cdo.server/debug.store = true
-org.eclipse.emf.cdo.server/debug.types = true
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 318d30b5da..5045446404 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -29,22 +29,12 @@ public abstract class OM
 
   public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
 
-  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
-
   public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$
 
   public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
 
   public static final OMTracer DEBUG_TRANSACTION = DEBUG.tracer("transaction"); //$NON-NLS-1$
 
-  public static final OMTracer DEBUG_REVISION = DEBUG.tracer("revision"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_RESOURCE = DEBUG.tracer("resource"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_STORE = DEBUG.tracer("store"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_TYPES = DEBUG.tracer("types"); //$NON-NLS-1$
-
   public static final OMLogger LOG = BUNDLE.logger();
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.ui/.options b/plugins/org.eclipse.emf.cdo.ui/.options
index b767ded8ee..3dec26c631 100644
--- a/plugins/org.eclipse.emf.cdo.ui/.options
+++ b/plugins/org.eclipse.emf.cdo.ui/.options
@@ -1,5 +1,3 @@
 # Debugging and tracing options
 
 org.eclipse.emf.cdo.ui/debug = true
-
-org.eclipse.emf.cdo.ui/test = false
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index dc1b8613b0..388a3de021 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -44,8 +44,6 @@ public abstract class OM
 
   public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
 
-  public static final OMTracer TEST = BUNDLE.tracer("test"); //$NON-NLS-1$
-
   public static final OMLogger LOG = BUNDLE.logger();
 
   public static final OMPreferences PREFS = BUNDLE.preferences();
diff --git a/plugins/org.eclipse.net4j.util/.options b/plugins/org.eclipse.net4j.util/.options
index 67d9d91ea6..00f1382c24 100644
--- a/plugins/org.eclipse.net4j.util/.options
+++ b/plugins/org.eclipse.net4j.util/.options
@@ -1,9 +1,3 @@
 # Debugging and tracing options
 
 org.eclipse.net4j.util/debug = true
-org.eclipse.net4j.util/debug.lifecycle = true
-org.eclipse.net4j.util/debug.lifecycle.dump = true
-org.eclipse.net4j.util/debug.concurrency = false
-org.eclipse.net4j.util/debug.registry = true
-org.eclipse.net4j.util/debug.om = true
-org.eclipse.net4j.util/debug.om.monitor = true