regenerated all models

35 files changed, 1301 insertions, 935 deletions

diff --git a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
index ccc27d2f7e..93c520921f 100644
--- a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
+++ b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
@@ -2,8 +2,9 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
-    modelDirectory="/org.eclipse.emf.cdo.defs/src" modelPluginID="org.eclipse.emf.cdo.defs"
-    modelName="Org.eclipse.emf.cdo" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    modelDirectory="/org.eclipse.emf.cdo.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.emf.cdo.defs" modelName="Org.eclipse.emf.cdo" codeFormatting="true"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
     copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs">
   <foreignModel>org.eclipse.emf.cdo.defs.ecore</foreignModel>
   <genPackages prefix="CDODefs" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
index 5c48dd8c95..152285aca8 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
@@ -15,14 +15,13 @@ import java.util.Date;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Audit Def</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef()
  * @model
  * @generated
@@ -30,13 +29,13 @@ import java.util.Date;
 public interface CDOAuditDef extends CDOViewDef
 {
   /**
-   * Returns the value of the '<em><b>Time Stamp</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Time Stamp</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Time Stamp</em>' attribute.
    * @see #setTimeStamp(Date)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef_TimeStamp()
@@ -48,7 +47,9 @@ public interface CDOAuditDef extends CDOViewDef
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Time Stamp</em>' attribute.
+   * 
+   * @param value
+   *          the new value of the '<em>Time Stamp</em>' attribute.
    * @see #getTimeStamp()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
index 898a0e3713..bd318bf9f6 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
@@ -16,8 +16,7 @@ import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Client Protocol Factory Def</b></em>'. <!--
  * end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOClientProtocolFactoryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
index c19c57ce12..eb93387f4c 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
@@ -16,45 +16,46 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
 public interface CDODefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   CDODefsFactory eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>CDO View Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO View Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO View Def</em>'.
    * @generated
    */
   CDOViewDef createCDOViewDef();
 
   /**
-   * Returns a new object of class '<em>CDO Transaction Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO Transaction Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO Transaction Def</em>'.
    * @generated
    */
   CDOTransactionDef createCDOTransactionDef();
 
   /**
-   * Returns a new object of class '<em>CDO Audit Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO Audit Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO Audit Def</em>'.
    * @generated
    */
   CDOAuditDef createCDOAuditDef();
 
   /**
-   * Returns a new object of class '<em>CDO Session Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO Session Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO Session Def</em>'.
    * @generated
    */
@@ -70,8 +71,8 @@ public interface CDODefsFactory extends EFactory
   RetryFailOverStrategyDef createRetryFailOverStrategyDef();
 
   /**
-   * Returns a new object of class '<em>CDO Package Registry Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO Package Registry Def</em>'.
    * @generated
    */
@@ -96,16 +97,16 @@ public interface CDODefsFactory extends EFactory
   CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef();
 
   /**
-   * Returns a new object of class '<em>EDynamic Package Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>EDynamic Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>EDynamic Package Def</em>'.
    * @generated
    */
   EDynamicPackageDef createEDynamicPackageDef();
 
   /**
-   * Returns a new object of class '<em>EGlobal Package Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>EGlobal Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>EGlobal Package Def</em>'.
    * @generated
    */
@@ -121,16 +122,16 @@ public interface CDODefsFactory extends EFactory
   CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef();
 
   /**
-   * Returns a new object of class '<em>CDO Resource Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>CDO Resource Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>CDO Resource Def</em>'.
    * @generated
    */
   CDOResourceDef createCDOResourceDef();
 
   /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
index 69f7624763..f63d9c4ae3 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsFactory
  * @model kind="package"
  * @generated
@@ -36,29 +37,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface CDODefsPackage extends EPackage
 {
   /**
-   * The package name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNAME = "defs";
 
   /**
-   * The package namespace URI.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/defs/1.0.0";
 
   /**
-   * The package namespace name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_PREFIX = "cdo.defs";
 
   /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   CDODefsPackage eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl.init();
@@ -74,8 +75,8 @@ public interface CDODefsPackage extends EPackage
   int CDO_VIEW_DEF = 0;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -91,8 +92,9 @@ public interface CDODefsPackage extends EPackage
   int CDO_VIEW_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
+   * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef()
    * @generated
@@ -100,17 +102,17 @@ public interface CDODefsPackage extends EPackage
   int CDO_TRANSACTION_DEF = 1;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_TRANSACTION_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF;
 
   /**
-   * The number of structural features of the '<em>CDO Transaction Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Transaction Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -119,6 +121,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef()
    * @generated
@@ -126,16 +129,16 @@ public interface CDODefsPackage extends EPackage
   int CDO_AUDIT_DEF = 2;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_AUDIT_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF;
 
   /**
-   * The feature id for the '<em><b>Time Stamp</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -151,8 +154,9 @@ public interface CDODefsPackage extends EPackage
   int CDO_AUDIT_DEF_FEATURE_COUNT = CDO_VIEW_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef()
    * @generated
@@ -160,60 +164,61 @@ public interface CDODefsPackage extends EPackage
   int CDO_SESSION_DEF = 3;
 
   /**
-   * The feature id for the '<em><b>Connector Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__CONNECTOR_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Repository Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__REPOSITORY_NAME = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>Fail Over Strategy Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Fail Over Strategy Def</b></em>' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
 
   /**
-   * The number of structural features of the '<em>CDO Session Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Session Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl
+   * <em>Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
    * @generated
@@ -221,25 +226,26 @@ public interface CDODefsPackage extends EPackage
   int FAIL_OVER_STRATEGY_DEF = 4;
 
   /**
-   * The feature id for the '<em><b>Connector Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Fail Over Strategy Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Fail Over Strategy Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl
+   * <em>Retry Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
    * @generated
@@ -247,33 +253,34 @@ public interface CDODefsPackage extends EPackage
   int RETRY_FAIL_OVER_STRATEGY_DEF = 5;
 
   /**
-   * The feature id for the '<em><b>Connector Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int RETRY_FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF;
 
   /**
-   * The feature id for the '<em><b>Retries</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Retries</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES = FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Retry Fail Over Strategy Def</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Retry Fail Over Strategy Def</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int RETRY_FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT = FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
+   * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
    * @generated
@@ -281,26 +288,27 @@ public interface CDODefsPackage extends EPackage
   int CDO_PACKAGE_REGISTRY_DEF = 6;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_PACKAGE_REGISTRY_DEF__PACKAGES = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>CDO Package Registry Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Package Registry Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
+   * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
    * @generated
@@ -308,26 +316,27 @@ public interface CDODefsPackage extends EPackage
   int CDO_EAGER_PACKAGE_REGISTRY_DEF = 7;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_EAGER_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES;
 
   /**
-   * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_EAGER_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
+   * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
    * @generated
@@ -335,18 +344,18 @@ public interface CDODefsPackage extends EPackage
   int CDO_LAZY_PACKAGE_REGISTRY_DEF = 8;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_LAZY_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES;
 
   /**
-   * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -355,6 +364,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef()
    * @generated
@@ -362,8 +372,8 @@ public interface CDODefsPackage extends EPackage
   int EPACKAGE_DEF = 9;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -379,8 +389,9 @@ public interface CDODefsPackage extends EPackage
   int EPACKAGE_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
+   * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
    * @generated
@@ -388,33 +399,34 @@ public interface CDODefsPackage extends EPackage
   int EDYNAMIC_PACKAGE_DEF = 10;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI;
 
   /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = EPACKAGE_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>EDynamic Package Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>EDynamic Package Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
+   * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
    * @generated
@@ -422,25 +434,26 @@ public interface CDODefsPackage extends EPackage
   int EGLOBAL_PACKAGE_DEF = 11;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int EGLOBAL_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI;
 
   /**
-   * The number of structural features of the '<em>EGlobal Package Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>EGlobal Package Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int EGLOBAL_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
+   * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
    * @generated
@@ -448,17 +461,18 @@ public interface CDODefsPackage extends EPackage
   int CDO_CLIENT_PROTOCOL_FACTORY_DEF = 12;
 
   /**
-   * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef()
    * @generated
@@ -466,33 +480,33 @@ public interface CDODefsPackage extends EPackage
   int CDO_RESOURCE_DEF = 13;
 
   /**
-   * The feature id for the '<em><b>Cdo Transaction</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__CDO_TRANSACTION = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Resource Mode</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Resource Mode</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__RESOURCE_MODE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Path</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__PATH = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The number of structural features of the '<em>CDO Resource Def</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Resource Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -519,8 +533,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOViewDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef
+   * <em>Cdo Session Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Cdo Session Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef()
    * @see #getCDOViewDef()
@@ -529,8 +544,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOViewDef_CdoSessionDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>CDO Transaction Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOTransactionDef
    * @generated
@@ -548,8 +564,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOAuditDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp
+   * <em>Time Stamp</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Time Stamp</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp()
    * @see #getCDOAuditDef()
@@ -568,8 +585,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOSessionDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef
+   * <em>Connector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Connector Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef()
    * @see #getCDOSessionDef()
@@ -578,8 +596,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOSessionDef_ConnectorDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName
+   * <em>Repository Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Repository Name</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName()
    * @see #getCDOSessionDef()
@@ -588,8 +607,9 @@ public interface CDODefsPackage extends EPackage
   EAttribute getCDOSessionDef_RepositoryName();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef
+   * <em>Cdo Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Cdo Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef()
    * @see #getCDOSessionDef()
@@ -598,8 +618,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOSessionDef_CdoPackageRegistryDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled
+   * <em>Legacy Support Enabled</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Legacy Support Enabled</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled()
    * @see #getCDOSessionDef()
@@ -608,8 +629,9 @@ public interface CDODefsPackage extends EPackage
   EAttribute getCDOSessionDef_LegacySupportEnabled();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Fail Over Strategy Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef()
    * @see #getCDOSessionDef()
@@ -618,8 +640,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOSessionDef_FailOverStrategyDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>Fail Over Strategy Def</em>'.
    * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef
    * @generated
@@ -627,8 +650,9 @@ public interface CDODefsPackage extends EPackage
   EClass getFailOverStrategyDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef
+   * <em>Connector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Connector Def</em>'.
    * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef()
    * @see #getFailOverStrategyDef()
@@ -637,8 +661,9 @@ public interface CDODefsPackage extends EPackage
   EReference getFailOverStrategyDef_ConnectorDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef <em>Retry Fail Over Strategy Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef
+   * <em>Retry Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>Retry Fail Over Strategy Def</em>'.
    * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef
    * @generated
@@ -646,8 +671,9 @@ public interface CDODefsPackage extends EPackage
   EClass getRetryFailOverStrategyDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries
+   * <em>Retries</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Retries</em>'.
    * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries()
    * @see #getRetryFailOverStrategyDef()
@@ -656,8 +682,9 @@ public interface CDODefsPackage extends EPackage
   EAttribute getRetryFailOverStrategyDef_Retries();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
+   * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>CDO Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
    * @generated
@@ -665,9 +692,10 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOPackageRegistryDef();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Packages</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages()
    * @see #getCDOPackageRegistryDef()
@@ -676,8 +704,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOPackageRegistryDef_Packages();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
+   * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>CDO Eager Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
    * @generated
@@ -685,8 +714,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOEagerPackageRegistryDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
+   * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>CDO Lazy Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
    * @generated
@@ -706,6 +736,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Ns URI</em>'.
    * @see org.eclipse.emf.cdo.defs.EPackageDef#getNsURI()
    * @see #getEPackageDef()
@@ -714,8 +745,9 @@ public interface CDODefsPackage extends EPackage
   EAttribute getEPackageDef_NsURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef
+   * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>EDynamic Package Def</em>'.
    * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef
    * @generated
@@ -723,8 +755,9 @@ public interface CDODefsPackage extends EPackage
   EClass getEDynamicPackageDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI
+   * <em>Resource URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Resource URI</em>'.
    * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI()
    * @see #getEDynamicPackageDef()
@@ -733,8 +766,9 @@ public interface CDODefsPackage extends EPackage
   EAttribute getEDynamicPackageDef_ResourceURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>EGlobal Package Def</em>'.
    * @see org.eclipse.emf.cdo.defs.EGlobalPackageDef
    * @generated
@@ -742,8 +776,9 @@ public interface CDODefsPackage extends EPackage
   EClass getEGlobalPackageDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
+   * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>CDO Client Protocol Factory Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
    * @generated
@@ -761,8 +796,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOResourceDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction
+   * <em>Cdo Transaction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Cdo Transaction</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction()
    * @see #getCDOResourceDef()
@@ -771,8 +807,9 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOResourceDef_CdoTransaction();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode
+   * <em>Resource Mode</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Resource Mode</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode()
    * @see #getCDOResourceDef()
@@ -783,6 +820,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Path</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getPath()
    * @see #getCDOResourceDef()
@@ -801,8 +839,8 @@ public interface CDODefsPackage extends EPackage
   EEnum getResourceMode();
 
   /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -817,13 +855,15 @@ public interface CDODefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
+   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOViewDef()
      * @generated
@@ -831,16 +871,17 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_VIEW_DEF = eINSTANCE.getCDOViewDef();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference CDO_VIEW_DEF__CDO_SESSION_DEF = eINSTANCE.getCDOViewDef_CdoSessionDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
+     * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef()
      * @generated
@@ -848,8 +889,9 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_TRANSACTION_DEF = eINSTANCE.getCDOTransactionDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef()
      * @generated
@@ -857,16 +899,17 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_AUDIT_DEF = eINSTANCE.getCDOAuditDef();
 
     /**
-     * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CDO_AUDIT_DEF__TIME_STAMP = eINSTANCE.getCDOAuditDef_TimeStamp();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef()
      * @generated
@@ -874,48 +917,49 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_SESSION_DEF = eINSTANCE.getCDOSessionDef();
 
     /**
-     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference CDO_SESSION_DEF__CONNECTOR_DEF = eINSTANCE.getCDOSessionDef_ConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CDO_SESSION_DEF__REPOSITORY_NAME = eINSTANCE.getCDOSessionDef_RepositoryName();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature.
-     * <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOSessionDef_CdoPackageRegistryDef();
 
     /**
-     * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature.
-     * <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = eINSTANCE.getCDOSessionDef_LegacySupportEnabled();
 
     /**
-     * The meta object literal for the '<em><b>Fail Over Strategy Def</b></em>' reference feature.
-     * <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Fail Over Strategy Def</b></em>' reference feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF = eINSTANCE.getCDOSessionDef_FailOverStrategyDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl
+     * <em>Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
      * @generated
@@ -923,16 +967,17 @@ public interface CDODefsPackage extends EPackage
     EClass FAIL_OVER_STRATEGY_DEF = eINSTANCE.getFailOverStrategyDef();
 
     /**
-     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = eINSTANCE.getFailOverStrategyDef_ConnectorDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl
+     * <em>Retry Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
      * @generated
@@ -940,16 +985,17 @@ public interface CDODefsPackage extends EPackage
     EClass RETRY_FAIL_OVER_STRATEGY_DEF = eINSTANCE.getRetryFailOverStrategyDef();
 
     /**
-     * The meta object literal for the '<em><b>Retries</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Retries</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES = eINSTANCE.getRetryFailOverStrategyDef_Retries();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
+     * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
      * @generated
@@ -965,8 +1011,9 @@ public interface CDODefsPackage extends EPackage
     EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
+     * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
      * @generated
@@ -974,8 +1021,9 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_EAGER_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOEagerPackageRegistryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
+     * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
      * @generated
@@ -983,8 +1031,9 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_LAZY_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOLazyPackageRegistryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef()
      * @generated
@@ -992,16 +1041,17 @@ public interface CDODefsPackage extends EPackage
     EClass EPACKAGE_DEF = eINSTANCE.getEPackageDef();
 
     /**
-     * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute EPACKAGE_DEF__NS_URI = eINSTANCE.getEPackageDef_NsURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
+     * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
      * @generated
@@ -1009,16 +1059,17 @@ public interface CDODefsPackage extends EPackage
     EClass EDYNAMIC_PACKAGE_DEF = eINSTANCE.getEDynamicPackageDef();
 
     /**
-     * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = eINSTANCE.getEDynamicPackageDef_ResourceURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
+     * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
      * @generated
@@ -1026,8 +1077,9 @@ public interface CDODefsPackage extends EPackage
     EClass EGLOBAL_PACKAGE_DEF = eINSTANCE.getEGlobalPackageDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
+     * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
      * @generated
@@ -1035,8 +1087,9 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getCDOClientProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
+     * <em>CDO Resource Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef()
      * @generated
@@ -1044,25 +1097,25 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_RESOURCE_DEF = eINSTANCE.getCDOResourceDef();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference CDO_RESOURCE_DEF__CDO_TRANSACTION = eINSTANCE.getCDOResourceDef_CdoTransaction();
 
     /**
-     * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CDO_RESOURCE_DEF__RESOURCE_MODE = eINSTANCE.getCDOResourceDef_ResourceMode();
 
     /**
-     * The meta object literal for the '<em><b>Path</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CDO_RESOURCE_DEF__PATH = eINSTANCE.getCDOResourceDef_Path();
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
index fe4480f93e..edad0c03c5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
@@ -14,8 +14,7 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Eager Package Registry Def</b></em>'. <!--
  * end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOEagerPackageRegistryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
index e2584b1597..1ed888acf8 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
@@ -14,8 +14,7 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Lazy Package Registry Def</b></em>'. <!--
  * end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOLazyPackageRegistryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
index 21455239e0..be6750c44a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
@@ -18,14 +18,13 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Registry Def</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef()
  * @model
  * @generated
@@ -33,14 +32,14 @@ import org.eclipse.emf.common.util.EList;
 public interface CDOPackageRegistryDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Packages</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.defs.EPackageDef}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Packages</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.defs.EPackageDef}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Packages</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Packages</em>' containment reference list.
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef_Packages()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
index cfe822a5f2..1db6315fb8 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
@@ -32,13 +32,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOResourceDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Transaction</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Cdo Transaction</em>' reference.
    * @see #setCdoTransaction(CDOTransactionDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_CdoTransaction()
@@ -48,24 +48,25 @@ public interface CDOResourceDef extends Def
   CDOTransactionDef getCdoTransaction();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Cdo Transaction</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Cdo Transaction</em>' reference.
    * @see #getCdoTransaction()
    * @generated
    */
   void setCdoTransaction(CDOTransactionDef value);
 
   /**
-   * Returns the value of the '<em><b>Resource Mode</b></em>' attribute.
-   * The default value is <code>"null"</code>.
-   * The literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Resource Mode</b></em>' attribute. The default value is <code>"null"</code>. The
+   * literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Resource Mode</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Resource Mode</em>' attribute.
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @see #setResourceMode(ResourceMode)
@@ -76,9 +77,11 @@ public interface CDOResourceDef extends Def
   ResourceMode getResourceMode();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Resource Mode</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Resource Mode</em>' attribute.
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @see #getResourceMode()
    * @generated
@@ -86,12 +89,12 @@ public interface CDOResourceDef extends Def
   void setResourceMode(ResourceMode value);
 
   /**
-   * Returns the value of the '<em><b>Path</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Path</em>' attribute.
    * @see #setPath(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_Path()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
index 11a5d1b836..3610e9af61 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
@@ -16,18 +16,17 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Session Def</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef()
  * @model
  * @generated
@@ -35,13 +34,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOSessionDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Connector Def</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Connector Def</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Connector Def</em>' reference.
    * @see #isSetConnectorDef()
    * @see #unsetConnectorDef()
@@ -53,9 +52,11 @@ public interface CDOSessionDef extends Def
   ConnectorDef getConnectorDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Connector Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Connector Def</em>' reference.
    * @see #isSetConnectorDef()
    * @see #unsetConnectorDef()
    * @see #getConnectorDef()
@@ -64,8 +65,9 @@ public interface CDOSessionDef extends Def
   void setConnectorDef(ConnectorDef value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #isSetConnectorDef()
    * @see #getConnectorDef()
    * @see #setConnectorDef(ConnectorDef)
@@ -74,8 +76,9 @@ public interface CDOSessionDef extends Def
   void unsetConnectorDef();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef
+   * <em>Connector Def</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return whether the value of the '<em>Connector Def</em>' reference is set.
    * @see #unsetConnectorDef()
    * @see #getConnectorDef()
@@ -85,13 +88,13 @@ public interface CDOSessionDef extends Def
   boolean isSetConnectorDef();
 
   /**
-   * Returns the value of the '<em><b>Repository Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>CDORepositoryInfo Name</em>' attribute isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Repository Name</em>' attribute.
    * @see #setRepositoryName(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_RepositoryName()
@@ -101,22 +104,24 @@ public interface CDOSessionDef extends Def
   String getRepositoryName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Repository Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Repository Name</em>' attribute.
    * @see #getRepositoryName()
    * @generated
    */
   void setRepositoryName(String value);
 
   /**
-   * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Package Registry Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Cdo Package Registry Def</em>' reference.
    * @see #setCdoPackageRegistryDef(CDOPackageRegistryDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_CdoPackageRegistryDef()
@@ -126,23 +131,25 @@ public interface CDOSessionDef extends Def
   CDOPackageRegistryDef getCdoPackageRegistryDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Cdo Package Registry Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef
+   * <em>Cdo Package Registry Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Cdo Package Registry Def</em>' reference.
    * @see #getCdoPackageRegistryDef()
    * @generated
    */
   void setCdoPackageRegistryDef(CDOPackageRegistryDef value);
 
   /**
-   * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute.
-   * The default value is <code>"false"</code>.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute. The default value is
+   * <code>"false"</code>. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Legacy Support Enabled</em>' attribute isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Legacy Support Enabled</em>' attribute.
    * @see #setLegacySupportEnabled(boolean)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_LegacySupportEnabled()
@@ -152,22 +159,24 @@ public interface CDOSessionDef extends Def
   boolean isLegacySupportEnabled();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Legacy Support Enabled</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled
+   * <em>Legacy Support Enabled</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Legacy Support Enabled</em>' attribute.
    * @see #isLegacySupportEnabled()
    * @generated
    */
   void setLegacySupportEnabled(boolean value);
 
   /**
-   * Returns the value of the '<em><b>Fail Over Strategy Def</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Fail Over Strategy Def</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Fail Over Strategy Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Fail Over Strategy Def</em>' reference.
    * @see #isSetFailOverStrategyDef()
    * @see #unsetFailOverStrategyDef()
@@ -179,9 +188,11 @@ public interface CDOSessionDef extends Def
   FailOverStrategyDef getFailOverStrategyDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Fail Over Strategy Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Fail Over Strategy Def</em>' reference.
    * @see #isSetFailOverStrategyDef()
    * @see #unsetFailOverStrategyDef()
    * @see #getFailOverStrategyDef()
@@ -190,8 +201,9 @@ public interface CDOSessionDef extends Def
   void setFailOverStrategyDef(FailOverStrategyDef value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #isSetFailOverStrategyDef()
    * @see #getFailOverStrategyDef()
    * @see #setFailOverStrategyDef(FailOverStrategyDef)
@@ -200,8 +212,9 @@ public interface CDOSessionDef extends Def
   void unsetFailOverStrategyDef();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return whether the value of the '<em>Fail Over Strategy Def</em>' reference is set.
    * @see #unsetFailOverStrategyDef()
    * @see #getFailOverStrategyDef()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
index 567f343222..39a47d4809 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
@@ -15,14 +15,13 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO View Def</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef()
  * @model
  * @generated
@@ -30,13 +29,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOViewDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Session Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Cdo Session Def</em>' reference.
    * @see #setCdoSessionDef(CDOSessionDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef_CdoSessionDef()
@@ -46,9 +45,11 @@ public interface CDOViewDef extends Def
   CDOSessionDef getCdoSessionDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Cdo Session Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Cdo Session Def</em>' reference.
    * @see #getCdoSessionDef()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
index 6db627f50d..01065e1272 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
@@ -14,14 +14,13 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Dynamic CDO Package Def</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef()
  * @model
  * @generated
@@ -29,13 +28,13 @@ package org.eclipse.emf.cdo.defs;
 public interface EDynamicPackageDef extends EPackageDef
 {
   /**
-   * Returns the value of the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Resource URI</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Resource URI</em>' attribute.
    * @see #setResourceURI(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef_ResourceURI()
@@ -45,9 +44,11 @@ public interface EDynamicPackageDef extends EPackageDef
   String getResourceURI();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Resource URI</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Resource URI</em>' attribute.
    * @see #getResourceURI()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
index 15c1dc071d..221b6534ed 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
@@ -14,8 +14,7 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Native CDO Package Def</b></em>'. <!--
  * end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEGlobalPackageDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
index df3b6bc161..400c7965e4 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
@@ -15,14 +15,13 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Def</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef()
  * @model abstract="true"
  * @generated
@@ -30,12 +29,12 @@ import org.eclipse.net4j.util.defs.Def;
 public interface EPackageDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Ns URI</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Ns URI</em>' attribute.
    * @see #setNsURI(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef_NsURI()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java
index a7b10607e9..8e6162e116 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java
@@ -17,14 +17,13 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Fail Over Strategy Def</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getFailOverStrategyDef()
  * @model abstract="true"
  * @generated
@@ -32,13 +31,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface FailOverStrategyDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Connector Def</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Connector Def</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Connector Def</em>' reference.
    * @see #setConnectorDef(ConnectorDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getFailOverStrategyDef_ConnectorDef()
@@ -48,9 +47,11 @@ public interface FailOverStrategyDef extends Def
   ConnectorDef getConnectorDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Connector Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Connector Def</em>' reference.
    * @see #getConnectorDef()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
index 50d127d879..64c7bb0dcb 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
@@ -23,6 +23,7 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Resource Mode</b></em>', and
  * utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getResourceMode()
  * @model
  * @generated
@@ -79,13 +80,13 @@ public enum ResourceMode implements Enumerator
   };
 
   /**
-   * The '<em><b>GET</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>GET</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>GET</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #GET
    * @model
    * @generated
@@ -94,13 +95,13 @@ public enum ResourceMode implements Enumerator
   public static final int GET_VALUE = 0;
 
   /**
-   * The '<em><b>CREATE</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>CREATE</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>CREATE</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #CREATE
    * @model
    * @generated
@@ -109,13 +110,13 @@ public enum ResourceMode implements Enumerator
   public static final int CREATE_VALUE = 0;
 
   /**
-   * The '<em><b>GET OR CREATE</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>GET OR CREATE</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>GET OR CREATE</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #GET_OR_CREATE
    * @model
    * @generated
@@ -124,29 +125,24 @@ public enum ResourceMode implements Enumerator
   public static final int GET_OR_CREATE_VALUE = 0;
 
   /**
-   * An array of all the '<em><b>Resource Mode</b></em>' enumerators.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * An array of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
-  private static final ResourceMode[] VALUES_ARRAY = new ResourceMode[]
-    {
-      GET,
-      CREATE,
-      GET_OR_CREATE,
-    };
+  private static final ResourceMode[] VALUES_ARRAY = new ResourceMode[] { GET, CREATE, GET_OR_CREATE, };
 
   /**
-   * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators.
-   * <!-- begin-user-doc --> <!--
+   * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static final List<ResourceMode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static ResourceMode get(String literal)
@@ -163,9 +159,9 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name.
-   * <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static ResourceMode getByName(String name)
@@ -182,41 +178,45 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static ResourceMode get(int value)
   {
     switch (value)
     {
-      case GET_VALUE: return GET;
+    case GET_VALUE:
+      return GET;
     }
     return null;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final String literal;
 
   /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private ResourceMode(int value, String name, String literal)
@@ -228,6 +228,7 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public int getValue()
@@ -237,6 +238,7 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getName()
@@ -246,6 +248,7 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getLiteral()
@@ -254,9 +257,9 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc --> <!--
+   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java
index e40e7a7d73..7132788f6c 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java
@@ -14,14 +14,13 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Retry Fail Over Strategy</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getRetryFailOverStrategyDef()
  * @model
  * @generated
@@ -29,13 +28,13 @@ package org.eclipse.emf.cdo.defs;
 public interface RetryFailOverStrategyDef extends FailOverStrategyDef
 {
   /**
-   * Returns the value of the '<em><b>Retries</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Retries</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Retries</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Retries</em>' attribute.
    * @see #isSetRetries()
    * @see #unsetRetries()
@@ -47,9 +46,11 @@ public interface RetryFailOverStrategyDef extends FailOverStrategyDef
   int getRetries();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Retries</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Retries</em>' attribute.
    * @see #isSetRetries()
    * @see #unsetRetries()
    * @see #getRetries()
@@ -58,8 +59,9 @@ public interface RetryFailOverStrategyDef extends FailOverStrategyDef
   void setRetries(int value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #isSetRetries()
    * @see #getRetries()
    * @see #setRetries(int)
@@ -68,8 +70,9 @@ public interface RetryFailOverStrategyDef extends FailOverStrategyDef
   void unsetRetries();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries
+   * <em>Retries</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return whether the value of the '<em>Retries</em>' attribute is set.
    * @see #unsetRetries()
    * @see #getRetries()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
index 6848f182c3..9a0e9142db 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
@@ -28,18 +28,18 @@ import java.util.Date;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 {
   /**
-   * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getTimeStamp()
    * @generated
    * @ordered
@@ -47,9 +47,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   protected static final Date TIME_STAMP_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getTimeStamp()
    * @generated
    * @ordered
@@ -58,6 +58,7 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOAuditDefImpl()
@@ -67,6 +68,7 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -77,6 +79,7 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Date getTimeStamp()
@@ -86,6 +89,7 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setTimeStamp(Date newTimeStamp)
@@ -93,11 +97,13 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
     Date oldTimeStamp = timeStamp;
     timeStamp = newTimeStamp;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp,
+          timeStamp));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -105,14 +111,15 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-        return getTimeStamp();
+    case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+      return getTimeStamp();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -120,15 +127,16 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-        setTimeStamp((Date)newValue);
-        return;
+    case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+      setTimeStamp((Date)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -136,15 +144,16 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-        setTimeStamp(TIME_STAMP_EDEFAULT);
-        return;
+    case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+      setTimeStamp(TIME_STAMP_EDEFAULT);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -152,20 +161,22 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-        return TIME_STAMP_EDEFAULT == null ? timeStamp != null : !TIME_STAMP_EDEFAULT.equals(timeStamp);
+    case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+      return TIME_STAMP_EDEFAULT == null ? timeStamp != null : !TIME_STAMP_EDEFAULT.equals(timeStamp);
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (timeStamp: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
index 7b766938fc..617d87ec1a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements
@@ -32,6 +32,7 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOClientProtocolFactoryDefImpl()
@@ -41,6 +42,7 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
index 37bba9dce9..ae7448296d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
@@ -4,13 +4,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
 package org.eclipse.emf.cdo.defs.impl;
 
+//import org.eclipse.emf.cdo.defs.*;
 import org.eclipse.emf.cdo.defs.CDOAuditDef;
 import org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef;
 import org.eclipse.emf.cdo.defs.CDODefsFactory;
@@ -36,20 +37,22 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 {
   /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static CDODefsFactory init()
   {
     try
     {
-      CDODefsFactory theCDODefsFactory = (CDODefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/defs/1.0.0"); 
+      CDODefsFactory theCDODefsFactory = (CDODefsFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://www.eclipse.org/emf/CDO/defs/1.0.0");
       if (theCDODefsFactory != null)
       {
         return theCDODefsFactory;
@@ -63,8 +66,8 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   }
 
   /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDODefsFactoryImpl()
@@ -74,6 +77,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -81,25 +85,38 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   {
     switch (eClass.getClassifierID())
     {
-      case CDODefsPackage.CDO_VIEW_DEF: return createCDOViewDef();
-      case CDODefsPackage.CDO_TRANSACTION_DEF: return createCDOTransactionDef();
-      case CDODefsPackage.CDO_AUDIT_DEF: return createCDOAuditDef();
-      case CDODefsPackage.CDO_SESSION_DEF: return createCDOSessionDef();
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF: return createRetryFailOverStrategyDef();
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF: return createCDOPackageRegistryDef();
-      case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF: return createCDOEagerPackageRegistryDef();
-      case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF: return createCDOLazyPackageRegistryDef();
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF: return createEDynamicPackageDef();
-      case CDODefsPackage.EGLOBAL_PACKAGE_DEF: return createEGlobalPackageDef();
-      case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF: return createCDOClientProtocolFactoryDef();
-      case CDODefsPackage.CDO_RESOURCE_DEF: return createCDOResourceDef();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    case CDODefsPackage.CDO_VIEW_DEF:
+      return createCDOViewDef();
+    case CDODefsPackage.CDO_TRANSACTION_DEF:
+      return createCDOTransactionDef();
+    case CDODefsPackage.CDO_AUDIT_DEF:
+      return createCDOAuditDef();
+    case CDODefsPackage.CDO_SESSION_DEF:
+      return createCDOSessionDef();
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF:
+      return createRetryFailOverStrategyDef();
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
+      return createCDOPackageRegistryDef();
+    case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF:
+      return createCDOEagerPackageRegistryDef();
+    case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF:
+      return createCDOLazyPackageRegistryDef();
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF:
+      return createEDynamicPackageDef();
+    case CDODefsPackage.EGLOBAL_PACKAGE_DEF:
+      return createEGlobalPackageDef();
+    case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF:
+      return createCDOClientProtocolFactoryDef();
+    case CDODefsPackage.CDO_RESOURCE_DEF:
+      return createCDOResourceDef();
+    default:
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -107,15 +124,16 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   {
     switch (eDataType.getClassifierID())
     {
-      case CDODefsPackage.RESOURCE_MODE:
-        return createResourceModeFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    case CDODefsPackage.RESOURCE_MODE:
+      return createResourceModeFromString(eDataType, initialValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -123,15 +141,16 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   {
     switch (eDataType.getClassifierID())
     {
-      case CDODefsPackage.RESOURCE_MODE:
-        return convertResourceModeToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    case CDODefsPackage.RESOURCE_MODE:
+      return convertResourceModeToString(eDataType, instanceValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOViewDef createCDOViewDef()
@@ -142,6 +161,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOTransactionDef createCDOTransactionDef()
@@ -152,6 +172,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOAuditDef createCDOAuditDef()
@@ -162,6 +183,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOSessionDef createCDOSessionDef()
@@ -172,6 +194,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public RetryFailOverStrategyDef createRetryFailOverStrategyDef()
@@ -182,6 +205,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOPackageRegistryDef createCDOPackageRegistryDef()
@@ -192,6 +216,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOEagerPackageRegistryDef createCDOEagerPackageRegistryDef()
@@ -202,6 +227,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef()
@@ -212,6 +238,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EDynamicPackageDef createEDynamicPackageDef()
@@ -222,6 +249,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EGlobalPackageDef createEGlobalPackageDef()
@@ -232,6 +260,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef()
@@ -242,6 +271,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOResourceDef createCDOResourceDef()
@@ -252,17 +282,21 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public ResourceMode createResourceModeFromString(EDataType eDataType, String initialValue)
   {
     ResourceMode result = ResourceMode.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    if (result == null)
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+          + eDataType.getName() + "'");
     return result;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String convertResourceModeToString(EDataType eDataType, Object instanceValue)
@@ -272,6 +306,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDODefsPackage getCDODefsPackage()
@@ -281,6 +316,7 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
index 38e956b025..6462cf6f96 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
@@ -41,97 +41,112 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoViewDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoTransactionDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoAuditDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoSessionDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass failOverStrategyDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass retryFailOverStrategyDefEClass = null;
 
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoEagerPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoLazyPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass ePackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass eDynamicPackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass eGlobalPackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoClientProtocolFactoryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass cdoResourceDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EEnum resourceModeEEnum = null;
@@ -156,17 +171,18 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
-   * <p>This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed.
-   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-   * <!-- begin-user-doc -->
+   * <p>
+   * This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed. Clients should not
+   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -174,10 +190,13 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
    */
   public static CDODefsPackage init()
   {
-    if (isInited) return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
+    if (isInited)
+      return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
 
     // Obtain or create and register package
-    CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CDODefsPackageImpl());
+    CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE
+        .get(eNS_URI)
+        : new CDODefsPackageImpl());
 
     isInited = true;
 
@@ -193,7 +212,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
     // Mark meta-data to indicate it can't be changed
     theCDODefsPackage.freeze();
 
-  
     // Update the registry and return the package
     EPackage.Registry.INSTANCE.put(CDODefsPackage.eNS_URI, theCDODefsPackage);
     return theCDODefsPackage;
@@ -201,6 +219,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOViewDef()
@@ -210,6 +229,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOViewDef_CdoSessionDef()
@@ -219,6 +239,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOTransactionDef()
@@ -228,6 +249,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOAuditDef()
@@ -237,6 +259,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCDOAuditDef_TimeStamp()
@@ -246,6 +269,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOSessionDef()
@@ -255,6 +279,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOSessionDef_ConnectorDef()
@@ -264,6 +289,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCDOSessionDef_RepositoryName()
@@ -273,6 +299,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOSessionDef_CdoPackageRegistryDef()
@@ -282,6 +309,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCDOSessionDef_LegacySupportEnabled()
@@ -291,6 +319,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOSessionDef_FailOverStrategyDef()
@@ -300,6 +329,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getFailOverStrategyDef()
@@ -309,6 +339,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getFailOverStrategyDef_ConnectorDef()
@@ -318,6 +349,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getRetryFailOverStrategyDef()
@@ -327,6 +359,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getRetryFailOverStrategyDef_Retries()
@@ -336,6 +369,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOPackageRegistryDef()
@@ -345,6 +379,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOPackageRegistryDef_Packages()
@@ -354,6 +389,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOEagerPackageRegistryDef()
@@ -363,6 +399,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOLazyPackageRegistryDef()
@@ -372,6 +409,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getEPackageDef()
@@ -381,6 +419,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getEPackageDef_NsURI()
@@ -390,6 +429,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getEDynamicPackageDef()
@@ -399,6 +439,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getEDynamicPackageDef_ResourceURI()
@@ -408,6 +449,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getEGlobalPackageDef()
@@ -417,6 +459,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOClientProtocolFactoryDef()
@@ -426,6 +469,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCDOResourceDef()
@@ -435,6 +479,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCDOResourceDef_CdoTransaction()
@@ -444,6 +489,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCDOResourceDef_ResourceMode()
@@ -453,6 +499,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCDOResourceDef_Path()
@@ -462,6 +509,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EEnum getResourceMode()
@@ -471,6 +519,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDODefsFactory getCDODefsFactory()
@@ -480,19 +529,21 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void createPackageContents()
   {
-    if (isCreated) return;
+    if (isCreated)
+      return;
     isCreated = true;
 
     // Create classes and their features
@@ -545,19 +596,21 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void initializePackageContents()
   {
-    if (isInitialized) return;
+    if (isInitialized)
+      return;
     isInitialized = true;
 
     // Initialize package
@@ -566,8 +619,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
-    Net4jDefsPackage theNet4jDefsPackage = (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
+    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE
+        .getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    Net4jDefsPackage theNet4jDefsPackage = (Net4jDefsPackage)EPackage.Registry.INSTANCE
+        .getEPackage(Net4jDefsPackage.eNS_URI);
 
     // Create type parameters
 
@@ -590,48 +645,89 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
     cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(cdoAuditDefEClass, CDOAuditDef.class, "CDOAuditDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCDOAuditDef_TimeStamp(), ecorePackage.getEDate(), "timeStamp", null, 1, 1, CDOAuditDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(cdoSessionDefEClass, CDOSessionDef.class, "CDOSessionDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOSessionDef_ConnectorDef(), theNet4jDefsPackage.getConnectorDef(), null, "connectorDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCDOSessionDef_FailOverStrategyDef(), this.getFailOverStrategyDef(), null, "failOverStrategyDef", null, 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(failOverStrategyDefEClass, FailOverStrategyDef.class, "FailOverStrategyDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getFailOverStrategyDef_ConnectorDef(), theNet4jDefsPackage.getConnectorDef(), null, "connectorDef", null, 1, 1, FailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(retryFailOverStrategyDefEClass, RetryFailOverStrategyDef.class, "RetryFailOverStrategyDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRetryFailOverStrategyDef_Retries(), ecorePackage.getEInt(), "retries", null, 0, 1, RetryFailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1, CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(cdoEagerPackageRegistryDefEClass, CDOEagerPackageRegistryDef.class, "CDOEagerPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(cdoLazyPackageRegistryDefEClass, CDOLazyPackageRegistryDef.class, "CDOLazyPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(ePackageDefEClass, EPackageDef.class, "EPackageDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEPackageDef_NsURI(), ecorePackage.getEString(), "nsURI", null, 1, 1, EPackageDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(eDynamicPackageDefEClass, EDynamicPackageDef.class, "EDynamicPackageDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEDynamicPackageDef_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 1, 1, EDynamicPackageDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(eGlobalPackageDefEClass, EGlobalPackageDef.class, "EGlobalPackageDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(cdoClientProtocolFactoryDefEClass, CDOClientProtocolFactoryDef.class, "CDOClientProtocolFactoryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1,
+        CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(cdoAuditDefEClass, CDOAuditDef.class, "CDOAuditDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCDOAuditDef_TimeStamp(), ecorePackage.getEDate(), "timeStamp", null, 1, 1, CDOAuditDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoSessionDefEClass, CDOSessionDef.class, "CDOSessionDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOSessionDef_ConnectorDef(), theNet4jDefsPackage.getConnectorDef(), null, "connectorDef", null,
+        1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1,
+        CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+        !IS_DERIVED, !IS_ORDERED);
+    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null,
+        "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled",
+        "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCDOSessionDef_FailOverStrategyDef(), this.getFailOverStrategyDef(), null, "failOverStrategyDef",
+        null, 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(failOverStrategyDefEClass, FailOverStrategyDef.class, "FailOverStrategyDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getFailOverStrategyDef_ConnectorDef(), theNet4jDefsPackage.getConnectorDef(), null, "connectorDef",
+        null, 1, 1, FailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(retryFailOverStrategyDefEClass, RetryFailOverStrategyDef.class, "RetryFailOverStrategyDef",
+        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRetryFailOverStrategyDef_Retries(), ecorePackage.getEInt(), "retries", null, 0, 1,
+        RetryFailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1,
+        CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoEagerPackageRegistryDefEClass, CDOEagerPackageRegistryDef.class, "CDOEagerPackageRegistryDef",
+        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(cdoLazyPackageRegistryDefEClass, CDOLazyPackageRegistryDef.class, "CDOLazyPackageRegistryDef",
+        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(ePackageDefEClass, EPackageDef.class, "EPackageDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEPackageDef_NsURI(), ecorePackage.getEString(), "nsURI", null, 1, 1, EPackageDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eDynamicPackageDefEClass, EDynamicPackageDef.class, "EDynamicPackageDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEDynamicPackageDef_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 1, 1,
+        EDynamicPackageDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eGlobalPackageDefEClass, EGlobalPackageDef.class, "EGlobalPackageDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(cdoClientProtocolFactoryDefEClass, CDOClientProtocolFactoryDef.class, "CDOClientProtocolFactoryDef",
+        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1,
+        CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1,
+        CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(resourceModeEEnum, ResourceMode.class, "ResourceMode");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
index 1672607316..d56fe20a73 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
@@ -21,13 +21,14 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOEagerPackageRegistryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOEagerPackageRegistryDefImpl()
@@ -37,6 +38,7 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
index 06d57f7890..ee2355f1e5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
@@ -21,13 +21,14 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOLazyPackageRegistryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOLazyPackageRegistryDefImpl()
@@ -37,6 +38,7 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
index df8fb8c036..2a1435c802 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
@@ -34,10 +34,10 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegistryDef
@@ -81,7 +81,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     if (packages == null)
     {
-      packages = new EObjectContainmentEList<EPackageDef>(EPackageDef.class, this, CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
+      packages = new EObjectContainmentEList<EPackageDef>(EPackageDef.class, this,
+          CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
     }
     return packages;
   }
@@ -103,8 +104,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-        return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+      return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
     }
     return super.eInverseRemove(otherEnd, featureID, msgs);
   }
@@ -126,8 +127,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-        return getPackages();
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+      return getPackages();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -147,10 +148,10 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-        getPackages().clear();
-        getPackages().addAll((Collection<? extends EPackageDef>)newValue);
-        return;
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+      getPackages().clear();
+      getPackages().addAll((Collection<? extends EPackageDef>)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
@@ -167,9 +168,9 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-        getPackages().clear();
-        return;
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+      getPackages().clear();
+      return;
     }
     super.eUnset(featureID);
   }
@@ -187,8 +188,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-        return packages != null && !packages.isEmpty();
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+      return packages != null && !packages.isEmpty();
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
index 4f3646f548..09ff3bc90d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
@@ -42,9 +42,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 {
 
   /**
-   * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference.
-   * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @see #getCdoTransaction()
    * @generated
    * @ordered
@@ -62,9 +62,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   protected static final ResourceMode RESOURCE_MODE_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getResourceMode()
    * @generated
    * @ordered
@@ -82,8 +82,8 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   protected static final String PATH_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached value of the '{@link #getPath() <em>Path</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #getPath()
    * @generated
    * @ordered
@@ -92,6 +92,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOResourceDefImpl()
@@ -101,6 +102,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -111,6 +113,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOTransactionDef getCdoTransaction()
@@ -122,7 +125,8 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
       if (cdoTransaction != oldCdoTransaction)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
+              oldCdoTransaction, cdoTransaction));
       }
     }
     return cdoTransaction;
@@ -130,6 +134,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOTransactionDef basicGetCdoTransaction()
@@ -139,6 +144,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setCdoTransaction(CDOTransactionDef newCdoTransaction)
@@ -146,11 +152,13 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     CDOTransactionDef oldCdoTransaction = cdoTransaction;
     cdoTransaction = newCdoTransaction;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
+          oldCdoTransaction, cdoTransaction));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public ResourceMode getResourceMode()
@@ -160,6 +168,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setResourceMode(ResourceMode newResourceMode)
@@ -167,11 +176,13 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     ResourceMode oldResourceMode = resourceMode;
     resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE, oldResourceMode, resourceMode));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE,
+          oldResourceMode, resourceMode));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getPath()
@@ -181,6 +192,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setPath(String newPath)
@@ -193,6 +205,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -200,19 +213,21 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
-        if (resolve) return getCdoTransaction();
-        return basicGetCdoTransaction();
-      case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
-        return getResourceMode();
-      case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
-        return getPath();
+    case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
+      if (resolve)
+        return getCdoTransaction();
+      return basicGetCdoTransaction();
+    case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
+      return getResourceMode();
+    case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
+      return getPath();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -220,21 +235,22 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
-        setCdoTransaction((CDOTransactionDef)newValue);
-        return;
-      case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
-        setResourceMode((ResourceMode)newValue);
-        return;
-      case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
-        setPath((String)newValue);
-        return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
+      setCdoTransaction((CDOTransactionDef)newValue);
+      return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
+      setResourceMode((ResourceMode)newValue);
+      return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
+      setPath((String)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -242,21 +258,22 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
-        setCdoTransaction((CDOTransactionDef)null);
-        return;
-      case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
-        setResourceMode(RESOURCE_MODE_EDEFAULT);
-        return;
-      case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
-        setPath(PATH_EDEFAULT);
-        return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
+      setCdoTransaction((CDOTransactionDef)null);
+      return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
+      setResourceMode(RESOURCE_MODE_EDEFAULT);
+      return;
+    case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
+      setPath(PATH_EDEFAULT);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -264,24 +281,26 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
-        return cdoTransaction != null;
-      case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
-        return resourceMode != RESOURCE_MODE_EDEFAULT;
-      case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
-        return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
+    case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
+      return cdoTransaction != null;
+    case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
+      return resourceMode != RESOURCE_MODE_EDEFAULT;
+    case CDODefsPackage.CDO_RESOURCE_DEF__PATH:
+      return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceMode: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
index 80cec3575c..e46db69943 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
@@ -174,10 +174,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
               oldConnectorDef, connectorDef));
-        }
       }
     }
     return connectorDef;
@@ -227,10 +225,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldConnectorDefESet = connectorDefESet;
     connectorDefESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, connectorDef, !oldConnectorDefESet));
-    }
   }
 
   /**
@@ -245,10 +241,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     connectorDef = null;
     connectorDefESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, null, oldConnectorDefESet));
-    }
   }
 
   /**
@@ -281,10 +275,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     String oldRepositoryName = repositoryName;
     repositoryName = newRepositoryName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME,
           oldRepositoryName, repositoryName));
-    }
   }
 
   /**
@@ -301,10 +293,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-        }
       }
     }
     return cdoPackageRegistryDef;
@@ -330,10 +320,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
     cdoPackageRegistryDef = newCdoPackageRegistryDef;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF,
           oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-    }
   }
 
   /**
@@ -356,10 +344,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldLegacySupportEnabled = legacySupportEnabled;
     legacySupportEnabled = newLegacySupportEnabled;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED,
           oldLegacySupportEnabled, legacySupportEnabled));
-    }
   }
 
   /**
@@ -376,10 +362,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (failOverStrategyDef != oldFailOverStrategyDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef));
-        }
       }
     }
     return failOverStrategyDef;
@@ -428,10 +412,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
     failOverStrategyDefESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF,
           oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet));
-    }
   }
 
   /**
@@ -446,10 +428,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     failOverStrategyDef = null;
     failOverStrategyDefESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF,
           oldFailOverStrategyDef, null, oldFailOverStrategyDefESet));
-    }
   }
 
   /**
@@ -474,25 +454,19 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     {
     case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
       if (resolve)
-      {
         return getConnectorDef();
-      }
       return basicGetConnectorDef();
     case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
       return getRepositoryName();
     case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
       if (resolve)
-      {
         return getCdoPackageRegistryDef();
-      }
       return basicGetCdoPackageRegistryDef();
     case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
       return isLegacySupportEnabled();
     case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
       if (resolve)
-      {
         return getFailOverStrategyDef();
-      }
       return basicGetFailOverStrategyDef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -590,9 +564,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (repositoryName: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
index 9ff5ff698d..f1135fe2d7 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransactionDef
@@ -30,6 +30,7 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOTransactionDefImpl()
@@ -39,6 +40,7 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
index e78e5d13e3..6a5d69a8e5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
@@ -30,19 +30,19 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 {
 
   /**
-   * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference.
-   * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @see #getCdoSessionDef()
    * @generated
    * @ordered
@@ -51,6 +51,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOViewDefImpl()
@@ -60,6 +61,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -70,6 +72,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOSessionDef getCdoSessionDef()
@@ -81,7 +84,8 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
       if (cdoSessionDef != oldCdoSessionDef)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
+              oldCdoSessionDef, cdoSessionDef));
       }
     }
     return cdoSessionDef;
@@ -89,6 +93,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOSessionDef basicGetCdoSessionDef()
@@ -98,6 +103,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setCdoSessionDef(CDOSessionDef newCdoSessionDef)
@@ -105,11 +111,13 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
     CDOSessionDef oldCdoSessionDef = cdoSessionDef;
     cdoSessionDef = newCdoSessionDef;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
+          oldCdoSessionDef, cdoSessionDef));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -117,15 +125,17 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-        if (resolve) return getCdoSessionDef();
-        return basicGetCdoSessionDef();
+    case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+      if (resolve)
+        return getCdoSessionDef();
+      return basicGetCdoSessionDef();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -133,15 +143,16 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-        setCdoSessionDef((CDOSessionDef)newValue);
-        return;
+    case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+      setCdoSessionDef((CDOSessionDef)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -149,15 +160,16 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-        setCdoSessionDef((CDOSessionDef)null);
-        return;
+    case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+      setCdoSessionDef((CDOSessionDef)null);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -165,8 +177,8 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-        return cdoSessionDef != null;
+    case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+      return cdoSessionDef != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
index 71fa0e5b8c..b766539282 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
@@ -26,18 +26,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicPackageDef
 {
   /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getResourceURI()
    * @generated
    * @ordered
@@ -45,9 +45,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   protected static final String RESOURCE_URI_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getResourceURI()
    * @generated
    * @ordered
@@ -56,6 +56,7 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected EDynamicPackageDefImpl()
@@ -65,6 +66,7 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -75,6 +77,7 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getResourceURI()
@@ -84,6 +87,7 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setResourceURI(String newResourceURI)
@@ -91,11 +95,13 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
     String oldResourceURI = resourceURI;
     resourceURI = newResourceURI;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI,
+          oldResourceURI, resourceURI));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -103,14 +109,15 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   {
     switch (featureID)
     {
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-        return getResourceURI();
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+      return getResourceURI();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -118,15 +125,16 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   {
     switch (featureID)
     {
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+      setResourceURI((String)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -134,15 +142,16 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   {
     switch (featureID)
     {
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+      setResourceURI(RESOURCE_URI_EDEFAULT);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -150,20 +159,22 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   {
     switch (featureID)
     {
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+      return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
index e93e7cb467..5f0dcac774 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
@@ -22,13 +22,14 @@ import org.eclipse.emf.ecore.EPackage;
  * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPackageDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected EGlobalPackageDefImpl()
@@ -38,6 +39,7 @@ public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
index 9b6a422484..17f7cec781 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
@@ -59,6 +59,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected EPackageDefImpl()
@@ -68,6 +69,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -78,6 +80,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getNsURI()
@@ -87,6 +90,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setNsURI(String newNsURI)
@@ -99,6 +103,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -106,14 +111,15 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-        return getNsURI();
+    case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+      return getNsURI();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -121,15 +127,16 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-        setNsURI((String)newValue);
-        return;
+    case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+      setNsURI((String)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -137,15 +144,16 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-        setNsURI(NS_URI_EDEFAULT);
-        return;
+    case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+      setNsURI(NS_URI_EDEFAULT);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -153,20 +161,22 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   {
     switch (featureID)
     {
-      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-        return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);
+    case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+      return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (nsURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
index b575863e20..2113e0189a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
@@ -28,18 +28,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl#getConnectorDef <em>Connector Def</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl#getConnectorDef <em>Connector Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOverStrategyDef
 {
   /**
-   * The cached value of the '{@link #getConnectorDef() <em>Connector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getConnectorDef() <em>Connector Def</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getConnectorDef()
    * @generated
    * @ordered
@@ -48,6 +48,7 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected FailOverStrategyDefImpl()
@@ -57,6 +58,7 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -67,6 +69,7 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public ConnectorDef getConnectorDef()
@@ -78,7 +81,8 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
       }
     }
     return connectorDef;
@@ -86,6 +90,7 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public ConnectorDef basicGetConnectorDef()
@@ -95,6 +100,7 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setConnectorDef(ConnectorDef newConnectorDef)
@@ -102,11 +108,13 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
     ConnectorDef oldConnectorDef = connectorDef;
     connectorDef = newConnectorDef;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF,
+          oldConnectorDef, connectorDef));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -114,15 +122,17 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
   {
     switch (featureID)
     {
-      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-        if (resolve) return getConnectorDef();
-        return basicGetConnectorDef();
+    case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+      if (resolve)
+        return getConnectorDef();
+      return basicGetConnectorDef();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -130,15 +140,16 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
   {
     switch (featureID)
     {
-      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-        setConnectorDef((ConnectorDef)newValue);
-        return;
+    case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+      setConnectorDef((ConnectorDef)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -146,15 +157,16 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
   {
     switch (featureID)
     {
-      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-        setConnectorDef((ConnectorDef)null);
-        return;
+    case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+      setConnectorDef((ConnectorDef)null);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -162,8 +174,8 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
   {
     switch (featureID)
     {
-      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-        return connectorDef != null;
+    case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+      return connectorDef != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
index 6abd96cc47..814aa4f301 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
@@ -28,18 +28,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl#getRetries <em>Retries</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl#getRetries <em>Retries</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implements RetryFailOverStrategyDef
 {
   /**
-   * The default value of the '{@link #getRetries() <em>Retries</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getRetries() <em>Retries</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getRetries()
    * @generated
    * @ordered
@@ -47,9 +47,9 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   protected static final int RETRIES_EDEFAULT = 0;
 
   /**
-   * The cached value of the '{@link #getRetries() <em>Retries</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getRetries() <em>Retries</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getRetries()
    * @generated
    * @ordered
@@ -57,8 +57,8 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   protected int retries = RETRIES_EDEFAULT;
 
   /**
-   * This is true if the Retries attribute has been set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * This is true if the Retries attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -66,6 +66,7 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected RetryFailOverStrategyDefImpl()
@@ -75,6 +76,7 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -85,6 +87,7 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public int getRetries()
@@ -94,6 +97,7 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setRetries(int newRetries)
@@ -103,11 +107,13 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
     boolean oldRetriesESet = retriesESet;
     retriesESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, retries, !oldRetriesESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES,
+          oldRetries, retries, !oldRetriesESet));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void unsetRetries()
@@ -117,11 +123,13 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
     retries = RETRIES_EDEFAULT;
     retriesESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, RETRIES_EDEFAULT, oldRetriesESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES,
+          oldRetries, RETRIES_EDEFAULT, oldRetriesESet));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public boolean isSetRetries()
@@ -131,6 +139,7 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -138,14 +147,15 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   {
     switch (featureID)
     {
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-        return getRetries();
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+      return getRetries();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -153,15 +163,16 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   {
     switch (featureID)
     {
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-        setRetries((Integer)newValue);
-        return;
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+      setRetries((Integer)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -169,15 +180,16 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   {
     switch (featureID)
     {
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-        unsetRetries();
-        return;
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+      unsetRetries();
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -185,24 +197,29 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   {
     switch (featureID)
     {
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-        return isSetRetries();
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+      return isSetRetries();
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (retries: ");
-    if (retriesESet) result.append(retries); else result.append("<unset>");
+    if (retriesESet)
+      result.append(retries);
+    else
+      result.append("<unset>");
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
index 39334ac063..1edf3550b2 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
@@ -4,13 +4,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
 package org.eclipse.emf.cdo.defs.util;
 
+//import org.eclipse.emf.cdo.defs.*;
 import org.eclipse.emf.cdo.defs.CDOAuditDef;
 import org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef;
 import org.eclipse.emf.cdo.defs.CDODefsPackage;
@@ -39,21 +40,22 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
 public class CDODefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static CDODefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDODefsAdapterFactory()
@@ -65,10 +67,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -87,108 +89,126 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDODefsSwitch<Adapter> modelSwitch = new CDODefsSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseCDOViewDef(CDOViewDef object)
+    {
+      return createCDOViewDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOTransactionDef(CDOTransactionDef object)
     {
-      @Override
-      public Adapter caseCDOViewDef(CDOViewDef object)
-      {
-        return createCDOViewDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOTransactionDef(CDOTransactionDef object)
-      {
-        return createCDOTransactionDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOAuditDef(CDOAuditDef object)
-      {
-        return createCDOAuditDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOSessionDef(CDOSessionDef object)
-      {
-        return createCDOSessionDefAdapter();
-      }
-      @Override
-      public Adapter caseFailOverStrategyDef(FailOverStrategyDef object)
-      {
-        return createFailOverStrategyDefAdapter();
-      }
-      @Override
-      public Adapter caseRetryFailOverStrategyDef(RetryFailOverStrategyDef object)
-      {
-        return createRetryFailOverStrategyDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOPackageRegistryDef(CDOPackageRegistryDef object)
-      {
-        return createCDOPackageRegistryDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOEagerPackageRegistryDef(CDOEagerPackageRegistryDef object)
-      {
-        return createCDOEagerPackageRegistryDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOLazyPackageRegistryDef(CDOLazyPackageRegistryDef object)
-      {
-        return createCDOLazyPackageRegistryDefAdapter();
-      }
-      @Override
-      public Adapter caseEPackageDef(EPackageDef object)
-      {
-        return createEPackageDefAdapter();
-      }
-      @Override
-      public Adapter caseEDynamicPackageDef(EDynamicPackageDef object)
-      {
-        return createEDynamicPackageDefAdapter();
-      }
-      @Override
-      public Adapter caseEGlobalPackageDef(EGlobalPackageDef object)
-      {
-        return createEGlobalPackageDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOClientProtocolFactoryDef(CDOClientProtocolFactoryDef object)
-      {
-        return createCDOClientProtocolFactoryDefAdapter();
-      }
-      @Override
-      public Adapter caseCDOResourceDef(CDOResourceDef object)
-      {
-        return createCDOResourceDefAdapter();
-      }
-      @Override
-      public Adapter caseDef(Def object)
-      {
-        return createDefAdapter();
-      }
-      @Override
-      public Adapter caseProtocolProviderDef(ProtocolProviderDef object)
-      {
-        return createProtocolProviderDefAdapter();
-      }
-      @Override
-      public Adapter caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
-      {
-        return createClientProtocolFactoryDefAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
+      return createCDOTransactionDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOAuditDef(CDOAuditDef object)
+    {
+      return createCDOAuditDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOSessionDef(CDOSessionDef object)
+    {
+      return createCDOSessionDefAdapter();
+    }
+
+    @Override
+    public Adapter caseFailOverStrategyDef(FailOverStrategyDef object)
+    {
+      return createFailOverStrategyDefAdapter();
+    }
+
+    @Override
+    public Adapter caseRetryFailOverStrategyDef(RetryFailOverStrategyDef object)
+    {
+      return createRetryFailOverStrategyDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOPackageRegistryDef(CDOPackageRegistryDef object)
+    {
+      return createCDOPackageRegistryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOEagerPackageRegistryDef(CDOEagerPackageRegistryDef object)
+    {
+      return createCDOEagerPackageRegistryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOLazyPackageRegistryDef(CDOLazyPackageRegistryDef object)
+    {
+      return createCDOLazyPackageRegistryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseEPackageDef(EPackageDef object)
+    {
+      return createEPackageDefAdapter();
+    }
+
+    @Override
+    public Adapter caseEDynamicPackageDef(EDynamicPackageDef object)
+    {
+      return createEDynamicPackageDefAdapter();
+    }
+
+    @Override
+    public Adapter caseEGlobalPackageDef(EGlobalPackageDef object)
+    {
+      return createEGlobalPackageDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOClientProtocolFactoryDef(CDOClientProtocolFactoryDef object)
+    {
+      return createCDOClientProtocolFactoryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCDOResourceDef(CDOResourceDef object)
+    {
+      return createCDOResourceDefAdapter();
+    }
+
+    @Override
+    public Adapter caseDef(Def object)
+    {
+      return createDefAdapter();
+    }
+
+    @Override
+    public Adapter caseProtocolProviderDef(ProtocolProviderDef object)
+    {
+      return createProtocolProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
+    {
+      return createClientProtocolFactoryDefAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
 
   /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param target the object to adapt.
+   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param target
+   *          the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -202,6 +222,7 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View Def</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOViewDef
    * @generated
@@ -212,10 +233,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef
+   * <em>CDO Transaction Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOTransactionDef
    * @generated
@@ -229,6 +251,7 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOAuditDef <em>CDO Audit Def</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOAuditDef
    * @generated
@@ -239,9 +262,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef <em>CDO Session Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef
+   * <em>CDO Session Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef
    * @generated
@@ -252,10 +276,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef
+   * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef
    * @generated
@@ -266,10 +291,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef <em>Retry Fail Over Strategy Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef
+   * <em>Retry Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
    * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef
    * @generated
@@ -280,10 +306,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
+   * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
    * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
    * @generated
@@ -294,10 +321,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
+   * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
    * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
    * @generated
@@ -308,10 +336,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
+   * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
    * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
    * @generated
@@ -325,6 +354,7 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EPackageDef <em>EPackage Def</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.EPackageDef
    * @generated
@@ -335,10 +365,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef
+   * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef
    * @generated
@@ -349,10 +380,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef
+   * <em>EGlobal Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.EGlobalPackageDef
    * @generated
@@ -363,10 +395,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
+   * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so
    * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
    * @generated
@@ -377,9 +410,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef <em>CDO Resource Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef
+   * <em>CDO Resource Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef
    * @generated
@@ -404,10 +438,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef
+   * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.net4j.defs.ProtocolProviderDef
    * @generated
@@ -418,10 +453,11 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef
+   * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
    * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef
    * @generated
@@ -432,9 +468,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
index fb24b69dff..cf49c37caf 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -41,21 +41,22 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
 public class CDODefsSwitch<T>
 {
   /**
-   * The cached model package
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static CDODefsPackage modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDODefsSwitch()
@@ -69,6 +70,7 @@ public class CDODefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -80,6 +82,7 @@ public class CDODefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -92,16 +95,14 @@ public class CDODefsSwitch<T>
     else
     {
       List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
     }
   }
 
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -109,136 +110,175 @@ public class CDODefsSwitch<T>
   {
     switch (classifierID)
     {
-      case CDODefsPackage.CDO_VIEW_DEF:
-      {
-        CDOViewDef cdoViewDef = (CDOViewDef)theEObject;
-        T result = caseCDOViewDef(cdoViewDef);
-        if (result == null) result = caseDef(cdoViewDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_TRANSACTION_DEF:
-      {
-        CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject;
-        T result = caseCDOTransactionDef(cdoTransactionDef);
-        if (result == null) result = caseCDOViewDef(cdoTransactionDef);
-        if (result == null) result = caseDef(cdoTransactionDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_AUDIT_DEF:
-      {
-        CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject;
-        T result = caseCDOAuditDef(cdoAuditDef);
-        if (result == null) result = caseCDOViewDef(cdoAuditDef);
-        if (result == null) result = caseDef(cdoAuditDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_SESSION_DEF:
-      {
-        CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject;
-        T result = caseCDOSessionDef(cdoSessionDef);
-        if (result == null) result = caseDef(cdoSessionDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF:
-      {
-        FailOverStrategyDef failOverStrategyDef = (FailOverStrategyDef)theEObject;
-        T result = caseFailOverStrategyDef(failOverStrategyDef);
-        if (result == null) result = caseDef(failOverStrategyDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF:
-      {
-        RetryFailOverStrategyDef retryFailOverStrategyDef = (RetryFailOverStrategyDef)theEObject;
-        T result = caseRetryFailOverStrategyDef(retryFailOverStrategyDef);
-        if (result == null) result = caseFailOverStrategyDef(retryFailOverStrategyDef);
-        if (result == null) result = caseDef(retryFailOverStrategyDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
-      {
-        CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject;
-        T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef);
-        if (result == null) result = caseDef(cdoPackageRegistryDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF:
-      {
-        CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject;
-        T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef);
-        if (result == null) result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef);
-        if (result == null) result = caseDef(cdoEagerPackageRegistryDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF:
-      {
-        CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject;
-        T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef);
-        if (result == null) result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef);
-        if (result == null) result = caseDef(cdoLazyPackageRegistryDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.EPACKAGE_DEF:
-      {
-        EPackageDef ePackageDef = (EPackageDef)theEObject;
-        T result = caseEPackageDef(ePackageDef);
-        if (result == null) result = caseDef(ePackageDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF:
-      {
-        EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject;
-        T result = caseEDynamicPackageDef(eDynamicPackageDef);
-        if (result == null) result = caseEPackageDef(eDynamicPackageDef);
-        if (result == null) result = caseDef(eDynamicPackageDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.EGLOBAL_PACKAGE_DEF:
-      {
-        EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject;
-        T result = caseEGlobalPackageDef(eGlobalPackageDef);
-        if (result == null) result = caseEPackageDef(eGlobalPackageDef);
-        if (result == null) result = caseDef(eGlobalPackageDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF:
-      {
-        CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject;
-        T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
-        if (result == null) result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
-        if (result == null) result = caseProtocolProviderDef(cdoClientProtocolFactoryDef);
-        if (result == null) result = caseDef(cdoClientProtocolFactoryDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CDODefsPackage.CDO_RESOURCE_DEF:
-      {
-        CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject;
-        T result = caseCDOResourceDef(cdoResourceDef);
-        if (result == null) result = caseDef(cdoResourceDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
+    case CDODefsPackage.CDO_VIEW_DEF:
+    {
+      CDOViewDef cdoViewDef = (CDOViewDef)theEObject;
+      T result = caseCDOViewDef(cdoViewDef);
+      if (result == null)
+        result = caseDef(cdoViewDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_TRANSACTION_DEF:
+    {
+      CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject;
+      T result = caseCDOTransactionDef(cdoTransactionDef);
+      if (result == null)
+        result = caseCDOViewDef(cdoTransactionDef);
+      if (result == null)
+        result = caseDef(cdoTransactionDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_AUDIT_DEF:
+    {
+      CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject;
+      T result = caseCDOAuditDef(cdoAuditDef);
+      if (result == null)
+        result = caseCDOViewDef(cdoAuditDef);
+      if (result == null)
+        result = caseDef(cdoAuditDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_SESSION_DEF:
+    {
+      CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject;
+      T result = caseCDOSessionDef(cdoSessionDef);
+      if (result == null)
+        result = caseDef(cdoSessionDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.FAIL_OVER_STRATEGY_DEF:
+    {
+      FailOverStrategyDef failOverStrategyDef = (FailOverStrategyDef)theEObject;
+      T result = caseFailOverStrategyDef(failOverStrategyDef);
+      if (result == null)
+        result = caseDef(failOverStrategyDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF:
+    {
+      RetryFailOverStrategyDef retryFailOverStrategyDef = (RetryFailOverStrategyDef)theEObject;
+      T result = caseRetryFailOverStrategyDef(retryFailOverStrategyDef);
+      if (result == null)
+        result = caseFailOverStrategyDef(retryFailOverStrategyDef);
+      if (result == null)
+        result = caseDef(retryFailOverStrategyDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
+    {
+      CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject;
+      T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef);
+      if (result == null)
+        result = caseDef(cdoPackageRegistryDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF:
+    {
+      CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject;
+      T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef);
+      if (result == null)
+        result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef);
+      if (result == null)
+        result = caseDef(cdoEagerPackageRegistryDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF:
+    {
+      CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject;
+      T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef);
+      if (result == null)
+        result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef);
+      if (result == null)
+        result = caseDef(cdoLazyPackageRegistryDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.EPACKAGE_DEF:
+    {
+      EPackageDef ePackageDef = (EPackageDef)theEObject;
+      T result = caseEPackageDef(ePackageDef);
+      if (result == null)
+        result = caseDef(ePackageDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.EDYNAMIC_PACKAGE_DEF:
+    {
+      EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject;
+      T result = caseEDynamicPackageDef(eDynamicPackageDef);
+      if (result == null)
+        result = caseEPackageDef(eDynamicPackageDef);
+      if (result == null)
+        result = caseDef(eDynamicPackageDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.EGLOBAL_PACKAGE_DEF:
+    {
+      EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject;
+      T result = caseEGlobalPackageDef(eGlobalPackageDef);
+      if (result == null)
+        result = caseEPackageDef(eGlobalPackageDef);
+      if (result == null)
+        result = caseDef(eGlobalPackageDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF:
+    {
+      CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject;
+      T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
+      if (result == null)
+        result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
+      if (result == null)
+        result = caseProtocolProviderDef(cdoClientProtocolFactoryDef);
+      if (result == null)
+        result = caseDef(cdoClientProtocolFactoryDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case CDODefsPackage.CDO_RESOURCE_DEF:
+    {
+      CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject;
+      T result = caseCDOResourceDef(cdoResourceDef);
+      if (result == null)
+        result = caseDef(cdoResourceDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
     }
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO View Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -249,10 +289,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'.
-   * <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -263,10 +304,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -277,10 +319,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Session Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -371,10 +414,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EPackage Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -401,10 +445,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'.
-   * <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -431,10 +476,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'.
-   * <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -445,10 +491,11 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -491,11 +538,12 @@ public class CDODefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated