[246623] Create Definition model as alternative configuration/wiring mechanism

https://bugs.eclipse.org/bugs/show_bug.cgi?id=246623

60 files changed, 3754 insertions, 4097 deletions

diff --git a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF
index 7fd028e57c..6d3b3da84c 100644
--- a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF
@@ -2,18 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.defs;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.net4j.defs;bundle-version="1.0.0",
- org.eclipse.net4j.util.defs;bundle-version="1.0.0",
- org.eclipse.emf.cdo.server;bundle-version="2.0.0"
+Require-Bundle: org.eclipse.net4j.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.util.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.cdodefs,
- org.eclipse.emf.cdo.cdodefs.impl,
- org.eclipse.emf.cdo.cdodefs.util
+Export-Package: org.eclipse.emf.cdo.cdodefs;version="2.0.0",
+ org.eclipse.emf.cdo.cdodefs.impl;version="2.0.0",
+ org.eclipse.emf.cdo.cdodefs.util;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore
index 657a00529c..c77195f2cb 100644
--- a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore
+++ b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore
@@ -49,13 +49,6 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EGlobalPackageDef" eSuperTypes="#//EPackageDef"/>
   <eClassifiers xsi:type="ecore:EClass" name="CDOClientProtocolFactoryDef" eSuperTypes="../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CDOServerProtocolFactoryDef" eSuperTypes="../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="repositoryProviderDef"
-        lowerBound="1" eType="#//RepositoryProviderDef"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RepositoryProviderDef" abstract="true"
-      eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PluginRepositoryProviderDef" eSuperTypes="#//RepositoryProviderDef"/>
   <eClassifiers xsi:type="ecore:EClass" name="CDOResourceDef" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def">
     <eStructuralFeatures xsi:type="ecore:EReference" name="cdoTransaction" lowerBound="1"
         eType="#//CDOTransactionDef"/>
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOAuditDef.java
index 9211c8b5a4..0f3e248997 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOAuditDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOAuditDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOAuditDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOAuditDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -26,29 +26,29 @@ 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.cdodefs.CDODefsPackage#getCDOAuditDef_TimeStamp()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Time Stamp</em>' attribute.
+   * @see #setTimeStamp(Date)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOAuditDef_TimeStamp()
+   * @model required="true"
+   * @generated
+   */
 	Date getTimeStamp();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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.
-	 * @see #getTimeStamp()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Time Stamp</em>' attribute.
+   * @see #getTimeStamp()
+   * @generated
+   */
 	void setTimeStamp(Date value);
 
 } // CDOAuditDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsFactory.java
index 095d9fce9d..7649c6ce77 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsFactory.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDODefsFactory.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -18,146 +18,128 @@ import org.eclipse.emf.ecore.EFactory;
  */
 public interface CDODefsFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	CDODefsFactory eINSTANCE = org.eclipse.emf.cdo.cdodefs.impl.CDODefsFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>CDO View Def</em>'.
-	 * <!-- begin-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
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @return a new object of class '<em>CDO Session Def</em>'.
+   * @generated
+   */
 	CDOSessionDef createCDOSessionDef();
 
 	/**
-	 * Returns a new object of class '<em>Retry Fail Over Strategy Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Retry Fail Over Strategy Def</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Retry Fail Over Strategy Def</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Retry Fail Over Strategy Def</em>'.
+   * @generated
+   */
 	RetryFailOverStrategyDef createRetryFailOverStrategyDef();
 
 	/**
-	 * Returns a new object of class '<em>CDO Package Registry Def</em>'.
-	 * <!-- begin-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
-	 */
+   * @return a new object of class '<em>CDO Package Registry Def</em>'.
+   * @generated
+   */
 	CDOPackageRegistryDef createCDOPackageRegistryDef();
 
 	/**
-	 * Returns a new object of class '<em>CDO Eager Package Registry Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>CDO Eager Package Registry Def</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>CDO Eager Package Registry Def</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>CDO Eager Package Registry Def</em>'.
+   * @generated
+   */
 	CDOEagerPackageRegistryDef createCDOEagerPackageRegistryDef();
 
 	/**
-	 * Returns a new object of class '<em>CDO Lazy Package Registry Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>CDO Lazy Package Registry Def</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>CDO Lazy Package Registry Def</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>CDO Lazy Package Registry Def</em>'.
+   * @generated
+   */
 	CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef();
 
 	/**
-	 * Returns a new object of class '<em>EDynamic Package Def</em>'.
-	 * <!-- begin-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
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @return a new object of class '<em>EGlobal Package Def</em>'.
+   * @generated
+   */
 	EGlobalPackageDef createEGlobalPackageDef();
 
 	/**
-	 * Returns a new object of class '<em>CDO Client Protocol Factory Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>CDO Client Protocol Factory Def</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>CDO Client Protocol Factory Def</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>CDO Client Protocol Factory Def</em>'.
+   * @generated
+   */
 	CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef();
 
 	/**
-	 * Returns a new object of class '<em>CDO Server Protocol Factory Def</em>'.
-	 * <!-- begin-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 Server Protocol Factory Def</em>'.
-	 * @generated
-	 */
-	CDOServerProtocolFactoryDef createCDOServerProtocolFactoryDef();
-
-	/**
-	 * Returns a new object of class '<em>Plugin Repository Provider Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Plugin Repository Provider Def</em>'.
-	 * @generated
-	 */
-	PluginRepositoryProviderDef createPluginRepositoryProviderDef();
-
-	/**
-	 * 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
-	 */
+   * @return a new object of class '<em>CDO Resource Def</em>'.
+   * @generated
+   */
 	CDOResourceDef createCDOResourceDef();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
+   * @return the package supported by this factory.
+   * @generated
+   */
 	CDODefsPackage getCDODefsPackage();
 
 } //CDODefsFactory
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsPackage.java
index fcd386dc8a..53148e8fcd 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDODefsPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsPackage.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDODefsPackage.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -32,945 +32,838 @@ import org.eclipse.emf.ecore.EReference;
  */
 public interface CDODefsPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
+   * The package name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNAME = "cdodefs";
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNS_URI = "http://www.eclipse.org/emf/CDO/defs/1.0.0";
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
+   * The package namespace name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNS_PREFIX = "cdodefs";
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	CDODefsPackage eINSTANCE = org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOViewDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOViewDef()
+   * @generated
+   */
 	int CDO_VIEW_DEF = 0;
 
 	/**
-	 * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_VIEW_DEF__CDO_SESSION_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>CDO View Def</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO View Def</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_VIEW_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOTransactionDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOTransactionDef()
+   * @generated
+   */
 	int CDO_TRANSACTION_DEF = 1;
 
 	/**
-	 * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_TRANSACTION_DEF_FEATURE_COUNT = CDO_VIEW_DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOAuditDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOAuditDef()
+   * @generated
+   */
 	int CDO_AUDIT_DEF = 2;
 
 	/**
-	 * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Time Stamp</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_AUDIT_DEF__TIME_STAMP = CDO_VIEW_DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>CDO Audit Def</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Audit Def</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_AUDIT_DEF_FEATURE_COUNT = CDO_VIEW_DEF_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOSessionDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOSessionDef()
+   * @generated
+   */
 	int CDO_SESSION_DEF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Connector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Repository Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @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
-	 */
+   * @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
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_SESSION_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
+   * @generated
+   */
 	int FAIL_OVER_STRATEGY_DEF = 4;
 
 	/**
-	 * The feature id for the '<em><b>Connector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @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.cdodefs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
+   * @generated
+   */
 	int RETRY_FAIL_OVER_STRATEGY_DEF = 5;
 
 	/**
-	 * The feature id for the '<em><b>Connector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Connector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Retries</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @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.cdodefs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
+   * @generated
+   */
 	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
-	 */
+   * @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
-	 */
+   * @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.cdodefs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
+   * @generated
+   */
 	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
-	 */
+   * @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
-	 */
+   * @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.cdodefs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
+   * @generated
+   */
 	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
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_LAZY_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEPackageDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEPackageDef()
+   * @generated
+   */
 	int EPACKAGE_DEF = 9;
 
 	/**
-	 * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int EPACKAGE_DEF__NS_URI = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>EPackage Def</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>EPackage Def</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int EPACKAGE_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
+   * @generated
+   */
 	int EDYNAMIC_PACKAGE_DEF = 10;
 
 	/**
-	 * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int EDYNAMIC_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
+   * @generated
+   */
 	int EGLOBAL_PACKAGE_DEF = 11;
 
 	/**
-	 * The feature id for the '<em><b>Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int EGLOBAL_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
-	 * @generated
-	 */
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
+   * @generated
+   */
 	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
-	 */
+   * @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.cdodefs.impl.CDOServerProtocolFactoryDefImpl <em>CDO Server Protocol Factory Def</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOServerProtocolFactoryDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOServerProtocolFactoryDef()
-	 * @generated
-	 */
-	int CDO_SERVER_PROTOCOL_FACTORY_DEF = 13;
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOResourceDef()
+   * @generated
+   */
+	int CDO_RESOURCE_DEF = 13;
 
 	/**
-	 * The feature id for the '<em><b>Repository Provider Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Cdo Transaction</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF = Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>CDO Server Protocol Factory Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CDO_SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.RepositoryProviderDefImpl <em>Repository Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.RepositoryProviderDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRepositoryProviderDef()
-	 * @generated
-	 */
-	int REPOSITORY_PROVIDER_DEF = 14;
-
-	/**
-	 * The number of structural features of the '<em>Repository Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPOSITORY_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.PluginRepositoryProviderDefImpl <em>Plugin Repository Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.PluginRepositoryProviderDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getPluginRepositoryProviderDef()
-	 * @generated
-	 */
-	int PLUGIN_REPOSITORY_PROVIDER_DEF = 15;
-
-	/**
-	 * The number of structural features of the '<em>Plugin Repository Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLUGIN_REPOSITORY_PROVIDER_DEF_FEATURE_COUNT = REPOSITORY_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOResourceDef()
-	 * @generated
-	 */
-	int CDO_RESOURCE_DEF = 16;
-
-	/**
-	 * The feature id for the '<em><b>Cdo Transaction</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Resource Mode</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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 -->
+   * The feature id for the '<em><b>Path</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @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
-	 */
+   * @generated
+   * @ordered
+   */
 	int CDO_RESOURCE_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
-	 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getResourceMode()
-	 * @generated
-	 */
-	int RESOURCE_MODE = 17;
+   * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
+   * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getResourceMode()
+   * @generated
+   */
+	int RESOURCE_MODE = 14;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOViewDef <em>CDO View Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOViewDef <em>CDO View Def</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CDO View Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOViewDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO View Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOViewDef
+   * @generated
+   */
 	EClass getCDOViewDef();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOViewDef#getCdoSessionDef()
-	 * @see #getCDOViewDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Cdo Session Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOViewDef#getCdoSessionDef()
+   * @see #getCDOViewDef()
+   * @generated
+   */
 	EReference getCDOViewDef_CdoSessionDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOTransactionDef <em>CDO Transaction Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOTransactionDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Transaction Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOTransactionDef
+   * @generated
+   */
 	EClass getCDOTransactionDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef <em>CDO Audit Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef <em>CDO Audit Def</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CDO Audit Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOAuditDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Audit Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOAuditDef
+   * @generated
+   */
 	EClass getCDOAuditDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOAuditDef#getTimeStamp()
-	 * @see #getCDOAuditDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Time Stamp</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOAuditDef#getTimeStamp()
+   * @see #getCDOAuditDef()
+   * @generated
+   */
 	EAttribute getCDOAuditDef_TimeStamp();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef <em>CDO Session Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef <em>CDO Session Def</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CDO Session Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Session Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef
+   * @generated
+   */
 	EClass getCDOSessionDef();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef#getConnectorDef()
-	 * @see #getCDOSessionDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Connector Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef()
+   * @see #getCDOSessionDef()
+   * @generated
+   */
 	EReference getCDOSessionDef_ConnectorDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef#getRepositoryName()
-	 * @see #getCDOSessionDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Repository Name</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getRepositoryName()
+   * @see #getCDOSessionDef()
+   * @generated
+   */
 	EAttribute getCDOSessionDef_RepositoryName();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef#getCdoPackageRegistryDef()
-	 * @see #getCDOSessionDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Cdo Package Registry Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getCdoPackageRegistryDef()
+   * @see #getCDOSessionDef()
+   * @generated
+   */
 	EReference getCDOSessionDef_CdoPackageRegistryDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef#isLegacySupportEnabled()
-	 * @see #getCDOSessionDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Legacy Support Enabled</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef#isLegacySupportEnabled()
+   * @see #getCDOSessionDef()
+   * @generated
+   */
 	EAttribute getCDOSessionDef_LegacySupportEnabled();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef#getFailOverStrategyDef()
-	 * @see #getCDOSessionDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Fail Over Strategy Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef()
+   * @see #getCDOSessionDef()
+   * @generated
+   */
 	EReference getCDOSessionDef_FailOverStrategyDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.FailOverStrategyDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Fail Over Strategy Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef
+   * @generated
+   */
 	EClass getFailOverStrategyDef();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.FailOverStrategyDef#getConnectorDef()
-	 * @see #getFailOverStrategyDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Connector Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef#getConnectorDef()
+   * @see #getFailOverStrategyDef()
+   * @generated
+   */
 	EReference getFailOverStrategyDef_ConnectorDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef <em>Retry Fail Over Strategy Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.RetryFailOverStrategyDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Retry Fail Over Strategy Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef
+   * @generated
+   */
 	EClass getRetryFailOverStrategyDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.RetryFailOverStrategyDef#getRetries()
-	 * @see #getRetryFailOverStrategyDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Retries</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries()
+   * @see #getRetryFailOverStrategyDef()
+   * @generated
+   */
 	EAttribute getRetryFailOverStrategyDef_Retries();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOPackageRegistryDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Package Registry Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef
+   * @generated
+   */
 	EClass getCDOPackageRegistryDef();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOPackageRegistryDef#getPackages()
-	 * @see #getCDOPackageRegistryDef()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Packages</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef#getPackages()
+   * @see #getCDOPackageRegistryDef()
+   * @generated
+   */
 	EReference getCDOPackageRegistryDef_Packages();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOEagerPackageRegistryDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Eager Package Registry Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef
+   * @generated
+   */
 	EClass getCDOEagerPackageRegistryDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOLazyPackageRegistryDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Lazy Package Registry Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef
+   * @generated
+   */
 	EClass getCDOLazyPackageRegistryDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef <em>EPackage Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef <em>EPackage Def</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EPackage Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.EPackageDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>EPackage Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.EPackageDef
+   * @generated
+   */
 	EClass getEPackageDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef#getNsURI <em>Ns URI</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EPackageDef#getNsURI()
-	 * @see #getEPackageDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Ns URI</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.EPackageDef#getNsURI()
+   * @see #getEPackageDef()
+   * @generated
+   */
 	EAttribute getEPackageDef_NsURI();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef <em>EDynamic Package Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EDynamicPackageDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>EDynamic Package Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef
+   * @generated
+   */
 	EClass getEDynamicPackageDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EDynamicPackageDef#getResourceURI()
-	 * @see #getEDynamicPackageDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Resource URI</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef#getResourceURI()
+   * @see #getEDynamicPackageDef()
+   * @generated
+   */
 	EAttribute getEDynamicPackageDef_ResourceURI();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef <em>EGlobal Package Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EGlobalPackageDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>EGlobal Package Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef
+   * @generated
+   */
 	EClass getEGlobalPackageDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOClientProtocolFactoryDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Client Protocol Factory Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOClientProtocolFactoryDef
+   * @generated
+   */
 	EClass getCDOClientProtocolFactoryDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef <em>CDO Server Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef <em>CDO Resource Def</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CDO Server Protocol Factory Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef
-	 * @generated
-	 */
-	EClass getCDOServerProtocolFactoryDef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef#getRepositoryProviderDef <em>Repository Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Repository Provider Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef#getRepositoryProviderDef()
-	 * @see #getCDOServerProtocolFactoryDef()
-	 * @generated
-	 */
-	EReference getCDOServerProtocolFactoryDef_RepositoryProviderDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef <em>Repository Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Repository Provider Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef
-	 * @generated
-	 */
-	EClass getRepositoryProviderDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef <em>Plugin Repository Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Plugin Repository Provider Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef
-	 * @generated
-	 */
-	EClass getPluginRepositoryProviderDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef <em>CDO Resource Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CDO Resource Def</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef
-	 * @generated
-	 */
+   * @return the meta object for class '<em>CDO Resource Def</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef
+   * @generated
+   */
 	EClass getCDOResourceDef();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOResourceDef#getCdoTransaction()
-	 * @see #getCDOResourceDef()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Cdo Transaction</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getCdoTransaction()
+   * @see #getCDOResourceDef()
+   * @generated
+   */
 	EReference getCDOResourceDef_CdoTransaction();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOResourceDef#getResourceMode()
-	 * @see #getCDOResourceDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Resource Mode</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getResourceMode()
+   * @see #getCDOResourceDef()
+   * @generated
+   */
 	EAttribute getCDOResourceDef_ResourceMode();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getPath <em>Path</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOResourceDef#getPath()
-	 * @see #getCDOResourceDef()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Path</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getPath()
+   * @see #getCDOResourceDef()
+   * @generated
+   */
 	EAttribute getCDOResourceDef_Path();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Resource Mode</em>'.
-	 * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>Resource Mode</em>'.
+   * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
+   * @generated
+   */
 	EEnum getResourceMode();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-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
-	 */
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
 	CDODefsFactory getCDODefsFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
 	 *   <li>each class,</li>
@@ -979,315 +872,277 @@ public interface CDODefsPackage extends EPackage {
 	 *   <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOViewDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOViewDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOViewDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EReference CDO_VIEW_DEF__CDO_SESSION_DEF = eINSTANCE.getCDOViewDef_CdoSessionDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOTransactionDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOTransactionDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOTransactionDef()
+     * @generated
+     */
 		EClass CDO_TRANSACTION_DEF = eINSTANCE.getCDOTransactionDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOAuditDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOAuditDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOAuditDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EAttribute CDO_AUDIT_DEF__TIME_STAMP = eINSTANCE.getCDOAuditDef_TimeStamp();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOSessionDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOSessionDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOSessionDef()
+     * @generated
+     */
 		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
-		 */
+     * @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
-		 */
+     * @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
-		 */
+     * @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
-		 */
+     * @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
-		 */
+     * @generated
+     */
 		EReference CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF = eINSTANCE.getCDOSessionDef_FailOverStrategyDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl <em>Fail Over Strategy Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.FailOverStrategyDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getFailOverStrategyDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EReference FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = eINSTANCE.getFailOverStrategyDef_ConnectorDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl <em>Retry Fail Over Strategy Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.RetryFailOverStrategyDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EAttribute RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES = eINSTANCE.getRetryFailOverStrategyDef_Retries();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOPackageRegistryDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
+     * @generated
+     */
 		EClass CDO_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOPackageRegistryDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOEagerPackageRegistryDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
+     * @generated
+     */
 		EClass CDO_EAGER_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOEagerPackageRegistryDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOLazyPackageRegistryDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
+     * @generated
+     */
 		EClass CDO_LAZY_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOLazyPackageRegistryDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEPackageDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.EPackageDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEPackageDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EAttribute EPACKAGE_DEF__NS_URI = eINSTANCE.getEPackageDef_NsURI();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.EDynamicPackageDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
+     * @generated
+     */
 		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
-		 */
+     * @generated
+     */
 		EAttribute EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = eINSTANCE.getEDynamicPackageDef_ResourceURI();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.EGlobalPackageDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
+     * @generated
+     */
 		EClass EGLOBAL_PACKAGE_DEF = eINSTANCE.getEGlobalPackageDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOClientProtocolFactoryDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
+     * @generated
+     */
 		EClass CDO_CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getCDOClientProtocolFactoryDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOServerProtocolFactoryDefImpl <em>CDO Server Protocol Factory Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOServerProtocolFactoryDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOServerProtocolFactoryDef()
-		 * @generated
-		 */
-		EClass CDO_SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getCDOServerProtocolFactoryDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Repository Provider Def</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF = eINSTANCE.getCDOServerProtocolFactoryDef_RepositoryProviderDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.RepositoryProviderDefImpl <em>Repository Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.RepositoryProviderDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getRepositoryProviderDef()
-		 * @generated
-		 */
-		EClass REPOSITORY_PROVIDER_DEF = eINSTANCE.getRepositoryProviderDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.PluginRepositoryProviderDefImpl <em>Plugin Repository Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.PluginRepositoryProviderDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getPluginRepositoryProviderDef()
-		 * @generated
-		 */
-		EClass PLUGIN_REPOSITORY_PROVIDER_DEF = eINSTANCE.getPluginRepositoryProviderDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOResourceDef()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDOResourceDefImpl
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getCDOResourceDef()
+     * @generated
+     */
 		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
-		 */
+     * @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
-		 */
+     * @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
-		 */
+     * @generated
+     */
 		EAttribute CDO_RESOURCE_DEF__PATH = eINSTANCE.getCDOResourceDef_Path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.cdodefs.ResourceMode <em>Resource Mode</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
-		 * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getResourceMode()
-		 * @generated
-		 */
+     * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
+     * @see org.eclipse.emf.cdo.cdodefs.impl.CDODefsPackageImpl#getResourceMode()
+     * @generated
+     */
 		EEnum RESOURCE_MODE = eINSTANCE.getResourceMode();
 
 	}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOPackageRegistryDef.java
index c33dfb9176..79e3f718d3 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOPackageRegistryDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOPackageRegistryDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOPackageRegistryDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -28,19 +28,19 @@ 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.cdodefs.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.cdodefs.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.cdodefs.CDODefsPackage#getCDOPackageRegistryDef_Packages()
-	 * @model containment="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Packages</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOPackageRegistryDef_Packages()
+   * @model containment="true"
+   * @generated
+   */
 	EList<EPackageDef> getPackages();
 
 } // CDOPackageRegistryDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOResourceDef.java
index 8854da1877..6d9af5114e 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOResourceDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOResourceDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOResourceDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOResourceDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -28,85 +28,85 @@ import org.eclipse.net4j.util.net4jutildefs.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.cdodefs.CDODefsPackage#getCDOResourceDef_CdoTransaction()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Cdo Transaction</em>' reference.
+   * @see #setCdoTransaction(CDOTransactionDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOResourceDef_CdoTransaction()
+   * @model required="true"
+   * @generated
+   */
 	CDOTransactionDef getCdoTransaction();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @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.cdodefs.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.cdodefs.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.cdodefs.ResourceMode
-	 * @see #setResourceMode(ResourceMode)
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOResourceDef_ResourceMode()
-	 * @model default="NULL" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Resource Mode</em>' attribute.
+   * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
+   * @see #setResourceMode(ResourceMode)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOResourceDef_ResourceMode()
+   * @model default="null" required="true"
+   * @generated
+   */
 	ResourceMode getResourceMode();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.ResourceMode
-	 * @see #getResourceMode()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Resource Mode</em>' attribute.
+   * @see org.eclipse.emf.cdo.cdodefs.ResourceMode
+   * @see #getResourceMode()
+   * @generated
+   */
 	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.cdodefs.CDODefsPackage#getCDOResourceDef_Path()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Path</em>' attribute.
+   * @see #setPath(String)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOResourceDef_Path()
+   * @model required="true"
+   * @generated
+   */
 	String getPath();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getPath <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef#getPath <em>Path</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Path</em>' attribute.
-	 * @see #getPath()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Path</em>' attribute.
+   * @see #getPath()
+   * @generated
+   */
 	void setPath(String value);
 
 } // CDOResourceDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOServerProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOServerProtocolFactoryDef.java
deleted file mode 100644
index 6bd968536c..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOServerProtocolFactoryDef.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOServerProtocolFactoryDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs;
-
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>CDO Server Protocol Factory Def</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef#getRepositoryProviderDef <em>Repository Provider Def</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOServerProtocolFactoryDef()
- * @model
- * @generated
- */
-public interface CDOServerProtocolFactoryDef extends ServerProtocolFactoryDef {
-
-	/**
-	 * Returns the value of the '<em><b>Repository Provider Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Repository Provider 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>Repository Provider Def</em>' reference.
-	 * @see #setRepositoryProviderDef(RepositoryProviderDef)
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOServerProtocolFactoryDef_RepositoryProviderDef()
-	 * @model required="true"
-	 * @generated
-	 */
-	RepositoryProviderDef getRepositoryProviderDef();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef#getRepositoryProviderDef <em>Repository Provider Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repository Provider Def</em>' reference.
-	 * @see #getRepositoryProviderDef()
-	 * @generated
-	 */
-	void setRepositoryProviderDef(RepositoryProviderDef value);
-} // CDOServerProtocolFactoryDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOSessionDef.java
index d10b1c5c4d..9f11ad33f5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOSessionDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOSessionDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOSessionDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOSessionDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -31,188 +31,188 @@ import org.eclipse.net4j.util.net4jutildefs.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()
-	 * @see #setConnectorDef(ConnectorDef)
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_ConnectorDef()
-	 * @model unsettable="true" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Connector Def</em>' reference.
+   * @see #isSetConnectorDef()
+   * @see #unsetConnectorDef()
+   * @see #setConnectorDef(ConnectorDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_ConnectorDef()
+   * @model unsettable="true" required="true"
+   * @generated
+   */
 	ConnectorDef getConnectorDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Connector Def</em>' reference.
+   * @see #isSetConnectorDef()
+   * @see #unsetConnectorDef()
+   * @see #getConnectorDef()
+   * @generated
+   */
 	void setConnectorDef(ConnectorDef value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSetConnectorDef()
-	 * @see #getConnectorDef()
-	 * @see #setConnectorDef(ConnectorDef)
-	 * @generated
-	 */
+   * @see #isSetConnectorDef()
+   * @see #getConnectorDef()
+   * @see #setConnectorDef(ConnectorDef)
+   * @generated
+   */
 	void unsetConnectorDef();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference is set.
-	 * <!-- begin-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @see #setConnectorDef(ConnectorDef)
-	 * @generated
-	 */
+   * @return whether the value of the '<em>Connector Def</em>' reference is set.
+   * @see #unsetConnectorDef()
+   * @see #getConnectorDef()
+   * @see #setConnectorDef(ConnectorDef)
+   * @generated
+   */
 	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>Repository 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.cdodefs.CDODefsPackage#getCDOSessionDef_RepositoryName()
-	 * @model unique="false" required="true" ordered="false"
-	 * @generated
-	 */
+   * @return the value of the '<em>Repository Name</em>' attribute.
+   * @see #setRepositoryName(String)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_RepositoryName()
+   * @model unique="false" required="true" ordered="false"
+   * @generated
+   */
 	String getRepositoryName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @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.cdodefs.CDODefsPackage#getCDOSessionDef_CdoPackageRegistryDef()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Cdo Package Registry Def</em>' reference.
+   * @see #setCdoPackageRegistryDef(CDOPackageRegistryDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_CdoPackageRegistryDef()
+   * @model required="true"
+   * @generated
+   */
 	CDOPackageRegistryDef getCdoPackageRegistryDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @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.cdodefs.CDODefsPackage#getCDOSessionDef_LegacySupportEnabled()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Legacy Support Enabled</em>' attribute.
+   * @see #setLegacySupportEnabled(boolean)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_LegacySupportEnabled()
+   * @model default="false" required="true"
+   * @generated
+   */
 	boolean isLegacySupportEnabled();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @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()
-	 * @see #setFailOverStrategyDef(FailOverStrategyDef)
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_FailOverStrategyDef()
-	 * @model unsettable="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Fail Over Strategy Def</em>' reference.
+   * @see #isSetFailOverStrategyDef()
+   * @see #unsetFailOverStrategyDef()
+   * @see #setFailOverStrategyDef(FailOverStrategyDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOSessionDef_FailOverStrategyDef()
+   * @model unsettable="true"
+   * @generated
+   */
 	FailOverStrategyDef getFailOverStrategyDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Fail Over Strategy Def</em>' reference.
+   * @see #isSetFailOverStrategyDef()
+   * @see #unsetFailOverStrategyDef()
+   * @see #getFailOverStrategyDef()
+   * @generated
+   */
 	void setFailOverStrategyDef(FailOverStrategyDef value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSetFailOverStrategyDef()
-	 * @see #getFailOverStrategyDef()
-	 * @see #setFailOverStrategyDef(FailOverStrategyDef)
-	 * @generated
-	 */
+   * @see #isSetFailOverStrategyDef()
+   * @see #getFailOverStrategyDef()
+   * @see #setFailOverStrategyDef(FailOverStrategyDef)
+   * @generated
+   */
 	void unsetFailOverStrategyDef();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}' reference is set.
-	 * <!-- begin-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @see #setFailOverStrategyDef(FailOverStrategyDef)
-	 * @generated
-	 */
+   * @return whether the value of the '<em>Fail Over Strategy Def</em>' reference is set.
+   * @see #unsetFailOverStrategyDef()
+   * @see #getFailOverStrategyDef()
+   * @see #setFailOverStrategyDef(FailOverStrategyDef)
+   * @generated
+   */
 	boolean isSetFailOverStrategyDef();
 
 } // CDOSessionDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOViewDef.java
index c4a259f240..ceb524f31e 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOViewDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/CDOViewDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOViewDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOViewDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -26,29 +26,29 @@ import org.eclipse.net4j.util.net4jutildefs.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.cdodefs.CDODefsPackage#getCDOViewDef_CdoSessionDef()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Cdo Session Def</em>' reference.
+   * @see #setCdoSessionDef(CDOSessionDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getCDOViewDef_CdoSessionDef()
+   * @model required="true"
+   * @generated
+   */
 	CDOSessionDef getCdoSessionDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @param value the new value of the '<em>Cdo Session Def</em>' reference.
+   * @see #getCdoSessionDef()
+   * @generated
+   */
 	void setCdoSessionDef(CDOSessionDef value);
 
 } // CDOViewDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EDynamicPackageDef.java
index 7fcc73a690..3c590c9816 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EDynamicPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EDynamicPackageDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EDynamicPackageDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: EDynamicPackageDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -25,29 +25,29 @@ package org.eclipse.emf.cdo.cdodefs;
  */
 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.cdodefs.CDODefsPackage#getEDynamicPackageDef_ResourceURI()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Resource URI</em>' attribute.
+   * @see #setResourceURI(String)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getEDynamicPackageDef_ResourceURI()
+   * @model required="true"
+   * @generated
+   */
 	String getResourceURI();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @param value the new value of the '<em>Resource URI</em>' attribute.
+   * @see #getResourceURI()
+   * @generated
+   */
 	void setResourceURI(String value);
 
 } // DynamicCDOPackageDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EPackageDef.java
index 3d470df9f4..510685b838 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/EPackageDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EPackageDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: EPackageDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -26,29 +26,29 @@ import org.eclipse.net4j.util.net4jutildefs.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.cdodefs.CDODefsPackage#getEPackageDef_NsURI()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Ns URI</em>' attribute.
+   * @see #setNsURI(String)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getEPackageDef_NsURI()
+   * @model required="true"
+   * @generated
+   */
 	String getNsURI();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef#getNsURI <em>Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef#getNsURI <em>Ns URI</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ns URI</em>' attribute.
-	 * @see #getNsURI()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Ns URI</em>' attribute.
+   * @see #getNsURI()
+   * @generated
+   */
 	void setNsURI(String value);
 
 } // CDOPackageDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/FailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/FailOverStrategyDef.java
index 4b7338a255..7f406d9eb9 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/FailOverStrategyDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/FailOverStrategyDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FailOverStrategyDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: FailOverStrategyDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -27,29 +27,29 @@ import org.eclipse.net4j.util.net4jutildefs.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.cdodefs.CDODefsPackage#getFailOverStrategyDef_ConnectorDef()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Connector Def</em>' reference.
+   * @see #setConnectorDef(ConnectorDef)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getFailOverStrategyDef_ConnectorDef()
+   * @model required="true"
+   * @generated
+   */
 	ConnectorDef getConnectorDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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
-	 */
+   * @param value the new value of the '<em>Connector Def</em>' reference.
+   * @see #getConnectorDef()
+   * @generated
+   */
 	void setConnectorDef(ConnectorDef value);
 
 } // FailOverStrategyDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/PluginRepositoryProviderDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/PluginRepositoryProviderDef.java
deleted file mode 100644
index ec7c9201c5..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/PluginRepositoryProviderDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PluginRepositoryProviderDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Plugin Repository Provider Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getPluginRepositoryProviderDef()
- * @model
- * @generated
- */
-public interface PluginRepositoryProviderDef extends RepositoryProviderDef {
-} // PluginRepositoryProviderDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RepositoryProviderDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RepositoryProviderDef.java
deleted file mode 100644
index f2eaf50cab..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RepositoryProviderDef.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RepositoryProviderDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Repository Provider Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getRepositoryProviderDef()
- * @model abstract="true"
- * @generated
- */
-public interface RepositoryProviderDef extends Def {
-} // RepositoryProviderDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/ResourceMode.java
index 12e32f02ac..473ee79639 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/ResourceMode.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/ResourceMode.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ResourceMode.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: ResourceMode.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -74,185 +74,191 @@ 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
-	 * @ordered
-	 */
+   * @see #GET
+   * @model
+   * @generated
+   * @ordered
+   */
   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
-	 * @ordered
-	 */
+   * @see #CREATE
+   * @model
+   * @generated
+   * @ordered
+   */
   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
-	 * @ordered
-	 */
+   * @see #GET_OR_CREATE
+   * @model
+   * @generated
+   * @ordered
+   */
   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 -->
-	 * @generated
-	 */
-  private static final ResourceMode[] VALUES_ARRAY = new ResourceMode[] {
-			GET,
-			CREATE,
-			GET_OR_CREATE,
-		};
+   * 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,
+    };
 
   /**
-	 * 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
-	 */
+   * @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
-	 */
+   * @generated
+   */
   public static ResourceMode get(String literal)
   {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResourceMode result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ResourceMode result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
   /**
-	 * 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
-	 */
+   * @generated
+   */
   public static ResourceMode getByName(String name)
   {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResourceMode result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ResourceMode result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
   /**
-	 * 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
-	 */
+   * @generated
+   */
   public static ResourceMode get(int value)
   {
-		switch (value) {
-			case GET_VALUE: return GET;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case GET_VALUE: return GET;
+    }
+    return null;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   private final int value;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   private final String name;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   private final String literal;
 
   /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * Only this class can construct instances.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   private ResourceMode(int value, String name, String literal)
   {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public int getValue()
   {
-	  return value;
-	}
+    return value;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getName()
   {
-	  return name;
-	}
+    return name;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getLiteral()
   {
-	  return literal;
-	}
+    return literal;
+  }
 
   /**
-	 * 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
-	 */
+   * @generated
+   */
   @Override
   public String toString()
   {
-		return literal;
-	}
+    return literal;
+  }
 
   public CDOResource getResource(String path, CDOTransaction cdoTransaction)
   {
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RetryFailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RetryFailOverStrategyDef.java
index edb03892fc..75d771e980 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RetryFailOverStrategyDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/RetryFailOverStrategyDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RetryFailOverStrategyDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: RetryFailOverStrategyDef.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs;
 
@@ -25,56 +25,56 @@ package org.eclipse.emf.cdo.cdodefs;
  */
 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()
-	 * @see #setRetries(int)
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getRetryFailOverStrategyDef_Retries()
-	 * @model unsettable="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Retries</em>' attribute.
+   * @see #isSetRetries()
+   * @see #unsetRetries()
+   * @see #setRetries(int)
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#getRetryFailOverStrategyDef_Retries()
+   * @model unsettable="true"
+   * @generated
+   */
 	int getRetries();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Retries</em>' attribute.
+   * @see #isSetRetries()
+   * @see #unsetRetries()
+   * @see #getRetries()
+   * @generated
+   */
 	void setRetries(int value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSetRetries()
-	 * @see #getRetries()
-	 * @see #setRetries(int)
-	 * @generated
-	 */
+   * @see #isSetRetries()
+   * @see #getRetries()
+   * @see #setRetries(int)
+   * @generated
+   */
 	void unsetRetries();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.cdodefs.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()
-	 * @see #setRetries(int)
-	 * @generated
-	 */
+   * @return whether the value of the '<em>Retries</em>' attribute is set.
+   * @see #unsetRetries()
+   * @see #getRetries()
+   * @see #setRetries(int)
+   * @generated
+   */
 	boolean isSetRetries();
 
 } // RetryFailOverStrategy
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOAuditDefImpl.java
index 7d0f137ef3..fc4d4c83ff 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOAuditDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOAuditDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOAuditDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOAuditDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -32,138 +32,142 @@ import java.util.Date;
 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
-	 */
+   * @see #getTimeStamp()
+   * @generated
+   * @ordered
+   */
   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
-	 */
+   * @see #getTimeStamp()
+   * @generated
+   * @ordered
+   */
   protected Date timeStamp = TIME_STAMP_EDEFAULT;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOAuditDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_AUDIT_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_AUDIT_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public Date getTimeStamp()
   {
-		return timeStamp;
-	}
+    return timeStamp;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setTimeStamp(Date newTimeStamp)
   {
-		Date oldTimeStamp = timeStamp;
-		timeStamp = newTimeStamp;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp));
-	}
+    Date oldTimeStamp = timeStamp;
+    timeStamp = newTimeStamp;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-				return getTimeStamp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+        return getTimeStamp();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-				setTimeStamp((Date)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+        setTimeStamp((Date)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-				setTimeStamp(TIME_STAMP_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
+        setTimeStamp(TIME_STAMP_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP:
-				return TIME_STAMP_EDEFAULT == null ? timeStamp != null : !TIME_STAMP_EDEFAULT.equals(timeStamp);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      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
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public String toString()
   {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (timeStamp: ");
-		result.append(timeStamp);
-		result.append(')');
-		return result.toString();
-	}
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (timeStamp: ");
+    result.append(timeStamp);
+    result.append(')');
+    return result.toString();
+  }
 
   @Override
   protected Object createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOClientProtocolFactoryDefImpl.java
index b167a18618..6ddc9699c7 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOClientProtocolFactoryDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOClientProtocolFactoryDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOClientProtocolFactoryDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -26,23 +26,23 @@ import org.eclipse.emf.ecore.EClass;
  */
 public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements CDOClientProtocolFactoryDef {
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CDOClientProtocolFactoryDefImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.CDO_CLIENT_PROTOCOL_FACTORY_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_CLIENT_PROTOCOL_FACTORY_DEF;
+  }
 
 	@Override
 	protected Object createInstance() {
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsFactoryImpl.java
index dd5eed72c0..48ce3e56a0 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsFactoryImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDODefsFactoryImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -14,13 +14,11 @@ import org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOResourceDef;
-import org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
 import org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
-import org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef;
 import org.eclipse.emf.cdo.cdodefs.ResourceMode;
 import org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef;
 
@@ -39,269 +37,253 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  */
 public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static CDODefsFactory init() {
-		try {
-			CDODefsFactory theCDODefsFactory = (CDODefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/defs/1.0.0"); 
-			if (theCDODefsFactory != null) {
-				return theCDODefsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new CDODefsFactoryImpl();
-	}
+    try
+    {
+      CDODefsFactory theCDODefsFactory = (CDODefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/defs/1.0.0"); 
+      if (theCDODefsFactory != null)
+      {
+        return theCDODefsFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new CDODefsFactoryImpl();
+  }
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDODefsFactoryImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public EObject create(EClass eClass) {
-		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_SERVER_PROTOCOL_FACTORY_DEF: return createCDOServerProtocolFactoryDef();
-			case CDODefsPackage.PLUGIN_REPOSITORY_PROVIDER_DEF: return createPluginRepositoryProviderDef();
-			case CDODefsPackage.CDO_RESOURCE_DEF: return createCDOResourceDef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
+    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");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case CDODefsPackage.RESOURCE_MODE:
-				return createResourceModeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    switch (eDataType.getClassifierID())
+    {
+      case CDODefsPackage.RESOURCE_MODE:
+        return createResourceModeFromString(eDataType, initialValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case CDODefsPackage.RESOURCE_MODE:
-				return convertResourceModeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    switch (eDataType.getClassifierID())
+    {
+      case CDODefsPackage.RESOURCE_MODE:
+        return convertResourceModeToString(eDataType, instanceValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOViewDef createCDOViewDef() {
-		CDOViewDefImpl cdoViewDef = new CDOViewDefImpl();
-		return cdoViewDef;
-	}
+    CDOViewDefImpl cdoViewDef = new CDOViewDefImpl();
+    return cdoViewDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOTransactionDef createCDOTransactionDef() {
-		CDOTransactionDefImpl cdoTransactionDef = new CDOTransactionDefImpl();
-		return cdoTransactionDef;
-	}
+    CDOTransactionDefImpl cdoTransactionDef = new CDOTransactionDefImpl();
+    return cdoTransactionDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOAuditDef createCDOAuditDef() {
-		CDOAuditDefImpl cdoAuditDef = new CDOAuditDefImpl();
-		return cdoAuditDef;
-	}
+    CDOAuditDefImpl cdoAuditDef = new CDOAuditDefImpl();
+    return cdoAuditDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOSessionDef createCDOSessionDef() {
-		CDOSessionDefImpl cdoSessionDef = new CDOSessionDefImpl();
-		return cdoSessionDef;
-	}
+    CDOSessionDefImpl cdoSessionDef = new CDOSessionDefImpl();
+    return cdoSessionDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public RetryFailOverStrategyDef createRetryFailOverStrategyDef() {
-		RetryFailOverStrategyDefImpl retryFailOverStrategyDef = new RetryFailOverStrategyDefImpl();
-		return retryFailOverStrategyDef;
-	}
+    RetryFailOverStrategyDefImpl retryFailOverStrategyDef = new RetryFailOverStrategyDefImpl();
+    return retryFailOverStrategyDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOPackageRegistryDef createCDOPackageRegistryDef() {
-		CDOPackageRegistryDefImpl cdoPackageRegistryDef = new CDOPackageRegistryDefImpl();
-		return cdoPackageRegistryDef;
-	}
+    CDOPackageRegistryDefImpl cdoPackageRegistryDef = new CDOPackageRegistryDefImpl();
+    return cdoPackageRegistryDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOEagerPackageRegistryDef createCDOEagerPackageRegistryDef() {
-		CDOEagerPackageRegistryDefImpl cdoEagerPackageRegistryDef = new CDOEagerPackageRegistryDefImpl();
-		return cdoEagerPackageRegistryDef;
-	}
+    CDOEagerPackageRegistryDefImpl cdoEagerPackageRegistryDef = new CDOEagerPackageRegistryDefImpl();
+    return cdoEagerPackageRegistryDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef() {
-		CDOLazyPackageRegistryDefImpl cdoLazyPackageRegistryDef = new CDOLazyPackageRegistryDefImpl();
-		return cdoLazyPackageRegistryDef;
-	}
+    CDOLazyPackageRegistryDefImpl cdoLazyPackageRegistryDef = new CDOLazyPackageRegistryDefImpl();
+    return cdoLazyPackageRegistryDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EDynamicPackageDef createEDynamicPackageDef() {
-		EDynamicPackageDefImpl eDynamicPackageDef = new EDynamicPackageDefImpl();
-		return eDynamicPackageDef;
-	}
+    EDynamicPackageDefImpl eDynamicPackageDef = new EDynamicPackageDefImpl();
+    return eDynamicPackageDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EGlobalPackageDef createEGlobalPackageDef() {
-		EGlobalPackageDefImpl eGlobalPackageDef = new EGlobalPackageDefImpl();
-		return eGlobalPackageDef;
-	}
+    EGlobalPackageDefImpl eGlobalPackageDef = new EGlobalPackageDefImpl();
+    return eGlobalPackageDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef() {
-		CDOClientProtocolFactoryDefImpl cdoClientProtocolFactoryDef = new CDOClientProtocolFactoryDefImpl();
-		return cdoClientProtocolFactoryDef;
-	}
+    CDOClientProtocolFactoryDefImpl cdoClientProtocolFactoryDef = new CDOClientProtocolFactoryDefImpl();
+    return cdoClientProtocolFactoryDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CDOServerProtocolFactoryDef createCDOServerProtocolFactoryDef() {
-		CDOServerProtocolFactoryDefImpl cdoServerProtocolFactoryDef = new CDOServerProtocolFactoryDefImpl();
-		return cdoServerProtocolFactoryDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PluginRepositoryProviderDef createPluginRepositoryProviderDef() {
-		PluginRepositoryProviderDefImpl pluginRepositoryProviderDef = new PluginRepositoryProviderDefImpl();
-		return pluginRepositoryProviderDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDOResourceDef createCDOResourceDef() {
-		CDOResourceDefImpl cdoResourceDef = new CDOResourceDefImpl();
-		return cdoResourceDef;
-	}
+    CDOResourceDefImpl cdoResourceDef = new CDOResourceDefImpl();
+    return cdoResourceDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @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() + "'");
-		return result;
-	}
+    ResourceMode result = ResourceMode.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertResourceModeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDODefsPackage getCDODefsPackage() {
-		return (CDODefsPackage)getEPackage();
-	}
+    return (CDODefsPackage)getEPackage();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
+   * @deprecated
+   * @generated
+   */
 	@Deprecated
 	public static CDODefsPackage getPackage() {
-		return CDODefsPackage.eINSTANCE;
-	}
+    return CDODefsPackage.eINSTANCE;
+  }
 
 } //CDODefsFactoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsPackageImpl.java
index 40a01780ae..071c802a10 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDODefsPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsPackageImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDODefsPackageImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOResourceDef;
-import org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
@@ -22,8 +21,6 @@ import org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EPackageDef;
 import org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef;
-import org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef;
-import org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef;
 import org.eclipse.emf.cdo.cdodefs.ResourceMode;
 import org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef;
 
@@ -45,699 +42,625 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  */
 public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage {
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoViewDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoTransactionDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoAuditDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoSessionDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass failOverStrategyDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass retryFailOverStrategyDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoPackageRegistryDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoEagerPackageRegistryDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoLazyPackageRegistryDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass ePackageDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass eDynamicPackageDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass eGlobalPackageDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoClientProtocolFactoryDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cdoServerProtocolFactoryDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass repositoryProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pluginRepositoryProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass cdoResourceDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum resourceModeEEnum = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
+   * Creates an instance of the model <b>Package</b>, registered with
+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+   * package URI value.
+   * <p>Note: the correct way to create the package is via the static
+   * factory method {@link #init init()}, which also performs
+   * initialization of the package, or returns the registered package,
+   * if one already exists.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.emf.cdo.cdodefs.CDODefsPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
 	private CDODefsPackageImpl() {
-		super(eNS_URI, CDODefsFactory.eINSTANCE);
-	}
+    super(eNS_URI, CDODefsFactory.eINSTANCE);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @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.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
+   * Creates, registers, and initializes the <b>Package</b> for this
+   * model, and for any others upon which it depends.  Simple
+   * dependencies are satisfied by calling this method on all
+   * dependent packages before doing anything else.  This method drives
+   * initialization for interdependent packages directly, in parallel
+   * with this package, itself.
+   * <p>Of this package and its interdependencies, all packages which
+   * have not yet been registered by their URI values are first created
+   * and registered.  The packages are then initialized in two steps:
+   * meta-model objects for all of the packages are created before any
+   * are initialized, since one package's meta-model objects may refer to
+   * those of another.
+   * <p>Invocation of this method will not affect any packages that have
+   * already been initialized.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
 	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.getEPackage(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CDODefsPackageImpl());
+    // Obtain or create and register package
+    CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CDODefsPackageImpl());
 
-		isInited = true;
+    isInited = true;
 
-		// Initialize simple dependencies
-		Net4jDefsPackage.eINSTANCE.eClass();
+    // Initialize simple dependencies
+    Net4jDefsPackage.eINSTANCE.eClass();
 
-		// Create package meta-data objects
-		theCDODefsPackage.createPackageContents();
+    // Create package meta-data objects
+    theCDODefsPackage.createPackageContents();
 
-		// Initialize created meta-data
-		theCDODefsPackage.initializePackageContents();
+    // Initialize created meta-data
+    theCDODefsPackage.initializePackageContents();
 
-		// Mark meta-data to indicate it can't be changed
-		theCDODefsPackage.freeze();
+    // Mark meta-data to indicate it can't be changed
+    theCDODefsPackage.freeze();
 
-		return theCDODefsPackage;
-	}
+    return theCDODefsPackage;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOViewDef() {
-		return cdoViewDefEClass;
-	}
+    return cdoViewDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOViewDef_CdoSessionDef() {
-		return (EReference)cdoViewDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)cdoViewDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOTransactionDef() {
-		return cdoTransactionDefEClass;
-	}
+    return cdoTransactionDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOAuditDef() {
-		return cdoAuditDefEClass;
-	}
+    return cdoAuditDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCDOAuditDef_TimeStamp() {
-		return (EAttribute)cdoAuditDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)cdoAuditDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOSessionDef() {
-		return cdoSessionDefEClass;
-	}
+    return cdoSessionDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOSessionDef_ConnectorDef() {
-		return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCDOSessionDef_RepositoryName() {
-		return (EAttribute)cdoSessionDefEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)cdoSessionDefEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOSessionDef_CdoPackageRegistryDef() {
-		return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(2);
-	}
+    return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCDOSessionDef_LegacySupportEnabled() {
-		return (EAttribute)cdoSessionDefEClass.getEStructuralFeatures().get(3);
-	}
+    return (EAttribute)cdoSessionDefEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOSessionDef_FailOverStrategyDef() {
-		return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(4);
-	}
+    return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(4);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getFailOverStrategyDef() {
-		return failOverStrategyDefEClass;
-	}
+    return failOverStrategyDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getFailOverStrategyDef_ConnectorDef() {
-		return (EReference)failOverStrategyDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)failOverStrategyDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getRetryFailOverStrategyDef() {
-		return retryFailOverStrategyDefEClass;
-	}
+    return retryFailOverStrategyDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getRetryFailOverStrategyDef_Retries() {
-		return (EAttribute)retryFailOverStrategyDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)retryFailOverStrategyDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOPackageRegistryDef() {
-		return cdoPackageRegistryDefEClass;
-	}
+    return cdoPackageRegistryDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOPackageRegistryDef_Packages() {
-		return (EReference)cdoPackageRegistryDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)cdoPackageRegistryDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOEagerPackageRegistryDef() {
-		return cdoEagerPackageRegistryDefEClass;
-	}
+    return cdoEagerPackageRegistryDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOLazyPackageRegistryDef() {
-		return cdoLazyPackageRegistryDefEClass;
-	}
+    return cdoLazyPackageRegistryDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getEPackageDef() {
-		return ePackageDefEClass;
-	}
+    return ePackageDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getEPackageDef_NsURI() {
-		return (EAttribute)ePackageDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)ePackageDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getEDynamicPackageDef() {
-		return eDynamicPackageDefEClass;
-	}
+    return eDynamicPackageDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getEDynamicPackageDef_ResourceURI() {
-		return (EAttribute)eDynamicPackageDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)eDynamicPackageDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getEGlobalPackageDef() {
-		return eGlobalPackageDefEClass;
-	}
+    return eGlobalPackageDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOClientProtocolFactoryDef() {
-		return cdoClientProtocolFactoryDefEClass;
-	}
+    return cdoClientProtocolFactoryDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCDOServerProtocolFactoryDef() {
-		return cdoServerProtocolFactoryDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCDOServerProtocolFactoryDef_RepositoryProviderDef() {
-		return (EReference)cdoServerProtocolFactoryDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRepositoryProviderDef() {
-		return repositoryProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPluginRepositoryProviderDef() {
-		return pluginRepositoryProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCDOResourceDef() {
-		return cdoResourceDefEClass;
-	}
+    return cdoResourceDefEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCDOResourceDef_CdoTransaction() {
-		return (EReference)cdoResourceDefEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)cdoResourceDefEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCDOResourceDef_ResourceMode() {
-		return (EAttribute)cdoResourceDefEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)cdoResourceDefEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCDOResourceDef_Path() {
-		return (EAttribute)cdoResourceDefEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)cdoResourceDefEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getResourceMode() {
-		return resourceModeEEnum;
-	}
+    return resourceModeEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDODefsFactory getCDODefsFactory() {
-		return (CDODefsFactory)getEFactoryInstance();
-	}
+    return (CDODefsFactory)getEFactoryInstance();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @generated
+   */
 	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
+    if (isCreated) return;
+    isCreated = true;
 
-		// Create classes and their features
-		cdoViewDefEClass = createEClass(CDO_VIEW_DEF);
-		createEReference(cdoViewDefEClass, CDO_VIEW_DEF__CDO_SESSION_DEF);
+    // Create classes and their features
+    cdoViewDefEClass = createEClass(CDO_VIEW_DEF);
+    createEReference(cdoViewDefEClass, CDO_VIEW_DEF__CDO_SESSION_DEF);
 
-		cdoTransactionDefEClass = createEClass(CDO_TRANSACTION_DEF);
+    cdoTransactionDefEClass = createEClass(CDO_TRANSACTION_DEF);
 
-		cdoAuditDefEClass = createEClass(CDO_AUDIT_DEF);
-		createEAttribute(cdoAuditDefEClass, CDO_AUDIT_DEF__TIME_STAMP);
+    cdoAuditDefEClass = createEClass(CDO_AUDIT_DEF);
+    createEAttribute(cdoAuditDefEClass, CDO_AUDIT_DEF__TIME_STAMP);
 
-		cdoSessionDefEClass = createEClass(CDO_SESSION_DEF);
-		createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__CONNECTOR_DEF);
-		createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__REPOSITORY_NAME);
-		createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF);
-		createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED);
-		createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF);
+    cdoSessionDefEClass = createEClass(CDO_SESSION_DEF);
+    createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__CONNECTOR_DEF);
+    createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__REPOSITORY_NAME);
+    createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF);
+    createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED);
+    createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF);
 
-		failOverStrategyDefEClass = createEClass(FAIL_OVER_STRATEGY_DEF);
-		createEReference(failOverStrategyDefEClass, FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF);
+    failOverStrategyDefEClass = createEClass(FAIL_OVER_STRATEGY_DEF);
+    createEReference(failOverStrategyDefEClass, FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF);
 
-		retryFailOverStrategyDefEClass = createEClass(RETRY_FAIL_OVER_STRATEGY_DEF);
-		createEAttribute(retryFailOverStrategyDefEClass, RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES);
+    retryFailOverStrategyDefEClass = createEClass(RETRY_FAIL_OVER_STRATEGY_DEF);
+    createEAttribute(retryFailOverStrategyDefEClass, RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES);
 
-		cdoPackageRegistryDefEClass = createEClass(CDO_PACKAGE_REGISTRY_DEF);
-		createEReference(cdoPackageRegistryDefEClass, CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
+    cdoPackageRegistryDefEClass = createEClass(CDO_PACKAGE_REGISTRY_DEF);
+    createEReference(cdoPackageRegistryDefEClass, CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
 
-		cdoEagerPackageRegistryDefEClass = createEClass(CDO_EAGER_PACKAGE_REGISTRY_DEF);
+    cdoEagerPackageRegistryDefEClass = createEClass(CDO_EAGER_PACKAGE_REGISTRY_DEF);
 
-		cdoLazyPackageRegistryDefEClass = createEClass(CDO_LAZY_PACKAGE_REGISTRY_DEF);
+    cdoLazyPackageRegistryDefEClass = createEClass(CDO_LAZY_PACKAGE_REGISTRY_DEF);
 
-		ePackageDefEClass = createEClass(EPACKAGE_DEF);
-		createEAttribute(ePackageDefEClass, EPACKAGE_DEF__NS_URI);
+    ePackageDefEClass = createEClass(EPACKAGE_DEF);
+    createEAttribute(ePackageDefEClass, EPACKAGE_DEF__NS_URI);
 
-		eDynamicPackageDefEClass = createEClass(EDYNAMIC_PACKAGE_DEF);
-		createEAttribute(eDynamicPackageDefEClass, EDYNAMIC_PACKAGE_DEF__RESOURCE_URI);
+    eDynamicPackageDefEClass = createEClass(EDYNAMIC_PACKAGE_DEF);
+    createEAttribute(eDynamicPackageDefEClass, EDYNAMIC_PACKAGE_DEF__RESOURCE_URI);
 
-		eGlobalPackageDefEClass = createEClass(EGLOBAL_PACKAGE_DEF);
+    eGlobalPackageDefEClass = createEClass(EGLOBAL_PACKAGE_DEF);
 
-		cdoClientProtocolFactoryDefEClass = createEClass(CDO_CLIENT_PROTOCOL_FACTORY_DEF);
+    cdoClientProtocolFactoryDefEClass = createEClass(CDO_CLIENT_PROTOCOL_FACTORY_DEF);
 
-		cdoServerProtocolFactoryDefEClass = createEClass(CDO_SERVER_PROTOCOL_FACTORY_DEF);
-		createEReference(cdoServerProtocolFactoryDefEClass, CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF);
+    cdoResourceDefEClass = createEClass(CDO_RESOURCE_DEF);
+    createEReference(cdoResourceDefEClass, CDO_RESOURCE_DEF__CDO_TRANSACTION);
+    createEAttribute(cdoResourceDefEClass, CDO_RESOURCE_DEF__RESOURCE_MODE);
+    createEAttribute(cdoResourceDefEClass, CDO_RESOURCE_DEF__PATH);
 
-		repositoryProviderDefEClass = createEClass(REPOSITORY_PROVIDER_DEF);
-
-		pluginRepositoryProviderDefEClass = createEClass(PLUGIN_REPOSITORY_PROVIDER_DEF);
-
-		cdoResourceDefEClass = createEClass(CDO_RESOURCE_DEF);
-		createEReference(cdoResourceDefEClass, CDO_RESOURCE_DEF__CDO_TRANSACTION);
-		createEAttribute(cdoResourceDefEClass, CDO_RESOURCE_DEF__RESOURCE_MODE);
-		createEAttribute(cdoResourceDefEClass, CDO_RESOURCE_DEF__PATH);
-
-		// Create enums
-		resourceModeEEnum = createEEnum(RESOURCE_MODE);
-	}
+    // Create enums
+    resourceModeEEnum = createEEnum(RESOURCE_MODE);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @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 -->
+   * 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
-	 */
+   * @generated
+   */
 	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		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);
-
-		// Create type parameters
+    if (isInitialized) return;
+    isInitialized = true;
 
-		// Set bounds for type parameters
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
 
-		// Add supertypes to classes
-		cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef());
-		cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef());
-		cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		retryFailOverStrategyDefEClass.getESuperTypes().add(this.getFailOverStrategyDef());
-		cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
-		cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
-		ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
-		eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
-		cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef());
-		cdoServerProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getServerProtocolFactoryDef());
-		repositoryProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		pluginRepositoryProviderDefEClass.getESuperTypes().add(this.getRepositoryProviderDef());
-		cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    // Obtain other dependent packages
+    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    Net4jDefsPackage theNet4jDefsPackage = (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
 
-		// 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);
+    // Create type parameters
 
-		initEClass(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    // Set bounds for type parameters
 
-		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);
+    // Add supertypes to classes
+    cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef());
+    cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef());
+    cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    retryFailOverStrategyDefEClass.getESuperTypes().add(this.getFailOverStrategyDef());
+    cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
+    cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
+    ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
+    eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
+    cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef());
+    cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
-		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);
+    // 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(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(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		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(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(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(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(cdoEagerPackageRegistryDefEClass, CDOEagerPackageRegistryDef.class, "CDOEagerPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    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(cdoLazyPackageRegistryDefEClass, CDOLazyPackageRegistryDef.class, "CDOLazyPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    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(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(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(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(cdoEagerPackageRegistryDefEClass, CDOEagerPackageRegistryDef.class, "CDOEagerPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(eGlobalPackageDefEClass, EGlobalPackageDef.class, "EGlobalPackageDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(cdoLazyPackageRegistryDefEClass, CDOLazyPackageRegistryDef.class, "CDOLazyPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(cdoClientProtocolFactoryDefEClass, CDOClientProtocolFactoryDef.class, "CDOClientProtocolFactoryDef", !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(cdoServerProtocolFactoryDefEClass, CDOServerProtocolFactoryDef.class, "CDOServerProtocolFactoryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCDOServerProtocolFactoryDef_RepositoryProviderDef(), this.getRepositoryProviderDef(), null, "repositoryProviderDef", null, 1, 1, CDOServerProtocolFactoryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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(repositoryProviderDefEClass, RepositoryProviderDef.class, "RepositoryProviderDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(eGlobalPackageDefEClass, EGlobalPackageDef.class, "EGlobalPackageDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(pluginRepositoryProviderDefEClass, PluginRepositoryProviderDef.class, "PluginRepositoryProviderDef", !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(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");
-		addEEnumLiteral(resourceModeEEnum, ResourceMode.GET);
-		addEEnumLiteral(resourceModeEEnum, ResourceMode.CREATE);
-		addEEnumLiteral(resourceModeEEnum, ResourceMode.GET_OR_CREATE);
+    // Initialize enums and add enum literals
+    initEEnum(resourceModeEEnum, ResourceMode.class, "ResourceMode");
+    addEEnumLiteral(resourceModeEEnum, ResourceMode.GET);
+    addEEnumLiteral(resourceModeEEnum, ResourceMode.CREATE);
+    addEEnumLiteral(resourceModeEEnum, ResourceMode.GET_OR_CREATE);
 
-		// Create resource
-		createResource(eNS_URI);
-	}
+    // Create resource
+    createResource(eNS_URI);
+  }
 
 } //CDODefsPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOEagerPackageRegistryDefImpl.java
index 26ea4076ae..c34b788971 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOEagerPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOEagerPackageRegistryDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOEagerPackageRegistryDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOEagerPackageRegistryDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -25,23 +25,23 @@ import org.eclipse.emf.ecore.EClass;
 public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOEagerPackageRegistryDef
 {
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOEagerPackageRegistryDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_EAGER_PACKAGE_REGISTRY_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_EAGER_PACKAGE_REGISTRY_DEF;
+  }
 
   /**
    * Creates a {@link Eager}.
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOLazyPackageRegistryDefImpl.java
index b1b7f722cd..6a025124a9 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOLazyPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOLazyPackageRegistryDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOLazyPackageRegistryDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOLazyPackageRegistryDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -25,23 +25,23 @@ import org.eclipse.emf.ecore.EClass;
 public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOLazyPackageRegistryDef
 {
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOLazyPackageRegistryDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_LAZY_PACKAGE_REGISTRY_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_LAZY_PACKAGE_REGISTRY_DEF;
+  }
 
   /**
    * Creates a {@link Lazy}.
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOPackageRegistryDefImpl.java
index 051afbcbc7..15b8a7e11a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOPackageRegistryDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOPackageRegistryDefImpl.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOPackageRegistryDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -52,8 +52,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
    */
   protected CDOPackageRegistryDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -64,8 +64,8 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_PACKAGE_REGISTRY_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_PACKAGE_REGISTRY_DEF;
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -76,11 +76,12 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @SuppressWarnings("unchecked")
   public EList<EPackageDef> getPackages()
   {
-		if (packages == null) {
-			packages = new EObjectContainmentEList<EPackageDef>(EPackageDef.class, this, CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
-		}
-		return packages;
-	}
+    if (packages == null)
+    {
+      packages = new EObjectContainmentEList<EPackageDef>(EPackageDef.class, this, CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
+    }
+    return packages;
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -97,12 +98,13 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-				return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+        return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -119,12 +121,13 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-				return getPackages();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+        return getPackages();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -139,14 +142,15 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-				getPackages().clear();
-				getPackages().addAll((Collection<? extends EPackageDef>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+        getPackages().clear();
+        getPackages().addAll((Collection<? extends EPackageDef>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -158,13 +162,14 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   public void eUnset(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-				getPackages().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+        getPackages().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
@@ -177,12 +182,13 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
   @Override
   public boolean eIsSet(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
-				return packages != null && !packages.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF__PACKAGES:
+        return packages != null && !packages.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
   /**
    * Creates the instance.
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOResourceDefImpl.java
index 3d1d4eca81..6e212edde4 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOResourceDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOResourceDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOResourceDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOResourceDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -37,13 +37,13 @@ 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
-	 */
+   * @see #getCdoTransaction()
+   * @generated
+   * @ordered
+   */
   protected CDOTransactionDef cdoTransaction;
 
   /**
@@ -57,13 +57,13 @@ 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
-	 */
+   * @see #getResourceMode()
+   * @generated
+   * @ordered
+   */
   protected ResourceMode resourceMode = RESOURCE_MODE_EDEFAULT;
 
   /**
@@ -77,209 +77,215 @@ 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 -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
+   * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see #getPath()
+   * @generated
+   * @ordered
+   */
   protected String path = PATH_EDEFAULT;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOResourceDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_RESOURCE_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_RESOURCE_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public CDOTransactionDef getCdoTransaction()
   {
-		if (cdoTransaction != null && cdoTransaction.eIsProxy()) {
-			InternalEObject oldCdoTransaction = (InternalEObject)cdoTransaction;
-			cdoTransaction = (CDOTransactionDef)eResolveProxy(oldCdoTransaction);
-			if (cdoTransaction != oldCdoTransaction) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
-			}
-		}
-		return cdoTransaction;
-	}
+    if (cdoTransaction != null && cdoTransaction.eIsProxy())
+    {
+      InternalEObject oldCdoTransaction = (InternalEObject)cdoTransaction;
+      cdoTransaction = (CDOTransactionDef)eResolveProxy(oldCdoTransaction);
+      if (cdoTransaction != oldCdoTransaction)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
+      }
+    }
+    return cdoTransaction;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public CDOTransactionDef basicGetCdoTransaction()
   {
-		return cdoTransaction;
-	}
+    return cdoTransaction;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setCdoTransaction(CDOTransactionDef newCdoTransaction)
   {
-		CDOTransactionDef oldCdoTransaction = cdoTransaction;
-		cdoTransaction = newCdoTransaction;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
-	}
+    CDOTransactionDef oldCdoTransaction = cdoTransaction;
+    cdoTransaction = newCdoTransaction;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public ResourceMode getResourceMode()
   {
-		return resourceMode;
-	}
+    return resourceMode;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setResourceMode(ResourceMode newResourceMode)
   {
-		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));
-	}
+    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));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getPath()
   {
-		return path;
-	}
+    return path;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setPath(String newPath)
   {
-		String oldPath = path;
-		path = newPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path));
-	}
+    String oldPath = path;
+    path = newPath;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		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();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    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();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		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;
-		}
-		super.eSet(featureID, newValue);
-	}
+    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;
+    }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-		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;
-		}
-		super.eUnset(featureID);
-	}
+    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;
+    }
+    super.eUnset(featureID);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-		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);
-		}
-		return super.eIsSet(featureID);
-	}
+    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);
+    }
+    return super.eIsSet(featureID);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- 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: ");
-		result.append(resourceMode);
-		result.append(", path: ");
-		result.append(path);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (resourceMode: ");
+    result.append(resourceMode);
+    result.append(", path: ");
+    result.append(path);
+    result.append(')');
+    return result.toString();
+  }
 
   @Override
   protected Object createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOServerProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOServerProtocolFactoryDefImpl.java
deleted file mode 100644
index 025bb1af84..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOServerProtocolFactoryDefImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOServerProtocolFactoryDefImpl.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs.impl;
-
-import org.eclipse.emf.cdo.cdodefs.CDODefsPackage;
-import org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef;
-import org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef;
-import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocolFactory;
-import org.eclipse.emf.cdo.server.IRepositoryProvider;
-
-import org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>CDO Server Protocol Factory Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.emf.cdo.cdodefs.impl.CDOServerProtocolFactoryDefImpl#getRepositoryProviderDef <em>Repository Provider Def</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CDOServerProtocolFactoryDefImpl extends ServerProtocolFactoryDefImpl implements CDOServerProtocolFactoryDef {
-
-	/**
-	 * The cached value of the '{@link #getRepositoryProviderDef() <em>Repository Provider Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepositoryProviderDef()
-	 * @generated
-	 * @ordered
-	 */
-	protected RepositoryProviderDef repositoryProviderDef;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CDOServerProtocolFactoryDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.CDO_SERVER_PROTOCOL_FACTORY_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RepositoryProviderDef getRepositoryProviderDef() {
-		if (repositoryProviderDef != null && repositoryProviderDef.eIsProxy()) {
-			InternalEObject oldRepositoryProviderDef = (InternalEObject)repositoryProviderDef;
-			repositoryProviderDef = (RepositoryProviderDef)eResolveProxy(oldRepositoryProviderDef);
-			if (repositoryProviderDef != oldRepositoryProviderDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF, oldRepositoryProviderDef, repositoryProviderDef));
-			}
-		}
-		return repositoryProviderDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RepositoryProviderDef basicGetRepositoryProviderDef() {
-		return repositoryProviderDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRepositoryProviderDef(RepositoryProviderDef newRepositoryProviderDef) {
-		RepositoryProviderDef oldRepositoryProviderDef = repositoryProviderDef;
-		repositoryProviderDef = newRepositoryProviderDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF, oldRepositoryProviderDef, repositoryProviderDef));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF:
-				if (resolve) return getRepositoryProviderDef();
-				return basicGetRepositoryProviderDef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF:
-				setRepositoryProviderDef((RepositoryProviderDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF:
-				setRepositoryProviderDef((RepositoryProviderDef)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SERVER_PROTOCOL_FACTORY_DEF__REPOSITORY_PROVIDER_DEF:
-				return repositoryProviderDef != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	@Override
-	protected Object createInstance() {
-		return new CDOServerProtocolFactory((IRepositoryProvider) getRepositoryProviderDef().getInstance());
-	}
-	
-	
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(getRepositoryProviderDef() != null, "repository provider not set!");
-	}
-
-} //CDOServerProtocolFactoryDefImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOSessionDefImpl.java
index 7b0f611199..645792969d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOSessionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOSessionDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOSessionDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOSessionDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -50,41 +50,41 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 {
   /**
-	 * 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
-	 */
+   * @see #getConnectorDef()
+   * @generated
+   * @ordered
+   */
   protected ConnectorDef connectorDef;
 
   /**
-	 * This is true if the Connector Def reference has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * This is true if the Connector Def reference has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   protected boolean connectorDefESet;
 
   /**
-	 * The default value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-	 * @see #getRepositoryName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepositoryName()
+   * @generated
+   * @ordered
+   */
   protected static final String REPOSITORY_NAME_EDEFAULT = null;
 
   /**
-	 * The cached value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-	 * @see #getRepositoryName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepositoryName()
+   * @generated
+   * @ordered
+   */
   protected String repositoryName = REPOSITORY_NAME_EDEFAULT;
 
   /**
@@ -128,57 +128,59 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   protected FailOverStrategyDef failOverStrategyDef;
 
   /**
-	 * This is true if the Fail Over Strategy Def reference has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * This is true if the Fail Over Strategy Def reference has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   protected boolean failOverStrategyDefESet;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOSessionDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_SESSION_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_SESSION_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public ConnectorDef getConnectorDef()
   {
-		if (connectorDef != null && connectorDef.eIsProxy()) {
-			InternalEObject oldConnectorDef = (InternalEObject)connectorDef;
-			connectorDef = (ConnectorDef)eResolveProxy(oldConnectorDef);
-			if (connectorDef != oldConnectorDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
-			}
-		}
-		return connectorDef;
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    if (connectorDef != null && connectorDef.eIsProxy())
+    {
+      InternalEObject oldConnectorDef = (InternalEObject)connectorDef;
+      connectorDef = (ConnectorDef)eResolveProxy(oldConnectorDef);
+      if (connectorDef != oldConnectorDef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+      }
+    }
+    return connectorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public ConnectorDef basicGetConnectorDef()
   {
-		return connectorDef;
-	}
+    return connectorDef;
+  }
 
   /**
    * <!-- begin-user-doc --> Sets the {@link ConnectorDef} for this {@link CDOSessionDef}. If a
@@ -203,147 +205,151 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setConnectorDefGen(ConnectorDef newConnectorDef)
   {
-		ConnectorDef oldConnectorDef = connectorDef;
-		connectorDef = newConnectorDef;
-		boolean oldConnectorDefESet = connectorDefESet;
-		connectorDefESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef, !oldConnectorDefESet));
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    ConnectorDef oldConnectorDef = connectorDef;
+    connectorDef = newConnectorDef;
+    boolean oldConnectorDefESet = connectorDefESet;
+    connectorDefESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef, !oldConnectorDefESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void unsetConnectorDef()
   {
-		ConnectorDef oldConnectorDef = connectorDef;
-		boolean oldConnectorDefESet = connectorDefESet;
-		connectorDef = null;
-		connectorDefESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, null, oldConnectorDefESet));
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    ConnectorDef oldConnectorDef = connectorDef;
+    boolean oldConnectorDefESet = connectorDefESet;
+    connectorDef = null;
+    connectorDefESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, null, oldConnectorDefESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public boolean isSetConnectorDef()
   {
-		return connectorDefESet;
-	}
+    return connectorDefESet;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getRepositoryName()
   {
-		return repositoryName;
-	}
+    return repositoryName;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setRepositoryName(String newRepositoryName)
   {
-		String oldRepositoryName = repositoryName;
-		repositoryName = newRepositoryName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME, oldRepositoryName, repositoryName));
-	}
+    String oldRepositoryName = repositoryName;
+    repositoryName = newRepositoryName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME, oldRepositoryName, repositoryName));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public CDOPackageRegistryDef getCdoPackageRegistryDef()
   {
-		if (cdoPackageRegistryDef != null && cdoPackageRegistryDef.eIsProxy()) {
-			InternalEObject oldCdoPackageRegistryDef = (InternalEObject)cdoPackageRegistryDef;
-			cdoPackageRegistryDef = (CDOPackageRegistryDef)eResolveProxy(oldCdoPackageRegistryDef);
-			if (cdoPackageRegistryDef != oldCdoPackageRegistryDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-			}
-		}
-		return cdoPackageRegistryDef;
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    if (cdoPackageRegistryDef != null && cdoPackageRegistryDef.eIsProxy())
+    {
+      InternalEObject oldCdoPackageRegistryDef = (InternalEObject)cdoPackageRegistryDef;
+      cdoPackageRegistryDef = (CDOPackageRegistryDef)eResolveProxy(oldCdoPackageRegistryDef);
+      if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+      }
+    }
+    return cdoPackageRegistryDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public CDOPackageRegistryDef basicGetCdoPackageRegistryDef()
   {
-		return cdoPackageRegistryDef;
-	}
+    return cdoPackageRegistryDef;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setCdoPackageRegistryDef(CDOPackageRegistryDef newCdoPackageRegistryDef)
   {
-		CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
-		cdoPackageRegistryDef = newCdoPackageRegistryDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-	}
+    CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
+    cdoPackageRegistryDef = newCdoPackageRegistryDef;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public boolean isLegacySupportEnabled()
   {
-		return legacySupportEnabled;
-	}
+    return legacySupportEnabled;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setLegacySupportEnabled(boolean newLegacySupportEnabled)
   {
-		boolean oldLegacySupportEnabled = legacySupportEnabled;
-		legacySupportEnabled = newLegacySupportEnabled;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED, oldLegacySupportEnabled, legacySupportEnabled));
-	}
+    boolean oldLegacySupportEnabled = legacySupportEnabled;
+    legacySupportEnabled = newLegacySupportEnabled;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED, oldLegacySupportEnabled, legacySupportEnabled));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public FailOverStrategyDef getFailOverStrategyDef()
   {
-		if (failOverStrategyDef != null && failOverStrategyDef.eIsProxy()) {
-			InternalEObject oldFailOverStrategyDef = (InternalEObject)failOverStrategyDef;
-			failOverStrategyDef = (FailOverStrategyDef)eResolveProxy(oldFailOverStrategyDef);
-			if (failOverStrategyDef != oldFailOverStrategyDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef));
-			}
-		}
-		return failOverStrategyDef;
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    if (failOverStrategyDef != null && failOverStrategyDef.eIsProxy())
+    {
+      InternalEObject oldFailOverStrategyDef = (InternalEObject)failOverStrategyDef;
+      failOverStrategyDef = (FailOverStrategyDef)eResolveProxy(oldFailOverStrategyDef);
+      if (failOverStrategyDef != oldFailOverStrategyDef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef));
+      }
+    }
+    return failOverStrategyDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public FailOverStrategyDef basicGetFailOverStrategyDef()
   {
-		return failOverStrategyDef;
-	}
+    return failOverStrategyDef;
+  }
 
   /**
    * <!-- begin-user-doc --> Sets the {@link FailOverStrategyDef} for this {@link CDOSessionDef}. If a ConnectorDef was
@@ -367,160 +373,164 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setFailOverStrategyDefGen(FailOverStrategyDef newFailOverStrategyDef)
   {
-		FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef;
-		failOverStrategyDef = newFailOverStrategyDef;
-		boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
-		failOverStrategyDefESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet));
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef;
+    failOverStrategyDef = newFailOverStrategyDef;
+    boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
+    failOverStrategyDefESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void unsetFailOverStrategyDef()
   {
-		FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef;
-		boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
-		failOverStrategyDef = null;
-		failOverStrategyDefESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, null, oldFailOverStrategyDefESet));
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef;
+    boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
+    failOverStrategyDef = null;
+    failOverStrategyDefESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, null, oldFailOverStrategyDefESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public boolean isSetFailOverStrategyDef()
   {
-		return failOverStrategyDefESet;
-	}
+    return failOverStrategyDefESet;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		switch (featureID) {
-			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() ? Boolean.TRUE : Boolean.FALSE;
-			case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
-				if (resolve) return getFailOverStrategyDef();
-				return basicGetFailOverStrategyDef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    switch (featureID)
+    {
+      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);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
-				setConnectorDef((ConnectorDef)newValue);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
-				setRepositoryName((String)newValue);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
-				setCdoPackageRegistryDef((CDOPackageRegistryDef)newValue);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
-				setLegacySupportEnabled(((Boolean)newValue).booleanValue());
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
-				setFailOverStrategyDef((FailOverStrategyDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
+        setConnectorDef((ConnectorDef)newValue);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
+        setRepositoryName((String)newValue);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
+        setCdoPackageRegistryDef((CDOPackageRegistryDef)newValue);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
+        setLegacySupportEnabled((Boolean)newValue);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
+        setFailOverStrategyDef((FailOverStrategyDef)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
-				unsetConnectorDef();
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
-				setRepositoryName(REPOSITORY_NAME_EDEFAULT);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
-				setCdoPackageRegistryDef((CDOPackageRegistryDef)null);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
-				setLegacySupportEnabled(LEGACY_SUPPORT_ENABLED_EDEFAULT);
-				return;
-			case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
-				unsetFailOverStrategyDef();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
+        unsetConnectorDef();
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
+        setRepositoryName(REPOSITORY_NAME_EDEFAULT);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
+        setCdoPackageRegistryDef((CDOPackageRegistryDef)null);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
+        setLegacySupportEnabled(LEGACY_SUPPORT_ENABLED_EDEFAULT);
+        return;
+      case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
+        unsetFailOverStrategyDef();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
-				return isSetConnectorDef();
-			case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
-				return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null : !REPOSITORY_NAME_EDEFAULT.equals(repositoryName);
-			case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
-				return cdoPackageRegistryDef != null;
-			case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
-				return legacySupportEnabled != LEGACY_SUPPORT_ENABLED_EDEFAULT;
-			case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
-				return isSetFailOverStrategyDef();
-		}
-		return super.eIsSet(featureID);
-	}
-
-  /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
+        return isSetConnectorDef();
+      case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
+        return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null : !REPOSITORY_NAME_EDEFAULT.equals(repositoryName);
+      case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
+        return cdoPackageRegistryDef != null;
+      case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
+        return legacySupportEnabled != LEGACY_SUPPORT_ENABLED_EDEFAULT;
+      case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
+        return isSetFailOverStrategyDef();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public String toString()
   {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (repositoryName: ");
-		result.append(repositoryName);
-		result.append(", legacySupportEnabled: ");
-		result.append(legacySupportEnabled);
-		result.append(')');
-		return result.toString();
-	}
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (repositoryName: ");
+    result.append(repositoryName);
+    result.append(", legacySupportEnabled: ");
+    result.append(legacySupportEnabled);
+    result.append(')');
+    return result.toString();
+  }
 
   @Override
   protected CDOSession createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOTransactionDefImpl.java
index 1805bca119..ae904851be 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOTransactionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOTransactionDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOTransactionDefImpl.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
+ * $Id: CDOTransactionDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -24,23 +24,23 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact
 {
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected CDOTransactionDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.CDO_TRANSACTION_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_TRANSACTION_DEF;
+  }
 
   @Override
   protected Object createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOViewDefImpl.java
index 91ab4e58db..720ad5773c 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOViewDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/CDOViewDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDOViewDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOViewDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -49,121 +49,127 @@ 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
-	 */
+   * @see #getCdoSessionDef()
+   * @generated
+   * @ordered
+   */
 	protected CDOSessionDef cdoSessionDef;
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	protected CDOViewDefImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.CDO_VIEW_DEF;
-	}
+    return CDODefsPackage.Literals.CDO_VIEW_DEF;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public CDOSessionDef getCdoSessionDef() {
-		if (cdoSessionDef != null && cdoSessionDef.eIsProxy()) {
-			InternalEObject oldCdoSessionDef = (InternalEObject)cdoSessionDef;
-			cdoSessionDef = (CDOSessionDef)eResolveProxy(oldCdoSessionDef);
-			if (cdoSessionDef != oldCdoSessionDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
-			}
-		}
-		return cdoSessionDef;
-	}
+    if (cdoSessionDef != null && cdoSessionDef.eIsProxy())
+    {
+      InternalEObject oldCdoSessionDef = (InternalEObject)cdoSessionDef;
+      cdoSessionDef = (CDOSessionDef)eResolveProxy(oldCdoSessionDef);
+      if (cdoSessionDef != oldCdoSessionDef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
+      }
+    }
+    return cdoSessionDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public CDOSessionDef basicGetCdoSessionDef() {
-		return cdoSessionDef;
-	}
+    return cdoSessionDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public void setCdoSessionDef(CDOSessionDef newCdoSessionDef) {
-		CDOSessionDef oldCdoSessionDef = cdoSessionDef;
-		cdoSessionDef = newCdoSessionDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
-	}
+    CDOSessionDef oldCdoSessionDef = cdoSessionDef;
+    cdoSessionDef = newCdoSessionDef;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef));
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-				if (resolve) return getCdoSessionDef();
-				return basicGetCdoSessionDef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      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
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-				setCdoSessionDef((CDOSessionDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+        setCdoSessionDef((CDOSessionDef)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-				setCdoSessionDef((CDOSessionDef)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+        setCdoSessionDef((CDOSessionDef)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
-				return cdoSessionDef != null;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
+        return cdoSessionDef != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	@Override
 	protected Object createInstance() {
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EDynamicPackageDefImpl.java
index 0ab8e7016c..00dc43c998 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EDynamicPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EDynamicPackageDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EDynamicPackageDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: EDynamicPackageDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -30,138 +30,142 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 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
-	 */
+   * @see #getResourceURI()
+   * @generated
+   * @ordered
+   */
   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
-	 */
+   * @see #getResourceURI()
+   * @generated
+   * @ordered
+   */
   protected String resourceURI = RESOURCE_URI_EDEFAULT;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected EDynamicPackageDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.EDYNAMIC_PACKAGE_DEF;
-	}
+    return CDODefsPackage.Literals.EDYNAMIC_PACKAGE_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getResourceURI()
   {
-		return resourceURI;
-	}
+    return resourceURI;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setResourceURI(String newResourceURI)
   {
-		String oldResourceURI = resourceURI;
-		resourceURI = newResourceURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI));
-	}
+    String oldResourceURI = resourceURI;
+    resourceURI = newResourceURI;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		switch (featureID) {
-			case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-				return getResourceURI();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+        return getResourceURI();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		switch (featureID) {
-			case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-				setResourceURI((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+        setResourceURI((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-				setResourceURI(RESOURCE_URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
+        setResourceURI(RESOURCE_URI_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI:
-				return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      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
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public String toString()
   {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (resourceURI: ");
-		result.append(resourceURI);
-		result.append(')');
-		return result.toString();
-	}
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (resourceURI: ");
+    result.append(resourceURI);
+    result.append(')');
+    return result.toString();
+  }
 
   @Override
   protected Object createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EGlobalPackageDefImpl.java
index d2e35e9f19..44b037693d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EGlobalPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EGlobalPackageDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EGlobalPackageDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: EGlobalPackageDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -23,23 +23,23 @@ import org.eclipse.emf.ecore.EPackage;
 public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPackageDef
 {
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected EGlobalPackageDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.EGLOBAL_PACKAGE_DEF;
-	}
+    return CDODefsPackage.Literals.EGLOBAL_PACKAGE_DEF;
+  }
 
   @Override
   public Object createInstance()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EPackageDefImpl.java
index b2fe21fb01..af670afa10 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/EPackageDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: EPackageDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: EPackageDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -53,118 +53,122 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   protected String nsURI = NS_URI_EDEFAULT;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   protected EPackageDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return CDODefsPackage.Literals.EPACKAGE_DEF;
-	}
+    return CDODefsPackage.Literals.EPACKAGE_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public String getNsURI()
   {
-		return nsURI;
-	}
+    return nsURI;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public void setNsURI(String newNsURI)
   {
-		String oldNsURI = nsURI;
-		nsURI = newNsURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI));
-	}
+    String oldNsURI = nsURI;
+    nsURI = newNsURI;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI));
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-		switch (featureID) {
-			case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-				return getNsURI();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+        return getNsURI();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-		switch (featureID) {
-			case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-				setNsURI((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+        setNsURI((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-				setNsURI(NS_URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.EPACKAGE_DEF__NS_URI:
+        setNsURI(NS_URI_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-		switch (featureID) {
-			case CDODefsPackage.EPACKAGE_DEF__NS_URI:
-				return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      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
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public String toString()
   {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (nsURI: ");
-		result.append(nsURI);
-		result.append(')');
-		return result.toString();
-	}
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (nsURI: ");
+    result.append(nsURI);
+    result.append(')');
+    return result.toString();
+  }
 
   @Override
   protected void validateDefinition()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/FailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/FailOverStrategyDefImpl.java
index 98e622a5bb..ed9396ce2f 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/FailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/FailOverStrategyDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FailOverStrategyDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: FailOverStrategyDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -32,129 +32,135 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  */
 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
-	 */
+   * @see #getConnectorDef()
+   * @generated
+   * @ordered
+   */
 	protected ConnectorDef connectorDef;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected FailOverStrategyDefImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.FAIL_OVER_STRATEGY_DEF;
-	}
+    return CDODefsPackage.Literals.FAIL_OVER_STRATEGY_DEF;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ConnectorDef getConnectorDef() {
-		if (connectorDef != null && connectorDef.eIsProxy()) {
-			InternalEObject oldConnectorDef = (InternalEObject)connectorDef;
-			connectorDef = (ConnectorDef)eResolveProxy(oldConnectorDef);
-			if (connectorDef != oldConnectorDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
-			}
-		}
-		return connectorDef;
-	}
+    if (connectorDef != null && connectorDef.eIsProxy())
+    {
+      InternalEObject oldConnectorDef = (InternalEObject)connectorDef;
+      connectorDef = (ConnectorDef)eResolveProxy(oldConnectorDef);
+      if (connectorDef != oldConnectorDef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+      }
+    }
+    return connectorDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ConnectorDef basicGetConnectorDef() {
-		return connectorDef;
-	}
+    return connectorDef;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setConnectorDef(ConnectorDef newConnectorDef) {
-		ConnectorDef oldConnectorDef = connectorDef;
-		connectorDef = newConnectorDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
-	}
+    ConnectorDef oldConnectorDef = connectorDef;
+    connectorDef = newConnectorDef;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-				if (resolve) return getConnectorDef();
-				return basicGetConnectorDef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+        if (resolve) return getConnectorDef();
+        return basicGetConnectorDef();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-				setConnectorDef((ConnectorDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+        setConnectorDef((ConnectorDef)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-				setConnectorDef((ConnectorDef)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+        setConnectorDef((ConnectorDef)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
-				return connectorDef != null;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
+        return connectorDef != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
 } //FailOverStrategyDefImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/PluginRepositoryProviderDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/PluginRepositoryProviderDefImpl.java
deleted file mode 100644
index a59e4abe2b..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/PluginRepositoryProviderDefImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PluginRepositoryProviderDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs.impl;
-
-import org.eclipse.emf.cdo.cdodefs.CDODefsPackage;
-import org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef;
-import org.eclipse.emf.cdo.internal.server.PluginRepositoryProvider;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Plugin Repository Provider Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PluginRepositoryProviderDefImpl extends RepositoryProviderDefImpl implements PluginRepositoryProviderDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PluginRepositoryProviderDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.PLUGIN_REPOSITORY_PROVIDER_DEF;
-	}
-
-	@Override
-	protected Object createInstance() {
-		return PluginRepositoryProvider.INSTANCE;
-	}
-
-} //PluginRepositoryProviderDefImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RepositoryProviderDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RepositoryProviderDefImpl.java
deleted file mode 100644
index 0671b782bc..0000000000
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RepositoryProviderDefImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RepositoryProviderDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.cdodefs.impl;
-
-import org.eclipse.emf.cdo.cdodefs.CDODefsPackage;
-import org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef;
-
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Repository Provider Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class RepositoryProviderDefImpl extends DefImpl implements RepositoryProviderDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RepositoryProviderDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.REPOSITORY_PROVIDER_DEF;
-	}
-
-} //RepositoryProviderDefImpl
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RetryFailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RetryFailOverStrategyDefImpl.java
index 03fb604c32..a7a76f8ed6 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RetryFailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/impl/RetryFailOverStrategyDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RetryFailOverStrategyDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: RetryFailOverStrategyDefImpl.java,v 1.2 2008-12-29 14:01:19 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.impl;
 
@@ -32,159 +32,163 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl
 		implements RetryFailOverStrategyDef {
 	/**
-	 * The default value of the '{@link #getRetries() <em>Retries</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getRetries()
-	 * @generated
-	 * @ordered
-	 */
+   * The default value of the '{@link #getRetries() <em>Retries</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see #getRetries()
+   * @generated
+   * @ordered
+   */
 	protected static final int RETRIES_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getRetries() <em>Retries</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getRetries()
-	 * @generated
-	 * @ordered
-	 */
+   * The cached value of the '{@link #getRetries() <em>Retries</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see #getRetries()
+   * @generated
+   * @ordered
+   */
 	protected int retries = RETRIES_EDEFAULT;
 
 	/**
-	 * This is true if the Retries attribute has been set.
-	 * <!-- begin-user-doc
+   * This is true if the Retries attribute has been set.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	protected boolean retriesESet;
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	protected RetryFailOverStrategyDefImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return CDODefsPackage.Literals.RETRY_FAIL_OVER_STRATEGY_DEF;
-	}
+    return CDODefsPackage.Literals.RETRY_FAIL_OVER_STRATEGY_DEF;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public int getRetries() {
-		return retries;
-	}
+    return retries;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public void setRetries(int newRetries) {
-		int oldRetries = retries;
-		retries = newRetries;
-		boolean oldRetriesESet = retriesESet;
-		retriesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, retries, !oldRetriesESet));
-	}
+    int oldRetries = retries;
+    retries = newRetries;
+    boolean oldRetriesESet = retriesESet;
+    retriesESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, retries, !oldRetriesESet));
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public void unsetRetries() {
-		int oldRetries = retries;
-		boolean oldRetriesESet = retriesESet;
-		retries = RETRIES_EDEFAULT;
-		retriesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, RETRIES_EDEFAULT, oldRetriesESet));
-	}
+    int oldRetries = retries;
+    boolean oldRetriesESet = retriesESet;
+    retries = RETRIES_EDEFAULT;
+    retriesESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, RETRIES_EDEFAULT, oldRetriesESet));
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	public boolean isSetRetries() {
-		return retriesESet;
-	}
+    return retriesESet;
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-				return new Integer(getRetries());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+        return getRetries();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-				setRetries(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+        setRetries((Integer)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-				unsetRetries();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+        unsetRetries();
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
-				return isSetRetries();
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES:
+        return isSetRetries();
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (retries: ");
-		if (retriesESet) result.append(retries); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (retries: ");
+    if (retriesESet) result.append(retries); else result.append("<unset>");
+    result.append(')');
+    return result.toString();
+  }
 
 	@Override
 	protected IFailOverStrategy createInstance() {
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsAdapterFactory.java
index 8246172bcd..0c2320e4fd 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsAdapterFactory.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDODefsAdapterFactory.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.util;
 
@@ -13,7 +13,6 @@ import org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOResourceDef;
-import org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
@@ -21,13 +20,10 @@ import org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EPackageDef;
 import org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef;
-import org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef;
-import org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef;
 import org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef;
 
 import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
 import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 import org.eclipse.emf.common.notify.Adapter;
@@ -45,460 +41,410 @@ import org.eclipse.emf.ecore.EObject;
  */
 public class CDODefsAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
+   * The cached model package.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected static CDODefsPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDODefsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = CDODefsPackage.eINSTANCE;
-		}
-	}
+    if (modelPackage == null)
+    {
+      modelPackage = CDODefsPackage.eINSTANCE;
+    }
+  }
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
+   * 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
-	 */
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CDODefsSwitch<Adapter> modelSwitch =
-		new CDODefsSwitch<Adapter>() {
-			@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 caseCDOServerProtocolFactoryDef(CDOServerProtocolFactoryDef object) {
-				return createCDOServerProtocolFactoryDefAdapter();
-			}
-			@Override
-			public Adapter caseRepositoryProviderDef(RepositoryProviderDef object) {
-				return createRepositoryProviderDefAdapter();
-			}
-			@Override
-			public Adapter casePluginRepositoryProviderDef(PluginRepositoryProviderDef object) {
-				return createPluginRepositoryProviderDefAdapter();
-			}
-			@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 caseServerProtocolFactoryDef(ServerProtocolFactoryDef object) {
-				return createServerProtocolFactoryDefAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+		new CDODefsSwitch<Adapter>()
+    {
+      @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();
+      }
+    };
 
 	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
+   * 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
-	 */
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
+    return modelSwitch.doSwitch((EObject)target);
+  }
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOViewDef <em>CDO View Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOViewDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOViewDef
+   * @generated
+   */
 	public Adapter createCDOViewDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOTransactionDef <em>CDO Transaction Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOTransactionDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOTransactionDef
+   * @generated
+   */
 	public Adapter createCDOTransactionDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef <em>CDO Audit Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOAuditDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOAuditDef
+   * @generated
+   */
 	public Adapter createCDOAuditDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef <em>CDO Session Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOSessionDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOSessionDef
+   * @generated
+   */
 	public Adapter createCDOSessionDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef <em>Fail Over Strategy Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.FailOverStrategyDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef
+   * @generated
+   */
 	public Adapter createFailOverStrategyDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef <em>Retry Fail Over Strategy Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.RetryFailOverStrategyDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef
+   * @generated
+   */
 	public Adapter createRetryFailOverStrategyDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOPackageRegistryDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef
+   * @generated
+   */
 	public Adapter createCDOPackageRegistryDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOEagerPackageRegistryDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef
+   * @generated
+   */
 	public Adapter createCDOEagerPackageRegistryDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOLazyPackageRegistryDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef
+   * @generated
+   */
 	public Adapter createCDOLazyPackageRegistryDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.EPackageDef <em>EPackage Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EPackageDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.EPackageDef
+   * @generated
+   */
 	public Adapter createEPackageDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef <em>EDynamic Package Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EDynamicPackageDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef
+   * @generated
+   */
 	public Adapter createEDynamicPackageDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef <em>EGlobal Package Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.EGlobalPackageDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef
+   * @generated
+   */
 	public Adapter createEGlobalPackageDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOClientProtocolFactoryDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOClientProtocolFactoryDef
+   * @generated
+   */
 	public Adapter createCDOClientProtocolFactoryDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef <em>CDO Server Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOServerProtocolFactoryDef
-	 * @generated
-	 */
-	public Adapter createCDOServerProtocolFactoryDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef <em>Repository 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.emf.cdo.cdodefs.RepositoryProviderDef
-	 * @generated
-	 */
-	public Adapter createRepositoryProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef <em>Plugin Repository 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.emf.cdo.cdodefs.PluginRepositoryProviderDef
-	 * @generated
-	 */
-	public Adapter createPluginRepositoryProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.cdodefs.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.cdodefs.CDOResourceDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.cdodefs.CDOResourceDef
+   * @generated
+   */
 	public Adapter createCDOResourceDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>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.util.net4jutildefs.Def
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.net4j.util.net4jutildefs.Def
+   * @generated
+   */
 	public Adapter createDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.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.net4jdefs.ProtocolProviderDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * @generated
+   */
 	public Adapter createProtocolProviderDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.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.net4jdefs.ClientProtocolFactoryDef
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * @generated
+   */
 	public Adapter createClientProtocolFactoryDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef <em>Server 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.net4jdefs.ServerProtocolFactoryDef
-	 * @generated
-	 */
-	public Adapter createServerProtocolFactoryDefAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @generated
+   */
 	public Adapter createEObjectAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 } //CDODefsAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsSwitch.java
index a5666695b6..f143125485 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/util/CDODefsSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CDODefsSwitch.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDODefsSwitch.java,v 1.2 2008-12-29 14:01:20 estepper Exp $
  */
 package org.eclipse.emf.cdo.cdodefs.util;
 
@@ -13,7 +13,6 @@ import org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOResourceDef;
-import org.eclipse.emf.cdo.cdodefs.CDOServerProtocolFactoryDef;
 import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
 import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
@@ -21,13 +20,10 @@ import org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
 import org.eclipse.emf.cdo.cdodefs.EPackageDef;
 import org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef;
-import org.eclipse.emf.cdo.cdodefs.PluginRepositoryProviderDef;
-import org.eclipse.emf.cdo.cdodefs.RepositoryProviderDef;
 import org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef;
 
 import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
 import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 import org.eclipse.emf.ecore.EClass;
@@ -50,528 +46,462 @@ import java.util.List;
  */
 public class CDODefsSwitch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
+   * The cached model package
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected static CDODefsPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CDODefsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = CDODefsPackage.eINSTANCE;
-		}
-	}
+    if (modelPackage == null)
+    {
+      modelPackage = CDODefsPackage.eINSTANCE;
+    }
+  }
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
+   * 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
-	 */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
+    return doSwitch(theEObject.eClass(), 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 -->
+   * 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
-	 */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      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 -->
+   * 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
-	 */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		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_SERVER_PROTOCOL_FACTORY_DEF: {
-				CDOServerProtocolFactoryDef cdoServerProtocolFactoryDef = (CDOServerProtocolFactoryDef)theEObject;
-				T result = caseCDOServerProtocolFactoryDef(cdoServerProtocolFactoryDef);
-				if (result == null) result = caseServerProtocolFactoryDef(cdoServerProtocolFactoryDef);
-				if (result == null) result = caseProtocolProviderDef(cdoServerProtocolFactoryDef);
-				if (result == null) result = caseDef(cdoServerProtocolFactoryDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CDODefsPackage.REPOSITORY_PROVIDER_DEF: {
-				RepositoryProviderDef repositoryProviderDef = (RepositoryProviderDef)theEObject;
-				T result = caseRepositoryProviderDef(repositoryProviderDef);
-				if (result == null) result = caseDef(repositoryProviderDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CDODefsPackage.PLUGIN_REPOSITORY_PROVIDER_DEF: {
-				PluginRepositoryProviderDef pluginRepositoryProviderDef = (PluginRepositoryProviderDef)theEObject;
-				T result = casePluginRepositoryProviderDef(pluginRepositoryProviderDef);
-				if (result == null) result = caseRepositoryProviderDef(pluginRepositoryProviderDef);
-				if (result == null) result = caseDef(pluginRepositoryProviderDef);
-				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);
-		}
-	}
+    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);
+    }
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseCDOViewDef(CDOViewDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseCDOTransactionDef(CDOTransactionDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseCDOAuditDef(CDOAuditDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseCDOSessionDef(CDOSessionDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Fail Over Strategy Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Fail Over Strategy 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.
-	 * @return the result of interpreting the object as an instance of '<em>Fail Over Strategy Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Fail Over Strategy Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseFailOverStrategyDef(FailOverStrategyDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy 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.
-	 * @return the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseRetryFailOverStrategyDef(RetryFailOverStrategyDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Package Registry 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.
-	 * @return the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCDOPackageRegistryDef(CDOPackageRegistryDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Eager Package Registry 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.
-	 * @return the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCDOEagerPackageRegistryDef(CDOEagerPackageRegistryDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry 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.
-	 * @return the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCDOLazyPackageRegistryDef(CDOLazyPackageRegistryDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseEPackageDef(EPackageDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>EDynamic 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.
-	 * @return the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseEDynamicPackageDef(EDynamicPackageDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseEGlobalPackageDef(EGlobalPackageDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory 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.
-	 * @return the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCDOClientProtocolFactoryDef(CDOClientProtocolFactoryDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>CDO Server Protocol Factory 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.
-	 * @return the result of interpreting the object as an instance of '<em>CDO Server Protocol Factory Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCDOServerProtocolFactoryDef(CDOServerProtocolFactoryDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Repository Provider 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.
-	 * @return the result of interpreting the object as an instance of '<em>Repository Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRepositoryProviderDef(RepositoryProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Plugin Repository Provider 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.
-	 * @return the result of interpreting the object as an instance of '<em>Plugin Repository Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePluginRepositoryProviderDef(PluginRepositoryProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * 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.
-	 * @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
-	 */
+   * @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
+   */
 	public T caseCDOResourceDef(CDOResourceDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * <!-- begin-user-doc -->
+   * 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.
-	 * @return the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @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
+   */
 	public T caseDef(Def object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Protocol Provider 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.
-	 * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseProtocolProviderDef(ProtocolProviderDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory 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.
-	 * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseClientProtocolFactoryDef(ClientProtocolFactoryDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Server Protocol Factory 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.
-	 * @return the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseServerProtocolFactoryDef(ServerProtocolFactoryDef object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
+   * 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.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
+   * @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
+   */
 	public T defaultCase(EObject object) {
-		return null;
-	}
+    return null;
+  }
 
 } //CDODefsSwitch
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOAuditDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOAuditDefValidator.java
new file mode 100644
index 0000000000..ef79a6dff8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOAuditDefValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOAuditDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import java.util.Date;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOAuditDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOAuditDefValidator
+{
+  boolean validate();
+
+  boolean validateTimeStamp(Date value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOClientProtocolFactoryDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOClientProtocolFactoryDefValidator.java
new file mode 100644
index 0000000000..4153a6a010
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOClientProtocolFactoryDefValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOClientProtocolFactoryDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOClientProtocolFactoryDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOClientProtocolFactoryDefValidator
+{
+  boolean validate();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOEagerPackageRegistryDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOEagerPackageRegistryDefValidator.java
new file mode 100644
index 0000000000..446529603d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOEagerPackageRegistryDefValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOEagerPackageRegistryDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOEagerPackageRegistryDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOEagerPackageRegistryDefValidator
+{
+  boolean validate();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOLazyPackageRegistryDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOLazyPackageRegistryDefValidator.java
new file mode 100644
index 0000000000..fffb7213d3
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOLazyPackageRegistryDefValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOLazyPackageRegistryDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOLazyPackageRegistryDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOLazyPackageRegistryDefValidator
+{
+  boolean validate();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOPackageRegistryDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOPackageRegistryDefValidator.java
new file mode 100644
index 0000000000..ec9a6607cf
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOPackageRegistryDefValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOPackageRegistryDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import org.eclipse.emf.cdo.cdodefs.EPackageDef;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOPackageRegistryDefValidator
+{
+  boolean validate();
+
+  boolean validatePackages(EList<EPackageDef> value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOResourceDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOResourceDefValidator.java
new file mode 100644
index 0000000000..f919a72a1f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOResourceDefValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOResourceDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
+import org.eclipse.emf.cdo.cdodefs.ResourceMode;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOResourceDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOResourceDefValidator
+{
+  boolean validate();
+
+  boolean validateCdoTransaction(CDOTransactionDef value);
+  boolean validateResourceMode(ResourceMode value);
+  boolean validatePath(String value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOSessionDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOSessionDefValidator.java
new file mode 100644
index 0000000000..c9a68196fd
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOSessionDefValidator.java
@@ -0,0 +1,29 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOSessionDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
+import org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef;
+
+import org.eclipse.net4j.net4jdefs.ConnectorDef;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOSessionDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOSessionDefValidator
+{
+  boolean validate();
+
+  boolean validateConnectorDef(ConnectorDef value);
+  boolean validateRepositoryName(String value);
+  boolean validateCdoPackageRegistryDef(CDOPackageRegistryDef value);
+  boolean validateLegacySupportEnabled(boolean value);
+  boolean validateFailOverStrategyDef(FailOverStrategyDef value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOTransactionDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOTransactionDefValidator.java
new file mode 100644
index 0000000000..bca69672d7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOTransactionDefValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOTransactionDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOTransactionDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOTransactionDefValidator
+{
+  boolean validate();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOViewDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOViewDefValidator.java
new file mode 100644
index 0000000000..fed79fcd0b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/CDOViewDefValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CDOViewDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.CDOViewDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CDOViewDefValidator
+{
+  boolean validate();
+
+  boolean validateCdoSessionDef(CDOSessionDef value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EDynamicPackageDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EDynamicPackageDefValidator.java
new file mode 100644
index 0000000000..cc46f6c173
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EDynamicPackageDefValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EDynamicPackageDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.EDynamicPackageDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface EDynamicPackageDefValidator
+{
+  boolean validate();
+
+  boolean validateResourceURI(String value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EGlobalPackageDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EGlobalPackageDefValidator.java
new file mode 100644
index 0000000000..64a246cf90
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EGlobalPackageDefValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EGlobalPackageDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface EGlobalPackageDefValidator
+{
+  boolean validate();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EPackageDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EPackageDefValidator.java
new file mode 100644
index 0000000000..54c381769c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/EPackageDefValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EPackageDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.EPackageDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface EPackageDefValidator
+{
+  boolean validate();
+
+  boolean validateNsURI(String value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/FailOverStrategyDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/FailOverStrategyDefValidator.java
new file mode 100644
index 0000000000..f09d0d9890
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/FailOverStrategyDefValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FailOverStrategyDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+import org.eclipse.net4j.net4jdefs.ConnectorDef;
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.FailOverStrategyDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface FailOverStrategyDefValidator
+{
+  boolean validate();
+
+  boolean validateConnectorDef(ConnectorDef value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/RetryFailOverStrategyDefValidator.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/RetryFailOverStrategyDefValidator.java
new file mode 100644
index 0000000000..da5151a693
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/cdodefs/validation/RetryFailOverStrategyDefValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RetryFailOverStrategyDefValidator.java,v 1.1 2008-12-29 14:01:20 estepper Exp $
+ */
+package org.eclipse.emf.cdo.cdodefs.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.emf.cdo.cdodefs.RetryFailOverStrategyDef}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface RetryFailOverStrategyDefValidator
+{
+  boolean validate();
+
+  boolean validateRetries(int value);
+}
diff --git a/plugins/org.eclipse.emf.cdo.defs/text/description.txt b/plugins/org.eclipse.emf.cdo.defs/text/description.txt
new file mode 100644
index 0000000000..763f1b5838
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.defs/text/description.txt
@@ -0,0 +1,56 @@
+Model Org.eclipse.emf.cdo
+
+This model description is not a real EMF artifact. It was generated by the
+org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's
+code generator can be extended.
+This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+
+Package cdodefs <http://www.eclipse.org/emf/CDO/defs/1.0.0>
+
+  Class CDOViewDef -> Def
+    Reference cdoSessionDef : CDOSessionDef<<1..1>>
+
+  Class CDOTransactionDef -> CDOViewDef
+
+  Class CDOAuditDef -> CDOViewDef
+    Attribute timeStamp : EDate<<1..1>>
+
+  Class CDOSessionDef -> Def
+    Reference connectorDef : ConnectorDef<<1..1>>
+    Attribute repositoryName : EString<<1..1>>
+    Reference cdoPackageRegistryDef : CDOPackageRegistryDef<<1..1>>
+    Attribute legacySupportEnabled : EBoolean<<1..1>>
+    Reference failOverStrategyDef : FailOverStrategyDef
+
+  Class FailOverStrategyDef -> Def
+    Reference connectorDef : ConnectorDef<<1..1>>
+
+  Class RetryFailOverStrategyDef -> FailOverStrategyDef
+    Attribute retries : EInt
+
+  Class CDOPackageRegistryDef -> Def
+    Reference packages : EPackageDef<<0..*>>
+
+  Class CDOEagerPackageRegistryDef -> CDOPackageRegistryDef
+
+  Class CDOLazyPackageRegistryDef -> CDOPackageRegistryDef
+
+  Class EPackageDef -> Def
+    Attribute nsURI : EString<<1..1>>
+
+  Class EDynamicPackageDef -> EPackageDef
+    Attribute resourceURI : EString<<1..1>>
+
+  Class EGlobalPackageDef -> EPackageDef
+
+  Class CDOClientProtocolFactoryDef -> ClientProtocolFactoryDef
+
+  Class CDOResourceDef -> Def
+    Reference cdoTransaction : CDOTransactionDef<<1..1>>
+    Attribute resourceMode : ResourceMode<<1..1>>
+    Attribute path : EString<<1..1>>
+
+  Enum ResourceMode
+    Literal GET = 0
+    Literal CREATE = 0
+    Literal GET_OR_CREATE = 0
diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 97526d7e95..a5807351af 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -18,11 +18,11 @@ Export-Package: org.eclipse.emf.cdo;version="2.0.0",
  org.eclipse.emf.cdo.eresource.util;version="2.0.0",
  org.eclipse.emf.cdo.util;version="2.0.0",
  org.eclipse.emf.internal.cdo;version="2.0.0",
- org.eclipse.emf.internal.cdo.analyzer;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.internal.cdo.analyzer;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs",
  org.eclipse.emf.internal.cdo.bundle;version="2.0.0";x-friends:="org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.protocol;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.internal.cdo.query;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.internal.cdo.revision;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.internal.cdo.util;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.internal.cdo.protocol;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs",
+ org.eclipse.emf.internal.cdo.query;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs",
+ org.eclipse.emf.internal.cdo.revision;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs",
+ org.eclipse.emf.internal.cdo.util;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs",
  org.eclipse.emf.spi.cdo;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
index d50b95a341..b1e2926ec8 100644
--- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
@@ -2,19 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.net4j.util.defs;bundle-version="1.0.0",
- org.eclipse.net4j.tcp;bundle-version="2.0.0",
- org.eclipse.net4j.jvm;bundle-version="2.0.0",
- org.eclipse.net4j.http;bundle-version="2.0.0"
+Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.http;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.net4jdefs,
- org.eclipse.net4j.net4jdefs.impl,
- org.eclipse.net4j.net4jdefs.util
+Export-Package: org.eclipse.net4j.net4jdefs;version="2.0.0",
+ org.eclipse.net4j.net4jdefs.impl;version="2.0.0",
+ org.eclipse.net4j.net4jdefs.util;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
index f5cb6142ac..553a1b8772 100644
--- a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.ui.defs;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.net4j.util.defs;bundle-version="1.0.0",
- org.eclipse.net4j.defs;bundle-version="1.0.0",
- org.eclipse.net4j.util.ui;bundle-version="2.0.0"
+Require-Bundle: org.eclipse.net4j.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.net4j.net4juidefs;version="2.0.0",
+ org.eclipse.net4j.net4juidefs.impl;version="2.0.0",
+ org.eclipse.net4j.net4juidefs.util;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 7235d8e1b0..be7c271000 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.ui;bundle-version="[1.0.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0";x-internal:=true,
+Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0";x-friends:="org.eclipse.net4j.ui.defs",
  org.eclipse.net4j.internal.ui.bundle;version="2.0.0";x-internal:=true,
- org.eclipse.net4j.internal.ui.views;version="2.0.0";x-internal:=true
+ org.eclipse.net4j.internal.ui.views;version="2.0.0";x-friends:="org.eclipse.net4j.ui.defs"
diff --git a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
index 2c2902c8d1..ac2f957df0 100644
--- a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.util.defs;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.net4j.util.net4jutildefs,
- org.eclipse.net4j.util.net4jutildefs.impl,
- org.eclipse.net4j.util.net4jutildefs.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="2.0.0"
+Export-Package: org.eclipse.net4j.util.net4jutildefs;version="2.0.0",
+ org.eclipse.net4j.util.net4jutildefs.impl;version="2.0.0",
+ org.eclipse.net4j.util.net4jutildefs.util;version="2.0.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
index fff6c38e09..dacbc6c8be 100644
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@ Import-Package: org.eclipse.osgi.service.debug;version="[1.0.0,2.0.0)";resolutio
  org.osgi.service.log;version="[1.3.0,2.0.0)";resolution:=optional,
  org.osgi.util.tracker;version="[1.3.0,2.0.0)";resolution:=optional
 Export-Package: org.eclipse.net4j.internal.util.bundle;version="2.0.0";x-friends:="org.eclipse.net4j.util.ui",
- org.eclipse.net4j.internal.util.container;version="2.0.0";x-internal:=true,
- org.eclipse.net4j.internal.util.factory;version="2.0.0";x-internal:=true,
- org.eclipse.net4j.internal.util.om;version="2.0.0";x-internal:=true,
- org.eclipse.net4j.internal.util.om.pref;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.util.container;version="2.0.0";x-friends:="org.eclipse.net4j.util.defs",
+ org.eclipse.net4j.internal.util.factory;version="2.0.0";x-friends:="org.eclipse.net4j.util.defs",
+ org.eclipse.net4j.internal.util.om;version="2.0.0";x-friends:="org.eclipse.net4j.util.defs",
+ org.eclipse.net4j.internal.util.om.pref;version="2.0.0";x-friends:="org.eclipse.net4j.util.defs",
  org.eclipse.net4j.util;version="2.0.0",
  org.eclipse.net4j.util.cache;version="2.0.0",
  org.eclipse.net4j.util.collection;version="2.0.0",
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 35b21c8595..29c67aa012 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Export-Package: org.eclipse.internal.net4j;version="2.0.0";
    org.eclipse.net4j.http,
    org.eclipse.net4j.http.common,
    org.eclipse.net4j.http.tests,
-   org.eclipse.net4j.tests",
+   org.eclipse.net4j.tests,
+   org.eclipse.net4j.defs",
  org.eclipse.internal.net4j.buffer;version="2.0.0";
   x-friends:="org.eclipse.net4j.http.server,
    org.eclipse.net4j.jvm,
@@ -26,7 +27,8 @@ Export-Package: org.eclipse.internal.net4j;version="2.0.0";
    org.eclipse.net4j.http,
    org.eclipse.net4j.http.common,
    org.eclipse.net4j.http.tests,
-   org.eclipse.net4j.tests",
+   org.eclipse.net4j.tests,
+   org.eclipse.net4j.defs",
  org.eclipse.internal.net4j.bundle;version="2.0.0";x-internal:=true,
  org.eclipse.net4j;version="2.0.0",
  org.eclipse.net4j.acceptor;version="2.0.0",