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

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

81 files changed, 10805 insertions, 7260 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index fdd19c7f7c..c86817c454 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.db.hsqldb;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.derby;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.mysql;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.net4j.jvm;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.emf.cdo.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -27,6 +27,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.tests.model4;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.tests.model4interfaces;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.tests.model5;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
 Export-Package: base;version="2.0.0",
  base.impl;version="2.0.0",
@@ -42,6 +43,7 @@ Export-Package: base;version="2.0.0",
  org.eclipse.emf.cdo.tests.bundle;version="2.0.0",
  org.eclipse.emf.cdo.tests.config;version="2.0.0",
  org.eclipse.emf.cdo.tests.config.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.defs;version="2.0.0",
  org.eclipse.emf.cdo.tests.store.logic;version="2.0.0",
  org.eclipse.net4j.tests;version="2.0.0",
  reference;version="2.0.0",
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java
new file mode 100644
index 0000000000..fe81b68138
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java
@@ -0,0 +1,49 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite;
+
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Eike Stepper
+ */
+public class AllTestsCDODefs extends ConfigTestSuite
+{
+  public static Test suite()
+  {
+    return new AllTestsCDODefs().getTestSuite("CDO Defs Tests");
+  }
+
+  @Override
+  protected void initConfigSuites(TestSuite parent)
+  {
+    addScenario(parent, COMBINED, MEM, TCP, NATIVE);
+  }
+
+  @Override
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  {
+    testClasses.add(EGlobalPackageDefImplTest.class);
+    testClasses.add(CDOPackageRegistryDefImplTest.class);
+    testClasses.add(CDOSessionDefImplTest.class);
+    testClasses.add(CDOViewDefImplTest.class);
+    testClasses.add(CDOAuditDefImplTest.class);
+    testClasses.add(CDOTransactionDefImplTest.class);
+    testClasses.add(CDOViewDefImplTest.class);
+    testClasses.add(CDOResourceDefImplTest.class);
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java
new file mode 100644
index 0000000000..661bcce382
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java
@@ -0,0 +1,80 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.CDOAudit;
+import org.eclipse.emf.cdo.CDOTransaction;
+import org.eclipse.emf.cdo.cdodefs.CDOAuditDef;
+import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
+import org.eclipse.emf.cdo.tests.model1.Customer;
+
+import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
+
+import org.eclipse.emf.ecore.EObject;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOAuditDefImplTest extends AbstractCDOTest
+{
+  private static final String RESOURCE_ID = "/defsTest1";
+
+  public void testCreateAuditCanRead()
+  {
+    final String customerName = "Heino";
+
+    CDOTransaction transaction = openModel1Session().openTransaction();
+    Customer customer = getModel1Factory().createCustomer();
+    customer.setName(customerName);
+    transaction.createResource(RESOURCE_ID).getContents().add(customer);
+    transaction.commit();
+
+    CDOAuditDef cdoAuditDef = CDODefsUtil.createCDOAuditDef( //
+        CDODefsUtil.createSessionDef( //
+            IRepositoryConfig.REPOSITORY_NAME, //
+            CDODefsUtil.createEagerPackageRegistryDef(), //
+            Net4jDefsUtil.createTCPConnectorDef( //
+                SessionConfig.TCP.CONNECTOR_HOST)));
+    cdoAuditDef.setTimeStamp(new Date());
+
+    CDOAudit cdoAudit = (CDOAudit)cdoAuditDef.getInstance();
+    EObject object = cdoAudit.getResource(RESOURCE_ID).getContents().get(0);
+    assertTrue(object instanceof Customer && customerName.equals(customer.getName()));
+  }
+
+  public void testCreateAuditCreatesOnceAndReusesEvenOnChangedTimestamp()
+  {
+    CDOAuditDef cdoAuditDef = CDODefsUtil.createCDOAuditDef( //
+        CDODefsUtil.createSessionDef( //
+            IRepositoryConfig.REPOSITORY_NAME, //
+            CDODefsUtil.createEagerPackageRegistryDef(), //
+            Net4jDefsUtil.createTCPConnectorDef( //
+                SessionConfig.TCP.CONNECTOR_HOST)));
+    cdoAuditDef.setTimeStamp(new Date());
+
+    CDOAudit thisCdoAuditReference = (CDOAudit)cdoAuditDef.getInstance();
+
+    Calendar calendar = GregorianCalendar.getInstance();
+    ConcurrencyUtil.sleep(1000l);
+    calendar.roll(Calendar.SECOND, true);
+    cdoAuditDef.setTimeStamp(calendar.getTime());
+    CDOAudit thatCdoAuditReference = (CDOAudit)cdoAuditDef.getInstance();
+    assertTrue(thisCdoAuditReference == thatCdoAuditReference);
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java
new file mode 100644
index 0000000000..9779fdf436
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java
@@ -0,0 +1,51 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.cdodefs.CDODefsFactory;
+import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef;
+import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
+import org.eclipse.emf.cdo.cdodefs.EPackageDef;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOPackageRegistryDefImplTest extends AbstractCDOTest
+{
+  public void testReturnsPackageInstances()
+  {
+    CDOPackageRegistryDef packageRegistryDef = CDODefsFactory.eINSTANCE.createCDOPackageRegistryDef();
+    EList<EPackageDef> packages = packageRegistryDef.getPackages();
+    Model1Package model1package = getModel1Package();
+    packages.add(createEGlobalPackageDef(model1package));
+    Model2Package model2Package = getModel2Package();
+    packages.add(createEGlobalPackageDef(model2Package));
+
+    EPackage.Registry packageRegistry = (EPackage.Registry)packageRegistryDef.getInstance();
+    EPackage ePackage1 = packageRegistry.getEPackage(getModel1Package().getNsURI());
+    assertTrue(ePackage1 instanceof Model1Package);
+    EPackage ePackage2 = packageRegistry.getEPackage(getModel2Package().getNsURI());
+    assertTrue(ePackage2 instanceof Model2Package);
+  }
+
+  private EGlobalPackageDef createEGlobalPackageDef(EPackage ePackage)
+  {
+    EGlobalPackageDef eGlobalPackageDef = CDODefsFactory.eINSTANCE.createEGlobalPackageDef();
+    eGlobalPackageDef.setNsURI(ePackage.getNsURI());
+    return eGlobalPackageDef;
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java
new file mode 100644
index 0000000000..5e6fbec297
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java
@@ -0,0 +1,84 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.CDOTransaction;
+import org.eclipse.emf.cdo.cdodefs.CDOResourceDef;
+import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
+import org.eclipse.emf.cdo.cdodefs.ResourceMode;
+import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil;
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
+import org.eclipse.emf.cdo.util.InvalidURIException;
+
+import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+
+import org.eclipse.emf.common.util.WrappedException;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOResourceDefImplTest extends AbstractCDOTest
+{
+  private static final String TEST_RESOURCE = "/test1";
+
+  public void testGetOrCreateResourceCreatesIfResourceDoesNotExist()
+  {
+    CDOSessionDef cdoSessionDef = //
+    CDODefsUtil.createSessionDef( //
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+
+    CDOResourceDef resourceDef = CDODefsUtil.createCDOResourceDef(CDODefsUtil.createCDOTransactionDef(cdoSessionDef));
+    resourceDef.setResourceMode(ResourceMode.GET_OR_CREATE);
+    resourceDef.setPath(TEST_RESOURCE);
+    CDOResource cdoResource = (CDOResource)resourceDef.getInstance();
+    assertNotNull(cdoResource);
+
+    // clean up
+    CDOTransaction transaction = (CDOTransaction)resourceDef.getCdoTransaction().getInstance();
+    transaction.getSession().close();
+  }
+
+  public void testGetResourceFailsIfDoesExist()
+  {
+    CDOSessionDef cdoSessionDef = //
+
+    CDODefsUtil.createSessionDef( //
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+
+    CDOResourceDef resourceDef = CDODefsUtil.createCDOResourceDef(//
+        CDODefsUtil.createCDOTransactionDef(cdoSessionDef));
+    resourceDef.setResourceMode(ResourceMode.GET);
+    resourceDef.setPath(TEST_RESOURCE);
+
+    try
+    {
+      resourceDef.getInstance();
+      fail("Exception expected!");
+    }
+    catch (WrappedException e)
+    {
+      assertTrue(e.getCause().getClass() == InvalidURIException.class);
+    }
+    finally
+    {
+      // clean up
+      CDOTransaction transaction = (CDOTransaction)resourceDef.getCdoTransaction().getInstance();
+      transaction.getSession().close();
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java
new file mode 100644
index 0000000000..59965f9859
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java
@@ -0,0 +1,101 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.CDOSession;
+import org.eclipse.emf.cdo.cdodefs.CDODefsFactory;
+import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
+import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
+
+import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOSessionDefImplTest extends AbstractCDOTest
+{
+  public void testNoPackageRegistryThrows()
+  {
+    try
+    {
+      CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+      cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+      cdoSessionDef.setLegacySupportEnabled(false);
+      cdoSessionDef.setRepositoryName(IRepositoryConfig.REPOSITORY_NAME);
+      cdoSessionDef.getInstance();
+      fail("IllegalStateException expected!");
+    }
+    catch (IllegalStateException e)
+    {
+      // Success
+    }
+  }
+
+  public void testConnectorAndFailOverStrategyAreMutuallyExclusive()
+  {
+    try
+    {
+      CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+      cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+      cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef());
+      fail("IllegalStateException expected!");
+    }
+    catch (IllegalStateException e)
+    {
+      // Success
+    }
+
+    try
+    {
+      CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+      cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef());
+      cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+      fail("IllegalStateException expected!");
+    }
+    catch (IllegalStateException e)
+    {
+      // Success
+    }
+  }
+
+  public void testConnectorAndFailMayBeUnset()
+  {
+    {
+      CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+      cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef());
+      cdoSessionDef.unsetFailOverStrategyDef();
+      cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+    }
+
+    {
+      CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+      cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+      cdoSessionDef.unsetConnectorDef();
+      cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef());
+    }
+  }
+
+  public void testSessionInstanceIsActive()
+  {
+    CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
+    cdoSessionDef.setConnectorDef( //
+        Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+    cdoSessionDef.setLegacySupportEnabled(false);
+    cdoSessionDef.setRepositoryName(IRepositoryConfig.REPOSITORY_NAME);
+    cdoSessionDef.setCdoPackageRegistryDef(CDODefsUtil.createEagerPackageRegistryDef());
+    CDOSession cdoSession = (CDOSession)cdoSessionDef.getInstance();
+    assertTrue(LifecycleUtil.isActive(cdoSession));
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java
new file mode 100644
index 0000000000..5e311f3976
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java
@@ -0,0 +1,87 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.CDOTransaction;
+import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
+import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef;
+import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil;
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
+import org.eclipse.emf.cdo.tests.model1.Customer;
+
+import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOTransactionDefImplTest extends AbstractCDOTest
+{
+  private static final String TEST_RESOURCE = "/test1";
+
+  public void testTransactionIsReused()
+  {
+
+    CDOTransactionDef transactionDef = CDODefsUtil.createCDOTransactionDef( //
+        CDODefsUtil.createSessionDef( //
+            IRepositoryConfig.REPOSITORY_NAME, //
+            CDODefsUtil.createEagerPackageRegistryDef(), //
+            Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)));
+
+    CDOTransaction thisCdoTransactionReference = (CDOTransaction)transactionDef.getInstance();
+    CDOTransaction thatCdoTransactionReference = (CDOTransaction)transactionDef.getInstance();
+
+    assertTrue(thisCdoTransactionReference == thatCdoTransactionReference);
+
+    thisCdoTransactionReference.getSession().close();
+  }
+
+  public void testClosedTransactionIsRecreated()
+  {
+    CDOTransactionDef cdoTransactionDef = CDODefsUtil.createCDOTransactionDef( //
+        CDODefsUtil.createSessionDef( //
+            IRepositoryConfig.REPOSITORY_NAME, //
+            CDODefsUtil.createEagerPackageRegistryDef(), //
+            Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)));
+    CDOTransaction transactionInstance = (CDOTransaction)cdoTransactionDef.getInstance();
+    transactionInstance.close();
+    CDOTransaction newTransactionInstance = (CDOTransaction)cdoTransactionDef.getInstance();
+
+    assertTrue(newTransactionInstance != transactionInstance);
+
+    newTransactionInstance.getSession().close();
+  }
+
+  public void testCreateAndReadModel()
+  {
+    CDOSessionDef cdoSessionDef = //
+    CDODefsUtil.createSessionDef( //
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST));
+
+    CDOTransactionDef transactionDef = CDODefsUtil.createCDOTransactionDef(cdoSessionDef);
+    CDOTransaction transaction = (CDOTransaction)transactionDef.getInstance();
+
+    transaction.getSession().getPackageRegistry().putEPackage(getModel1Package());
+    CDOResource resource = transaction.createResource(TEST_RESOURCE);
+    Customer customer = getModel1Factory().createCustomer();
+    resource.getContents().add(customer);
+    transaction.commit();
+
+    CDOResource resourceFetched = transaction.getResource(TEST_RESOURCE);
+    assertTrue(resourceFetched.eContents().contains(customer));
+
+    transaction.getSession().close();
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java
new file mode 100644
index 0000000000..9bae1e411e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java
@@ -0,0 +1,102 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.CDOTransaction;
+import org.eclipse.emf.cdo.CDOView;
+import org.eclipse.emf.cdo.cdodefs.CDODefsFactory;
+import org.eclipse.emf.cdo.cdodefs.CDOSessionDef;
+import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
+import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil;
+import org.eclipse.emf.cdo.common.CDOProtocolView.Type;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
+
+import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
+import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOViewDefImplTest extends AbstractCDOTest
+{
+  private static final String RESOURCE_ID = "/test1";
+
+  public void testCreateView()
+  {
+
+    CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef();
+    TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST);
+    CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(//
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        tcpConnectorDef);
+    cdoViewDef.setCdoSessionDef( //
+        cdoSessionDef);
+
+    CDOView cdoView = (CDOView)cdoViewDef.getInstance();
+    assertTrue(cdoView.getViewType() == Type.READONLY);
+
+    // cleanup
+    cdoViewDef.unsetInstance();
+    cdoSessionDef.unsetInstance();
+    tcpConnectorDef.unsetInstance();
+  }
+
+  public void testCreateViewCreatesOnceAndReuses()
+  {
+    CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef();
+    TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST);
+    CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(//
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        tcpConnectorDef);
+    cdoViewDef.setCdoSessionDef( //
+        cdoSessionDef);
+
+    CDOView thisCdoViewReference = (CDOView)cdoViewDef.getInstance();
+    CDOView thatCdoViewReference = (CDOView)cdoViewDef.getInstance();
+
+    assertTrue(thisCdoViewReference == thatCdoViewReference);
+
+    // cleanup
+    cdoViewDef.unsetInstance();
+    cdoSessionDef.unsetInstance();
+    tcpConnectorDef.unsetInstance();
+  }
+
+  public void testViewCreatedCanRead()
+  {
+    CDOTransaction transaction = openSession().openTransaction();
+    transaction.createResource(RESOURCE_ID);
+    transaction.commit();
+
+    CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef();
+    TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST);
+    CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(//
+        IRepositoryConfig.REPOSITORY_NAME, //
+        CDODefsUtil.createEagerPackageRegistryDef(), //
+        tcpConnectorDef);
+    cdoViewDef.setCdoSessionDef( //
+        cdoSessionDef);
+
+    CDOView cdoView = (CDOView)cdoViewDef.getInstance();
+
+    assertEquals(true, cdoView.hasResource(RESOURCE_ID));
+    assertEquals(false, cdoView.hasResource("/test2"));
+
+    // cleanup
+    cdoViewDef.unsetInstance();
+    cdoSessionDef.unsetInstance();
+    tcpConnectorDef.unsetInstance();
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java
new file mode 100644
index 0000000000..df92bd08a7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java
@@ -0,0 +1,34 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.defs;
+
+import org.eclipse.emf.cdo.cdodefs.CDODefsFactory;
+import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * @author Eike Stepper
+ */
+public class EGlobalPackageDefImplTest extends AbstractCDOTest
+{
+  public void testEGlobalPackageDefReturnsPackage()
+  {
+    EPackage model1Package = getModel1Package();
+    EPackage.Registry.INSTANCE.put(model1Package.getNsURI(), model1Package);
+
+    EGlobalPackageDef packageDef = CDODefsFactory.eINSTANCE.createEGlobalPackageDef();
+    packageDef.setNsURI(model1Package.getNsURI());
+
+    packageDef.getInstance();
+  }
+}
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/AcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/AcceptorDef.java
index 8277c1a040..1ccaf5fee0 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/AcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/AcceptorDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AcceptorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: AcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
@@ -12,167 +12,168 @@ import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Acceptor Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef()
  * @model abstract="true"
  * @generated
  */
-public interface AcceptorDef extends Def {
-	/**
-	 * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Buffer Provider</em>' reference.
-	 * @see #setBufferProvider(BufferPoolDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
-	 * @model
-	 * @generated
-	 */
-	BufferPoolDef getBufferProvider();
+public interface AcceptorDef extends Def
+{
+  /**
+   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Buffer Provider</em>' reference.
+   * @see #setBufferProvider(BufferPoolDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
+   * @model
+   * @generated
+   */
+  BufferPoolDef getBufferProvider();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Buffer Provider</em>' reference.
-	 * @see #getBufferProvider()
-	 * @generated
-	 */
-	void setBufferProvider(BufferPoolDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Buffer Provider</em>' reference.
+   * @see #getBufferProvider()
+   * @generated
+   */
+  void setBufferProvider(BufferPoolDef value);
 
-	/**
-	 * Returns the value of the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Executor Service</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Executor Service</em>' reference.
-	 * @see #setExecutorService(ThreadPoolDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ExecutorService()
-	 * @model
-	 * @generated
-	 */
-	ThreadPoolDef getExecutorService();
+  /**
+   * Returns the value of the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Executor Service</em>' reference.
+   * @see #setExecutorService(ThreadPoolDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ExecutorService()
+   * @model
+   * @generated
+   */
+  ThreadPoolDef getExecutorService();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService <em>Executor Service</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Executor Service</em>' reference.
-	 * @see #getExecutorService()
-	 * @generated
-	 */
-	void setExecutorService(ThreadPoolDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService <em>Executor Service</em>}
+   * ' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Executor Service</em>' reference.
+   * @see #getExecutorService()
+   * @generated
+   */
+  void setExecutorService(ThreadPoolDef value);
 
-	/**
-	 * Returns the value of the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Negotiator</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Negotiator</em>' reference.
-	 * @see #isSetNegotiator()
-	 * @see #unsetNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_Negotiator()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	NegotiatorDef getNegotiator();
+  /**
+   * Returns the value of the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Negotiator</em>' reference.
+   * @see #isSetNegotiator()
+   * @see #unsetNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_Negotiator()
+   * @model unsettable="true"
+   * @generated
+   */
+  NegotiatorDef getNegotiator();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Negotiator</em>' reference.
-	 * @see #isSetNegotiator()
-	 * @see #unsetNegotiator()
-	 * @see #getNegotiator()
-	 * @generated
-	 */
-	void setNegotiator(NegotiatorDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Negotiator</em>' reference.
+   * @see #isSetNegotiator()
+   * @see #unsetNegotiator()
+   * @see #getNegotiator()
+   * @generated
+   */
+  void setNegotiator(NegotiatorDef value);
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetNegotiator()
-	 * @see #getNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @generated
-	 */
-	void unsetNegotiator();
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetNegotiator()
+   * @see #getNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @generated
+   */
+  void unsetNegotiator();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Negotiator</em>' reference is set.
-	 * @see #unsetNegotiator()
-	 * @see #getNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @generated
-	 */
-	boolean isSetNegotiator();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}
+   * ' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Negotiator</em>' reference is set.
+   * @see #unsetNegotiator()
+   * @see #getNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @generated
+   */
+  boolean isSetNegotiator();
 
-	/**
-	 * Returns the value of the '<em><b>Server Protocol Provider</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Server Protocol Provider</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Server Protocol Provider</em>' reference list.
-	 * @see #isSetServerProtocolProvider()
-	 * @see #unsetServerProtocolProvider()
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ServerProtocolProvider()
-	 * @model unsettable="true" required="true"
-	 * @generated
-	 */
-	EList<ServerProtocolFactoryDef> getServerProtocolProvider();
+  /**
+   * Returns the value of the '<em><b>Server Protocol Provider</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Server Protocol Provider</em>' reference list isn't clear, there really should be more
+   * of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Server Protocol Provider</em>' reference list.
+   * @see #isSetServerProtocolProvider()
+   * @see #unsetServerProtocolProvider()
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ServerProtocolProvider()
+   * @model unsettable="true" required="true"
+   * @generated
+   */
+  EList<ServerProtocolFactoryDef> getServerProtocolProvider();
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetServerProtocolProvider()
-	 * @see #getServerProtocolProvider()
-	 * @generated
-	 */
-	void unsetServerProtocolProvider();
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider
+   * <em>Server Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetServerProtocolProvider()
+   * @see #getServerProtocolProvider()
+   * @generated
+   */
+  void unsetServerProtocolProvider();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Server Protocol Provider</em>' reference list is set.
-	 * @see #unsetServerProtocolProvider()
-	 * @see #getServerProtocolProvider()
-	 * @generated
-	 */
-	boolean isSetServerProtocolProvider();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider
+   * <em>Server Protocol Provider</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Server Protocol Provider</em>' reference list is set.
+   * @see #unsetServerProtocolProvider()
+   * @see #getServerProtocolProvider()
+   * @generated
+   */
+  boolean isSetServerProtocolProvider();
 
 } // AcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java
index 8d9c8629a0..37b3fd6f1b 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java
@@ -2,20 +2,17 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BufferPoolDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: BufferPoolDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Buffer Pool Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getBufferPoolDef()
  * @model
  * @generated
  */
-public interface BufferPoolDef extends BufferProviderDef {
+public interface BufferPoolDef extends BufferProviderDef
+{
 } // BufferPoolDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferProviderDef.java
index 1fc208d8ce..d9f0fb55e1 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferProviderDef.java
@@ -2,22 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BufferProviderDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: BufferProviderDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Buffer Provider Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Provider Def</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getBufferProviderDef()
  * @model abstract="true"
  * @generated
  */
-public interface BufferProviderDef extends Def {
+public interface BufferProviderDef extends Def
+{
 } // BufferProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ChallengeNegotiatorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ChallengeNegotiatorDef.java
index ddf22c8a81..07ed101643 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ChallengeNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ChallengeNegotiatorDef.java
@@ -2,80 +2,79 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ChallengeNegotiatorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ChallengeNegotiatorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Challenge Negotiator Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Challenge Negotiator Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef()
  * @model
  * @generated
  */
-public interface ChallengeNegotiatorDef extends NegotiatorDef {
+public interface ChallengeNegotiatorDef extends NegotiatorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>User Manager</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User Manager</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User Manager</em>' reference.
-	 * @see #setUserManager(UserManagerDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef_UserManager()
-	 * @model
-	 * @generated
-	 */
-	UserManagerDef getUserManager();
+  /**
+   * Returns the value of the '<em><b>User Manager</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>User Manager</em>' reference isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>User Manager</em>' reference.
+   * @see #setUserManager(UserManagerDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef_UserManager()
+   * @model
+   * @generated
+   */
+  UserManagerDef getUserManager();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User Manager</em>' reference.
-	 * @see #getUserManager()
-	 * @generated
-	 */
-	void setUserManager(UserManagerDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager
+   * <em>User Manager</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>User Manager</em>' reference.
+   * @see #getUserManager()
+   * @generated
+   */
+  void setUserManager(UserManagerDef value);
 
-	/**
-	 * Returns the value of the '<em><b>Randomizer</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Randomizer</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Randomizer</em>' reference.
-	 * @see #setRandomizer(RandomizerDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef_Randomizer()
-	 * @model
-	 * @generated
-	 */
-	RandomizerDef getRandomizer();
+  /**
+   * Returns the value of the '<em><b>Randomizer</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Randomizer</em>' reference isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Randomizer</em>' reference.
+   * @see #setRandomizer(RandomizerDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef_Randomizer()
+   * @model
+   * @generated
+   */
+  RandomizerDef getRandomizer();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Randomizer</em>' reference.
-	 * @see #getRandomizer()
-	 * @generated
-	 */
-	void setRandomizer(RandomizerDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}
+   * ' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Randomizer</em>' reference.
+   * @see #getRandomizer()
+   * @generated
+   */
+  void setRandomizer(RandomizerDef value);
 } // ChallengeNegotiatorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ClientProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ClientProtocolFactoryDef.java
index b87605e0b7..4a55359263 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ClientProtocolFactoryDef.java
@@ -2,20 +2,18 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ClientProtocolFactoryDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ClientProtocolFactoryDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Client Protocol Factory Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getClientProtocolFactoryDef()
  * @model abstract="true"
  * @generated
  */
-public interface ClientProtocolFactoryDef extends ProtocolProviderDef {
+public interface ClientProtocolFactoryDef extends ProtocolProviderDef
+{
 } // ClientProtocolFactoryDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ConnectorDef.java
index 37dc6fef6c..4bb0c1e386 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ConnectorDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConnectorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
@@ -12,221 +12,223 @@ import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connector Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Connector Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef()
  * @model abstract="true"
  * @generated
  */
-public interface ConnectorDef extends Def {
-	/**
-	 * Returns the value of the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User ID</em>' attribute.
-	 * @see #isSetUserID()
-	 * @see #unsetUserID()
-	 * @see #setUserID(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_UserID()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getUserID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User ID</em>' attribute.
-	 * @see #isSetUserID()
-	 * @see #unsetUserID()
-	 * @see #getUserID()
-	 * @generated
-	 */
-	void setUserID(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUserID()
-	 * @see #getUserID()
-	 * @see #setUserID(String)
-	 * @generated
-	 */
-	void unsetUserID();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>User ID</em>' attribute is set.
-	 * @see #unsetUserID()
-	 * @see #getUserID()
-	 * @see #setUserID(String)
-	 * @generated
-	 */
-	boolean isSetUserID();
-
-	/**
-	 * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Buffer Provider</em>' reference.
-	 * @see #setBufferProvider(BufferProviderDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_BufferProvider()
-	 * @model required="true"
-	 * @generated
-	 */
-	BufferProviderDef getBufferProvider();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Buffer Provider</em>' reference.
-	 * @see #getBufferProvider()
-	 * @generated
-	 */
-	void setBufferProvider(BufferProviderDef value);
-
-	/**
-	 * Returns the value of the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Executor Service</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Executor Service</em>' reference.
-	 * @see #setExecutorService(ExecutorServiceDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ExecutorService()
-	 * @model required="true"
-	 * @generated
-	 */
-	ExecutorServiceDef getExecutorService();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService <em>Executor Service</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Executor Service</em>' reference.
-	 * @see #getExecutorService()
-	 * @generated
-	 */
-	void setExecutorService(ExecutorServiceDef value);
-
-	/**
-	 * Returns the value of the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Negotiator</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Negotiator</em>' reference.
-	 * @see #isSetNegotiator()
-	 * @see #unsetNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_Negotiator()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	NegotiatorDef getNegotiator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Negotiator</em>' reference.
-	 * @see #isSetNegotiator()
-	 * @see #unsetNegotiator()
-	 * @see #getNegotiator()
-	 * @generated
-	 */
-	void setNegotiator(NegotiatorDef value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetNegotiator()
-	 * @see #getNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @generated
-	 */
-	void unsetNegotiator();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Negotiator</em>' reference is set.
-	 * @see #unsetNegotiator()
-	 * @see #getNegotiator()
-	 * @see #setNegotiator(NegotiatorDef)
-	 * @generated
-	 */
-	boolean isSetNegotiator();
-
-	/**
-	 * Returns the value of the '<em><b>Client Protocol Provider</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Client Protocol Provider</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Client Protocol Provider</em>' reference list.
-	 * @see #isSetClientProtocolProvider()
-	 * @see #unsetClientProtocolProvider()
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ClientProtocolProvider()
-	 * @model unsettable="true" required="true"
-	 * @generated
-	 */
-	EList<ClientProtocolFactoryDef> getClientProtocolProvider();
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetClientProtocolProvider()
-	 * @see #getClientProtocolProvider()
-	 * @generated
-	 */
-	void unsetClientProtocolProvider();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Client Protocol Provider</em>' reference list is set.
-	 * @see #unsetClientProtocolProvider()
-	 * @see #getClientProtocolProvider()
-	 * @generated
-	 */
-	boolean isSetClientProtocolProvider();
+public interface ConnectorDef extends Def
+{
+  /**
+   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>User ID</em>' attribute.
+   * @see #isSetUserID()
+   * @see #unsetUserID()
+   * @see #setUserID(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_UserID()
+   * @model unsettable="true"
+   * @generated
+   */
+  String getUserID();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>User ID</em>' attribute.
+   * @see #isSetUserID()
+   * @see #unsetUserID()
+   * @see #getUserID()
+   * @generated
+   */
+  void setUserID(String value);
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetUserID()
+   * @see #getUserID()
+   * @see #setUserID(String)
+   * @generated
+   */
+  void unsetUserID();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}'
+   * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>User ID</em>' attribute is set.
+   * @see #unsetUserID()
+   * @see #getUserID()
+   * @see #setUserID(String)
+   * @generated
+   */
+  boolean isSetUserID();
+
+  /**
+   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Buffer Provider</em>' reference.
+   * @see #setBufferProvider(BufferProviderDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_BufferProvider()
+   * @model required="true"
+   * @generated
+   */
+  BufferProviderDef getBufferProvider();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Buffer Provider</em>' reference.
+   * @see #getBufferProvider()
+   * @generated
+   */
+  void setBufferProvider(BufferProviderDef value);
+
+  /**
+   * Returns the value of the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Executor Service</em>' reference.
+   * @see #setExecutorService(ExecutorServiceDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ExecutorService()
+   * @model required="true"
+   * @generated
+   */
+  ExecutorServiceDef getExecutorService();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService
+   * <em>Executor Service</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Executor Service</em>' reference.
+   * @see #getExecutorService()
+   * @generated
+   */
+  void setExecutorService(ExecutorServiceDef value);
+
+  /**
+   * Returns the value of the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Negotiator</em>' reference.
+   * @see #isSetNegotiator()
+   * @see #unsetNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_Negotiator()
+   * @model unsettable="true"
+   * @generated
+   */
+  NegotiatorDef getNegotiator();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Negotiator</em>' reference.
+   * @see #isSetNegotiator()
+   * @see #unsetNegotiator()
+   * @see #getNegotiator()
+   * @generated
+   */
+  void setNegotiator(NegotiatorDef value);
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetNegotiator()
+   * @see #getNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @generated
+   */
+  void unsetNegotiator();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator
+   * <em>Negotiator</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Negotiator</em>' reference is set.
+   * @see #unsetNegotiator()
+   * @see #getNegotiator()
+   * @see #setNegotiator(NegotiatorDef)
+   * @generated
+   */
+  boolean isSetNegotiator();
+
+  /**
+   * Returns the value of the '<em><b>Client Protocol Provider</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Client Protocol Provider</em>' reference list isn't clear, there really should be more
+   * of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Client Protocol Provider</em>' reference list.
+   * @see #isSetClientProtocolProvider()
+   * @see #unsetClientProtocolProvider()
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ClientProtocolProvider()
+   * @model unsettable="true" required="true"
+   * @generated
+   */
+  EList<ClientProtocolFactoryDef> getClientProtocolProvider();
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider
+   * <em>Client Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetClientProtocolProvider()
+   * @see #getClientProtocolProvider()
+   * @generated
+   */
+  void unsetClientProtocolProvider();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider
+   * <em>Client Protocol Provider</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Client Protocol Provider</em>' reference list is set.
+   * @see #unsetClientProtocolProvider()
+   * @see #getClientProtocolProvider()
+   * @generated
+   */
+  boolean isSetClientProtocolProvider();
 
 } // ConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/CredentialsProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/CredentialsProviderDef.java
index 14fdf0e4d9..2aa61e8937 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/CredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/CredentialsProviderDef.java
@@ -2,53 +2,53 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CredentialsProviderDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: CredentialsProviderDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Credentials Provider Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Credentials Provider Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID <em>User ID</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getCredentialsProviderDef()
  * @model abstract="true"
  * @generated
  */
-public interface CredentialsProviderDef extends Def {
-	/**
-	 * Returns the value of the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User ID</em>' attribute.
-	 * @see #setUserID(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getCredentialsProviderDef_UserID()
-	 * @model
-	 * @generated
-	 */
-	String getUserID();
+public interface CredentialsProviderDef extends Def
+{
+  /**
+   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>User ID</em>' attribute.
+   * @see #setUserID(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getCredentialsProviderDef_UserID()
+   * @model
+   * @generated
+   */
+  String getUserID();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User ID</em>' attribute.
-	 * @see #getUserID()
-	 * @generated
-	 */
-	void setUserID(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID <em>User ID</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>User ID</em>' attribute.
+   * @see #getUserID()
+   * @generated
+   */
+  void setUserID(String value);
 
 } // CredentialsProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/HTTPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/HTTPConnectorDef.java
index 967b42117b..881d64a8e4 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/HTTPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/HTTPConnectorDef.java
@@ -2,52 +2,50 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HTTPConnectorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: HTTPConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>HTTP Connector Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>HTTP Connector Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getHTTPConnectorDef()
  * @model
  * @generated
  */
-public interface HTTPConnectorDef extends ConnectorDef {
+public interface HTTPConnectorDef extends ConnectorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>Url</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url</em>' attribute.
-	 * @see #setUrl(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getHTTPConnectorDef_Url()
-	 * @model
-	 * @generated
-	 */
-	String getUrl();
+  /**
+   * Returns the value of the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Url</em>' attribute.
+   * @see #setUrl(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getHTTPConnectorDef_Url()
+   * @model
+   * @generated
+   */
+  String getUrl();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Url</em>' attribute.
-	 * @see #getUrl()
-	 * @generated
-	 */
-	void setUrl(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Url</em>' attribute.
+   * @see #getUrl()
+   * @generated
+   */
+  void setUrl(String value);
 } // HTTPConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMAcceptorDef.java
index 5a73c1b6d6..3a5449906a 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMAcceptorDef.java
@@ -2,52 +2,50 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JVMAcceptorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: JVMAcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JVM Acceptor Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Acceptor Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMAcceptorDef()
  * @model
  * @generated
  */
-public interface JVMAcceptorDef extends AcceptorDef {
+public interface JVMAcceptorDef extends AcceptorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMAcceptorDef_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>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>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMAcceptorDef_Name()
+   * @model
+   * @generated
+   */
+  String getName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
 } // JVMAcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMConnectorDef.java
index 4de5b4e73c..a018982cac 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMConnectorDef.java
@@ -2,52 +2,50 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JVMConnectorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: JVMConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JVM Connector Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Connector Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMConnectorDef()
  * @model
  * @generated
  */
-public interface JVMConnectorDef extends ConnectorDef {
+public interface JVMConnectorDef extends ConnectorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMConnectorDef_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>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>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMConnectorDef_Name()
+   * @model
+   * @generated
+   */
+  String getName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
 } // JVMConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java
index 98e662502b..d47bd4f6ab 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java
@@ -2,21 +2,19 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NegotiatorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: NegotiatorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Negotiator Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Negotiator Def</b></em>'. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getNegotiatorDef()
  * @model abstract="true"
  * @generated
  */
-public interface NegotiatorDef extends Def {
+public interface NegotiatorDef extends Def
+{
 } // NegotiatorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsFactory.java
index 7ebff198ec..30df7c0384 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsFactory.java
@@ -2,153 +2,139 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: Net4jDefsFactory.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
+ * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage
  * @generated
  */
-public interface Net4jDefsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jDefsFactory eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>TCP Connector Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>TCP Connector Def</em>'.
-	 * @generated
-	 */
-	TCPConnectorDef createTCPConnectorDef();
-
-	/**
-	 * Returns a new object of class '<em>TCP Acceptor Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>TCP Acceptor Def</em>'.
-	 * @generated
-	 */
-	TCPAcceptorDef createTCPAcceptorDef();
-
-	/**
-	 * Returns a new object of class '<em>JVM Acceptor Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JVM Acceptor Def</em>'.
-	 * @generated
-	 */
-	JVMAcceptorDef createJVMAcceptorDef();
-
-	/**
-	 * Returns a new object of class '<em>JVM Connector Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JVM Connector Def</em>'.
-	 * @generated
-	 */
-	JVMConnectorDef createJVMConnectorDef();
-
-	/**
-	 * Returns a new object of class '<em>HTTP Connector Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>HTTP Connector Def</em>'.
-	 * @generated
-	 */
-	HTTPConnectorDef createHTTPConnectorDef();
-
-	/**
-	 * Returns a new object of class '<em>Response Negotiator Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Response Negotiator Def</em>'.
-	 * @generated
-	 */
-	ResponseNegotiatorDef createResponseNegotiatorDef();
-
-	/**
-	 * Returns a new object of class '<em>Challenge Negotiator Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Challenge Negotiator Def</em>'.
-	 * @generated
-	 */
-	ChallengeNegotiatorDef createChallengeNegotiatorDef();
-
-	/**
-	 * Returns a new object of class '<em>TCP Selector Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>TCP Selector Def</em>'.
-	 * @generated
-	 */
-	TCPSelectorDef createTCPSelectorDef();
-
-	/**
-	 * Returns a new object of class '<em>Buffer Pool Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Buffer Pool Def</em>'.
-	 * @generated
-	 */
-	BufferPoolDef createBufferPoolDef();
-
-	/**
-	 * Returns a new object of class '<em>Password Credentials Provider Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Password Credentials Provider Def</em>'.
-	 * @generated
-	 */
-	PasswordCredentialsProviderDef createPasswordCredentialsProviderDef();
-
-	/**
-	 * Returns a new object of class '<em>User Manager Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>User Manager Def</em>'.
-	 * @generated
-	 */
-	UserManagerDef createUserManagerDef();
-
-	/**
-	 * Returns a new object of class '<em>Randomizer Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Randomizer Def</em>'.
-	 * @generated
-	 */
-	RandomizerDef createRandomizerDef();
-
-	/**
-	 * Returns a new object of class '<em>User</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>User</em>'.
-	 * @generated
-	 */
-	User createUser();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	Net4jDefsPackage getNet4jDefsPackage();
-
-} //Net4jDefsFactory
+public interface Net4jDefsFactory extends EFactory
+{
+  /**
+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  Net4jDefsFactory eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsFactoryImpl.init();
+
+  /**
+   * Returns a new object of class '<em>TCP Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>TCP Connector Def</em>'.
+   * @generated
+   */
+  TCPConnectorDef createTCPConnectorDef();
+
+  /**
+   * Returns a new object of class '<em>TCP Acceptor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>TCP Acceptor Def</em>'.
+   * @generated
+   */
+  TCPAcceptorDef createTCPAcceptorDef();
+
+  /**
+   * Returns a new object of class '<em>JVM Acceptor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>JVM Acceptor Def</em>'.
+   * @generated
+   */
+  JVMAcceptorDef createJVMAcceptorDef();
+
+  /**
+   * Returns a new object of class '<em>JVM Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>JVM Connector Def</em>'.
+   * @generated
+   */
+  JVMConnectorDef createJVMConnectorDef();
+
+  /**
+   * Returns a new object of class '<em>HTTP Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>HTTP Connector Def</em>'.
+   * @generated
+   */
+  HTTPConnectorDef createHTTPConnectorDef();
+
+  /**
+   * Returns a new object of class '<em>Response Negotiator Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Response Negotiator Def</em>'.
+   * @generated
+   */
+  ResponseNegotiatorDef createResponseNegotiatorDef();
+
+  /**
+   * Returns a new object of class '<em>Challenge Negotiator Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Challenge Negotiator Def</em>'.
+   * @generated
+   */
+  ChallengeNegotiatorDef createChallengeNegotiatorDef();
+
+  /**
+   * Returns a new object of class '<em>TCP Selector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>TCP Selector Def</em>'.
+   * @generated
+   */
+  TCPSelectorDef createTCPSelectorDef();
+
+  /**
+   * Returns a new object of class '<em>Buffer Pool Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Buffer Pool Def</em>'.
+   * @generated
+   */
+  BufferPoolDef createBufferPoolDef();
+
+  /**
+   * Returns a new object of class '<em>Password Credentials Provider Def</em>'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return a new object of class '<em>Password Credentials Provider Def</em>'.
+   * @generated
+   */
+  PasswordCredentialsProviderDef createPasswordCredentialsProviderDef();
+
+  /**
+   * Returns a new object of class '<em>User Manager Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>User Manager Def</em>'.
+   * @generated
+   */
+  UserManagerDef createUserManagerDef();
+
+  /**
+   * Returns a new object of class '<em>Randomizer Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Randomizer Def</em>'.
+   * @generated
+   */
+  RandomizerDef createRandomizerDef();
+
+  /**
+   * Returns a new object of class '<em>User</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>User</em>'.
+   * @generated
+   */
+  User createUser();
+
+  /**
+   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the package supported by this factory.
+   * @generated
+   */
+  Net4jDefsPackage getNet4jDefsPackage();
+
+} // Net4jDefsFactory
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsPackage.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsPackage.java
index 7bf31a82a7..39c3d5f2d9 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsPackage.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsPackage.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: Net4jDefsPackage.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
@@ -14,1839 +14,1796 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsFactory
  * @model kind="package"
  * @generated
  */
-public interface Net4jDefsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "net4jdefs";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "net4jdefs";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jDefsPackage eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getConnectorDef()
-	 * @generated
-	 */
-	int CONNECTOR_DEF = 0;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Connector Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
-	 * @generated
-	 */
-	int CLIENT_PROTOCOL_FACTORY_DEF = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
-	 * @generated
-	 */
-	int TCP_CONNECTOR_DEF = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getAcceptorDef()
-	 * @generated
-	 */
-	int ACCEPTOR_DEF = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
-	 * @generated
-	 */
-	int TCP_ACCEPTOR_DEF = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
-	 * @generated
-	 */
-	int JVM_ACCEPTOR_DEF = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
-	 * @generated
-	 */
-	int JVM_CONNECTOR_DEF = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
-	 * @generated
-	 */
-	int HTTP_CONNECTOR_DEF = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getNegotiatorDef()
-	 * @generated
-	 */
-	int NEGOTIATOR_DEF = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl <em>Response Negotiator Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getResponseNegotiatorDef()
-	 * @generated
-	 */
-	int RESPONSE_NEGOTIATOR_DEF = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl <em>Challenge Negotiator Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getChallengeNegotiatorDef()
-	 * @generated
-	 */
-	int CHALLENGE_NEGOTIATOR_DEF = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
-	 * @generated
-	 */
-	int TCP_SELECTOR_DEF = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
-	 * @generated
-	 */
-	int SERVER_PROTOCOL_FACTORY_DEF = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
-	 * @generated
-	 */
-	int BUFFER_PROVIDER_DEF = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
-	 * @generated
-	 */
-	int BUFFER_POOL_DEF = 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
-	 * @generated
-	 */
-	int PROTOCOL_PROVIDER_DEF = 15;
-
-	/**
-	 * The number of structural features of the '<em>Protocol Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Client Protocol Factory Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-	/**
-	 * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Host</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__HOST = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF__PORT = CONNECTOR_DEF_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>TCP Connector Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACCEPTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACCEPTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACCEPTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Acceptor Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACCEPTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
-
-	/**
-	 * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Host</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__HOST = ACCEPTOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__PORT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = ACCEPTOR_DEF_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>TCP Acceptor Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
-
-	/**
-	 * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF__NAME = ACCEPTOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>JVM Acceptor Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-	/**
-	 * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF__NAME = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>JVM Connector Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JVM_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-	/**
-	 * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Executor Service</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-	/**
-	 * The feature id for the '<em><b>Negotiator</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-	/**
-	 * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Url</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF__URL = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>HTTP Connector Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Negotiator Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NEGOTIATOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Credentials Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Response Negotiator Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESPONSE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>User Manager</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Randomizer</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Challenge Negotiator Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHALLENGE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>TCP Selector Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TCP_SELECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Server Protocol Factory Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Buffer Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BUFFER_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Buffer Pool Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BUFFER_POOL_DEF_FEATURE_COUNT = BUFFER_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl <em>Credentials Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getCredentialsProviderDef()
-	 * @generated
-	 */
-	int CREDENTIALS_PROVIDER_DEF = 16;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREDENTIALS_PROVIDER_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Credentials Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl <em>Password Credentials Provider Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getPasswordCredentialsProviderDef()
-	 * @generated
-	 */
-	int PASSWORD_CREDENTIALS_PROVIDER_DEF = 17;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PASSWORD_CREDENTIALS_PROVIDER_DEF__USER_ID = CREDENTIALS_PROVIDER_DEF__USER_ID;
-
-	/**
-	 * The feature id for the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Password Credentials Provider Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PASSWORD_CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl <em>User Manager Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUserManagerDef()
-	 * @generated
-	 */
-	int USER_MANAGER_DEF = 19;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.UserImpl <em>User</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.UserImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUser()
-	 * @generated
-	 */
-	int USER = 18;
-
-	/**
-	 * The feature id for the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER__USER_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER__PASSWORD = 1;
-
-	/**
-	 * The number of structural features of the '<em>User</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>User</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_MANAGER_DEF__USER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>User Manager Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_MANAGER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl <em>Randomizer Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
-	 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getRandomizerDef()
-	 * @generated
-	 */
-	int RANDOMIZER_DEF = 20;
-
-	/**
-	 * The number of structural features of the '<em>Randomizer Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RANDOMIZER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ConnectorDef <em>Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Connector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef
-	 * @generated
-	 */
-	EClass getConnectorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID <em>User ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>User ID</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID()
-	 * @see #getConnectorDef()
-	 * @generated
-	 */
-	EAttribute getConnectorDef_UserID();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Buffer Provider</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider()
-	 * @see #getConnectorDef()
-	 * @generated
-	 */
-	EReference getConnectorDef_BufferProvider();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService <em>Executor Service</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Executor Service</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService()
-	 * @see #getConnectorDef()
-	 * @generated
-	 */
-	EReference getConnectorDef_ExecutorService();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator <em>Negotiator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Negotiator</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator()
-	 * @see #getConnectorDef()
-	 * @generated
-	 */
-	EReference getConnectorDef_Negotiator();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Client Protocol Provider</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider()
-	 * @see #getConnectorDef()
-	 * @generated
-	 */
-	EReference getConnectorDef_ClientProtocolProvider();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Client Protocol Factory Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
-	 * @generated
-	 */
-	EClass getClientProtocolFactoryDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef <em>TCP Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>TCP Connector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef
-	 * @generated
-	 */
-	EClass getTCPConnectorDef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef()
-	 * @see #getTCPConnectorDef()
-	 * @generated
-	 */
-	EReference getTCPConnectorDef_TcpSelectorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost <em>Host</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Host</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost()
-	 * @see #getTCPConnectorDef()
-	 * @generated
-	 */
-	EAttribute getTCPConnectorDef_Host();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort()
-	 * @see #getTCPConnectorDef()
-	 * @generated
-	 */
-	EAttribute getTCPConnectorDef_Port();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.AcceptorDef <em>Acceptor Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Acceptor Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.AcceptorDef
-	 * @generated
-	 */
-	EClass getAcceptorDef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Buffer Provider</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider()
-	 * @see #getAcceptorDef()
-	 * @generated
-	 */
-	EReference getAcceptorDef_BufferProvider();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService <em>Executor Service</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Executor Service</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService()
-	 * @see #getAcceptorDef()
-	 * @generated
-	 */
-	EReference getAcceptorDef_ExecutorService();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator <em>Negotiator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Negotiator</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator()
-	 * @see #getAcceptorDef()
-	 * @generated
-	 */
-	EReference getAcceptorDef_Negotiator();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Server Protocol Provider</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider()
-	 * @see #getAcceptorDef()
-	 * @generated
-	 */
-	EReference getAcceptorDef_ServerProtocolProvider();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>TCP Acceptor Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef
-	 * @generated
-	 */
-	EClass getTCPAcceptorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Host</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost()
-	 * @see #getTCPAcceptorDef()
-	 * @generated
-	 */
-	EAttribute getTCPAcceptorDef_Host();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort()
-	 * @see #getTCPAcceptorDef()
-	 * @generated
-	 */
-	EAttribute getTCPAcceptorDef_Port();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef()
-	 * @see #getTCPAcceptorDef()
-	 * @generated
-	 */
-	EReference getTCPAcceptorDef_TcpSelectorDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JVM Acceptor Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.JVMAcceptorDef
-	 * @generated
-	 */
-	EClass getJVMAcceptorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName()
-	 * @see #getJVMAcceptorDef()
-	 * @generated
-	 */
-	EAttribute getJVMAcceptorDef_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef <em>JVM Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JVM Connector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.JVMConnectorDef
-	 * @generated
-	 */
-	EClass getJVMConnectorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName()
-	 * @see #getJVMConnectorDef()
-	 * @generated
-	 */
-	EAttribute getJVMConnectorDef_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef <em>HTTP Connector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>HTTP Connector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.HTTPConnectorDef
-	 * @generated
-	 */
-	EClass getHTTPConnectorDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Url</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl()
-	 * @see #getHTTPConnectorDef()
-	 * @generated
-	 */
-	EAttribute getHTTPConnectorDef_Url();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.NegotiatorDef <em>Negotiator Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Negotiator Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.NegotiatorDef
-	 * @generated
-	 */
-	EClass getNegotiatorDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef <em>Response Negotiator Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Response Negotiator Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef
-	 * @generated
-	 */
-	EClass getResponseNegotiatorDef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Credentials Provider</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider()
-	 * @see #getResponseNegotiatorDef()
-	 * @generated
-	 */
-	EReference getResponseNegotiatorDef_CredentialsProvider();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef <em>Challenge Negotiator Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Challenge Negotiator Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef
-	 * @generated
-	 */
-	EClass getChallengeNegotiatorDef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>User Manager</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager()
-	 * @see #getChallengeNegotiatorDef()
-	 * @generated
-	 */
-	EReference getChallengeNegotiatorDef_UserManager();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Randomizer</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer()
-	 * @see #getChallengeNegotiatorDef()
-	 * @generated
-	 */
-	EReference getChallengeNegotiatorDef_Randomizer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPSelectorDef <em>TCP Selector Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>TCP Selector Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.TCPSelectorDef
-	 * @generated
-	 */
-	EClass getTCPSelectorDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef <em>Server Protocol Factory Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Server Protocol Factory Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef
-	 * @generated
-	 */
-	EClass getServerProtocolFactoryDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.BufferProviderDef <em>Buffer Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Buffer Provider Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.BufferProviderDef
-	 * @generated
-	 */
-	EClass getBufferProviderDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.BufferPoolDef <em>Buffer Pool Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Buffer Pool Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.BufferPoolDef
-	 * @generated
-	 */
-	EClass getBufferPoolDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Protocol Provider Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.ProtocolProviderDef
-	 * @generated
-	 */
-	EClass getProtocolProviderDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef <em>Credentials Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Credentials Provider Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.CredentialsProviderDef
-	 * @generated
-	 */
-	EClass getCredentialsProviderDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID <em>User ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>User ID</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID()
-	 * @see #getCredentialsProviderDef()
-	 * @generated
-	 */
-	EAttribute getCredentialsProviderDef_UserID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef <em>Password Credentials Provider Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Password Credentials Provider Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef
-	 * @generated
-	 */
-	EClass getPasswordCredentialsProviderDef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Password</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword()
-	 * @see #getPasswordCredentialsProviderDef()
-	 * @generated
-	 */
-	EAttribute getPasswordCredentialsProviderDef_Password();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.UserManagerDef <em>User Manager Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>User Manager Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.UserManagerDef
-	 * @generated
-	 */
-	EClass getUserManagerDef();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>User</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.UserManagerDef#getUser()
-	 * @see #getUserManagerDef()
-	 * @generated
-	 */
-	EReference getUserManagerDef_User();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.RandomizerDef <em>Randomizer Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Randomizer Def</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.RandomizerDef
-	 * @generated
-	 */
-	EClass getRandomizerDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.User <em>User</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>User</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.User
-	 * @generated
-	 */
-	EClass getUser();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>User ID</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.User#getUserID()
-	 * @see #getUser()
-	 * @generated
-	 */
-	EAttribute getUser_UserID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Password</em>'.
-	 * @see org.eclipse.net4j.net4jdefs.User#getPassword()
-	 * @see #getUser()
-	 * @generated
-	 */
-	EAttribute getUser_Password();
-
-	/**
-	 * 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
-	 */
-	Net4jDefsFactory getNet4jDefsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getConnectorDef()
-		 * @generated
-		 */
-		EClass CONNECTOR_DEF = eINSTANCE.getConnectorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTOR_DEF__USER_ID = eINSTANCE.getConnectorDef_UserID();
-
-		/**
-		 * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getConnectorDef_BufferProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getConnectorDef_ExecutorService();
-
-		/**
-		 * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR_DEF__NEGOTIATOR = eINSTANCE.getConnectorDef_Negotiator();
-
-		/**
-		 * The meta object literal for the '<em><b>Client Protocol Provider</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
-		 * @generated
-		 */
-		EClass CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getClientProtocolFactoryDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
-		 * @generated
-		 */
-		EClass TCP_CONNECTOR_DEF = eINSTANCE.getTCPConnectorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPConnectorDef_TcpSelectorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TCP_CONNECTOR_DEF__HOST = eINSTANCE.getTCPConnectorDef_Host();
-
-		/**
-		 * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TCP_CONNECTOR_DEF__PORT = eINSTANCE.getTCPConnectorDef_Port();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getAcceptorDef()
-		 * @generated
-		 */
-		EClass ACCEPTOR_DEF = eINSTANCE.getAcceptorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACCEPTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getAcceptorDef_BufferProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACCEPTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getAcceptorDef_ExecutorService();
-
-		/**
-		 * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACCEPTOR_DEF__NEGOTIATOR = eINSTANCE.getAcceptorDef_Negotiator();
-
-		/**
-		 * The meta object literal for the '<em><b>Server Protocol Provider</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
-		 * @generated
-		 */
-		EClass TCP_ACCEPTOR_DEF = eINSTANCE.getTCPAcceptorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TCP_ACCEPTOR_DEF__HOST = eINSTANCE.getTCPAcceptorDef_Host();
-
-		/**
-		 * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TCP_ACCEPTOR_DEF__PORT = eINSTANCE.getTCPAcceptorDef_Port();
-
-		/**
-		 * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPAcceptorDef_TcpSelectorDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
-		 * @generated
-		 */
-		EClass JVM_ACCEPTOR_DEF = eINSTANCE.getJVMAcceptorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JVM_ACCEPTOR_DEF__NAME = eINSTANCE.getJVMAcceptorDef_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
-		 * @generated
-		 */
-		EClass JVM_CONNECTOR_DEF = eINSTANCE.getJVMConnectorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JVM_CONNECTOR_DEF__NAME = eINSTANCE.getJVMConnectorDef_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
-		 * @generated
-		 */
-		EClass HTTP_CONNECTOR_DEF = eINSTANCE.getHTTPConnectorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HTTP_CONNECTOR_DEF__URL = eINSTANCE.getHTTPConnectorDef_Url();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getNegotiatorDef()
-		 * @generated
-		 */
-		EClass NEGOTIATOR_DEF = eINSTANCE.getNegotiatorDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl <em>Response Negotiator Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getResponseNegotiatorDef()
-		 * @generated
-		 */
-		EClass RESPONSE_NEGOTIATOR_DEF = eINSTANCE.getResponseNegotiatorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Credentials Provider</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = eINSTANCE.getResponseNegotiatorDef_CredentialsProvider();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl <em>Challenge Negotiator Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getChallengeNegotiatorDef()
-		 * @generated
-		 */
-		EClass CHALLENGE_NEGOTIATOR_DEF = eINSTANCE.getChallengeNegotiatorDef();
-
-		/**
-		 * The meta object literal for the '<em><b>User Manager</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = eINSTANCE.getChallengeNegotiatorDef_UserManager();
-
-		/**
-		 * The meta object literal for the '<em><b>Randomizer</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = eINSTANCE.getChallengeNegotiatorDef_Randomizer();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
-		 * @generated
-		 */
-		EClass TCP_SELECTOR_DEF = eINSTANCE.getTCPSelectorDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
-		 * @generated
-		 */
-		EClass SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getServerProtocolFactoryDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
-		 * @generated
-		 */
-		EClass BUFFER_PROVIDER_DEF = eINSTANCE.getBufferProviderDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
-		 * @generated
-		 */
-		EClass BUFFER_POOL_DEF = eINSTANCE.getBufferPoolDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
-		 * @generated
-		 */
-		EClass PROTOCOL_PROVIDER_DEF = eINSTANCE.getProtocolProviderDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl <em>Credentials Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getCredentialsProviderDef()
-		 * @generated
-		 */
-		EClass CREDENTIALS_PROVIDER_DEF = eINSTANCE.getCredentialsProviderDef();
-
-		/**
-		 * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CREDENTIALS_PROVIDER_DEF__USER_ID = eINSTANCE.getCredentialsProviderDef_UserID();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl <em>Password Credentials Provider Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getPasswordCredentialsProviderDef()
-		 * @generated
-		 */
-		EClass PASSWORD_CREDENTIALS_PROVIDER_DEF = eINSTANCE.getPasswordCredentialsProviderDef();
-
-		/**
-		 * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = eINSTANCE.getPasswordCredentialsProviderDef_Password();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl <em>User Manager Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUserManagerDef()
-		 * @generated
-		 */
-		EClass USER_MANAGER_DEF = eINSTANCE.getUserManagerDef();
-
-		/**
-		 * The meta object literal for the '<em><b>User</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USER_MANAGER_DEF__USER = eINSTANCE.getUserManagerDef_User();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl <em>Randomizer Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getRandomizerDef()
-		 * @generated
-		 */
-		EClass RANDOMIZER_DEF = eINSTANCE.getRandomizerDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.UserImpl <em>User</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.net4jdefs.impl.UserImpl
-		 * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUser()
-		 * @generated
-		 */
-		EClass USER = eINSTANCE.getUser();
-
-		/**
-		 * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER__USER_ID = eINSTANCE.getUser_UserID();
-
-		/**
-		 * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER__PASSWORD = eINSTANCE.getUser_Password();
-
-	}
-
-} //Net4jDefsPackage
+public interface Net4jDefsPackage extends EPackage
+{
+  /**
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNAME = "net4jdefs";
+
+  /**
+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0";
+
+  /**
+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNS_PREFIX = "net4jdefs";
+
+  /**
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  Net4jDefsPackage eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl <em>Connector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getConnectorDef()
+   * @generated
+   */
+  int CONNECTOR_DEF = 0;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
+
+  /**
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
+
+  /**
+   * The number of structural features of the '<em>Connector Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CONNECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
+   * <em>Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
+   * @generated
+   */
+  int CLIENT_PROTOCOL_FACTORY_DEF = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}
+   * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
+   * @generated
+   */
+  int TCP_CONNECTOR_DEF = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getAcceptorDef()
+   * @generated
+   */
+  int ACCEPTOR_DEF = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
+   * @generated
+   */
+  int TCP_ACCEPTOR_DEF = 4;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
+   * @generated
+   */
+  int JVM_ACCEPTOR_DEF = 5;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}
+   * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
+   * @generated
+   */
+  int JVM_CONNECTOR_DEF = 6;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
+   * <em>HTTP Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
+   * @generated
+   */
+  int HTTP_CONNECTOR_DEF = 7;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getNegotiatorDef()
+   * @generated
+   */
+  int NEGOTIATOR_DEF = 8;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
+   * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getResponseNegotiatorDef()
+   * @generated
+   */
+  int RESPONSE_NEGOTIATOR_DEF = 9;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
+   * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getChallengeNegotiatorDef()
+   * @generated
+   */
+  int CHALLENGE_NEGOTIATOR_DEF = 10;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
+   * @generated
+   */
+  int TCP_SELECTOR_DEF = 11;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
+   * <em>Server Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
+   * @generated
+   */
+  int SERVER_PROTOCOL_FACTORY_DEF = 12;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
+   * <em>Buffer Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
+   * @generated
+   */
+  int BUFFER_PROVIDER_DEF = 13;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
+   * @generated
+   */
+  int BUFFER_POOL_DEF = 14;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
+   * <em>Protocol Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
+   * @generated
+   */
+  int PROTOCOL_PROVIDER_DEF = 15;
+
+  /**
+   * The number of structural features of the '<em>Protocol Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
+
+  /**
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = CONNECTOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__HOST = CONNECTOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF__PORT = CONNECTOR_DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The number of structural features of the '<em>TCP Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 3;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ACCEPTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ACCEPTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ACCEPTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
+
+  /**
+   * The number of structural features of the '<em>Acceptor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ACCEPTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
+
+  /**
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__HOST = ACCEPTOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__PORT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = ACCEPTOR_DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The number of structural features of the '<em>TCP Acceptor Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 3;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
+
+  /**
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF__NAME = ACCEPTOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>JVM Acceptor Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
+
+  /**
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF__NAME = CONNECTOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>JVM Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JVM_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
+
+  /**
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
+
+  /**
+   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
+
+  /**
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
+
+  /**
+   * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF__URL = CONNECTOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>HTTP Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int HTTP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Negotiator Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int NEGOTIATOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Credentials Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Response Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RESPONSE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User Manager</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Randomizer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Challenge Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The number of structural features of the '<em>TCP Selector Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int TCP_SELECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Server Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Buffer Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int BUFFER_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Buffer Pool Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int BUFFER_POOL_DEF_FEATURE_COUNT = BUFFER_PROVIDER_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
+   * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getCredentialsProviderDef()
+   * @generated
+   */
+  int CREDENTIALS_PROVIDER_DEF = 16;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CREDENTIALS_PROVIDER_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Credentials Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
+   * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getPasswordCredentialsProviderDef()
+   * @generated
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF = 17;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF__USER_ID = CREDENTIALS_PROVIDER_DEF__USER_ID;
+
+  /**
+   * The feature id for the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Password Credentials Provider Def</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl <em>User Manager Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUserManagerDef()
+   * @generated
+   */
+  int USER_MANAGER_DEF = 19;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.UserImpl <em>User</em>}' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.UserImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUser()
+   * @generated
+   */
+  int USER = 18;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER__USER_ID = 0;
+
+  /**
+   * The feature id for the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER__PASSWORD = 1;
+
+  /**
+   * The number of structural features of the '<em>User</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER_FEATURE_COUNT = 2;
+
+  /**
+   * The feature id for the '<em><b>User</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER_MANAGER_DEF__USER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>User Manager Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER_MANAGER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl <em>Randomizer Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
+   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getRandomizerDef()
+   * @generated
+   */
+  int RANDOMIZER_DEF = 20;
+
+  /**
+   * The number of structural features of the '<em>Randomizer Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RANDOMIZER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ConnectorDef <em>Connector Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Connector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef
+   * @generated
+   */
+  EClass getConnectorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID
+   * <em>User ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>User ID</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getUserID()
+   * @see #getConnectorDef()
+   * @generated
+   */
+  EAttribute getConnectorDef_UserID();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider
+   * <em>Buffer Provider</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Buffer Provider</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider()
+   * @see #getConnectorDef()
+   * @generated
+   */
+  EReference getConnectorDef_BufferProvider();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService
+   * <em>Executor Service</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Executor Service</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService()
+   * @see #getConnectorDef()
+   * @generated
+   */
+  EReference getConnectorDef_ExecutorService();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator
+   * <em>Negotiator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Negotiator</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator()
+   * @see #getConnectorDef()
+   * @generated
+   */
+  EReference getConnectorDef_Negotiator();
+
+  /**
+   * Returns the meta object for the reference list '
+   * {@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference list '<em>Client Protocol Provider</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider()
+   * @see #getConnectorDef()
+   * @generated
+   */
+  EReference getConnectorDef_ClientProtocolProvider();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Client Protocol Factory Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * @generated
+   */
+  EClass getClientProtocolFactoryDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef <em>TCP Connector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>TCP Connector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef
+   * @generated
+   */
+  EClass getTCPConnectorDef();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef
+   * <em>Tcp Selector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef()
+   * @see #getTCPConnectorDef()
+   * @generated
+   */
+  EReference getTCPConnectorDef_TcpSelectorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost
+   * <em>Host</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Host</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost()
+   * @see #getTCPConnectorDef()
+   * @generated
+   */
+  EAttribute getTCPConnectorDef_Host();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort
+   * <em>Port</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Port</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort()
+   * @see #getTCPConnectorDef()
+   * @generated
+   */
+  EAttribute getTCPConnectorDef_Port();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.AcceptorDef <em>Acceptor Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Acceptor Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.AcceptorDef
+   * @generated
+   */
+  EClass getAcceptorDef();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider
+   * <em>Buffer Provider</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Buffer Provider</em>'.
+   * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider()
+   * @see #getAcceptorDef()
+   * @generated
+   */
+  EReference getAcceptorDef_BufferProvider();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService
+   * <em>Executor Service</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Executor Service</em>'.
+   * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService()
+   * @see #getAcceptorDef()
+   * @generated
+   */
+  EReference getAcceptorDef_ExecutorService();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator
+   * <em>Negotiator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Negotiator</em>'.
+   * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator()
+   * @see #getAcceptorDef()
+   * @generated
+   */
+  EReference getAcceptorDef_Negotiator();
+
+  /**
+   * Returns the meta object for the reference list '
+   * {@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference list '<em>Server Protocol Provider</em>'.
+   * @see org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider()
+   * @see #getAcceptorDef()
+   * @generated
+   */
+  EReference getAcceptorDef_ServerProtocolProvider();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>TCP Acceptor Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef
+   * @generated
+   */
+  EClass getTCPAcceptorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Host</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost()
+   * @see #getTCPAcceptorDef()
+   * @generated
+   */
+  EAttribute getTCPAcceptorDef_Host();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Port</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort()
+   * @see #getTCPAcceptorDef()
+   * @generated
+   */
+  EAttribute getTCPAcceptorDef_Port();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef
+   * <em>Tcp Selector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef()
+   * @see #getTCPAcceptorDef()
+   * @generated
+   */
+  EReference getTCPAcceptorDef_TcpSelectorDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>JVM Acceptor Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.JVMAcceptorDef
+   * @generated
+   */
+  EClass getJVMAcceptorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName()
+   * @see #getJVMAcceptorDef()
+   * @generated
+   */
+  EAttribute getJVMAcceptorDef_Name();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef <em>JVM Connector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>JVM Connector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.JVMConnectorDef
+   * @generated
+   */
+  EClass getJVMConnectorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName
+   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName()
+   * @see #getJVMConnectorDef()
+   * @generated
+   */
+  EAttribute getJVMConnectorDef_Name();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef <em>HTTP Connector Def</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>HTTP Connector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.HTTPConnectorDef
+   * @generated
+   */
+  EClass getHTTPConnectorDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Url</em>'.
+   * @see org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl()
+   * @see #getHTTPConnectorDef()
+   * @generated
+   */
+  EAttribute getHTTPConnectorDef_Url();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.NegotiatorDef <em>Negotiator Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Negotiator Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.NegotiatorDef
+   * @generated
+   */
+  EClass getNegotiatorDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef
+   * <em>Response Negotiator Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Response Negotiator Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef
+   * @generated
+   */
+  EClass getResponseNegotiatorDef();
+
+  /**
+   * Returns the meta object for the reference '
+   * {@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Credentials Provider</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider()
+   * @see #getResponseNegotiatorDef()
+   * @generated
+   */
+  EReference getResponseNegotiatorDef_CredentialsProvider();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef
+   * <em>Challenge Negotiator Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Challenge Negotiator Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef
+   * @generated
+   */
+  EClass getChallengeNegotiatorDef();
+
+  /**
+   * Returns the meta object for the reference '
+   * {@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>User Manager</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getUserManager()
+   * @see #getChallengeNegotiatorDef()
+   * @generated
+   */
+  EReference getChallengeNegotiatorDef_UserManager();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer
+   * <em>Randomizer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Randomizer</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef#getRandomizer()
+   * @see #getChallengeNegotiatorDef()
+   * @generated
+   */
+  EReference getChallengeNegotiatorDef_Randomizer();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.TCPSelectorDef <em>TCP Selector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>TCP Selector Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.TCPSelectorDef
+   * @generated
+   */
+  EClass getTCPSelectorDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef
+   * <em>Server Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Server Protocol Factory Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef
+   * @generated
+   */
+  EClass getServerProtocolFactoryDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.BufferProviderDef
+   * <em>Buffer Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Buffer Provider Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.BufferProviderDef
+   * @generated
+   */
+  EClass getBufferProviderDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.BufferPoolDef <em>Buffer Pool Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Buffer Pool Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.BufferPoolDef
+   * @generated
+   */
+  EClass getBufferPoolDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Protocol Provider Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * @generated
+   */
+  EClass getProtocolProviderDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef
+   * <em>Credentials Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Credentials Provider Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.CredentialsProviderDef
+   * @generated
+   */
+  EClass getCredentialsProviderDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID
+   * <em>User ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>User ID</em>'.
+   * @see org.eclipse.net4j.net4jdefs.CredentialsProviderDef#getUserID()
+   * @see #getCredentialsProviderDef()
+   * @generated
+   */
+  EAttribute getCredentialsProviderDef_UserID();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef
+   * <em>Password Credentials Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Password Credentials Provider Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef
+   * @generated
+   */
+  EClass getPasswordCredentialsProviderDef();
+
+  /**
+   * Returns the meta object for the attribute '
+   * {@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Password</em>'.
+   * @see org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword()
+   * @see #getPasswordCredentialsProviderDef()
+   * @generated
+   */
+  EAttribute getPasswordCredentialsProviderDef_Password();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.UserManagerDef <em>User Manager Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>User Manager Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.UserManagerDef
+   * @generated
+   */
+  EClass getUserManagerDef();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser
+   * <em>User</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference list '<em>User</em>'.
+   * @see org.eclipse.net4j.net4jdefs.UserManagerDef#getUser()
+   * @see #getUserManagerDef()
+   * @generated
+   */
+  EReference getUserManagerDef_User();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.RandomizerDef <em>Randomizer Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Randomizer Def</em>'.
+   * @see org.eclipse.net4j.net4jdefs.RandomizerDef
+   * @generated
+   */
+  EClass getRandomizerDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.User <em>User</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>User</em>'.
+   * @see org.eclipse.net4j.net4jdefs.User
+   * @generated
+   */
+  EClass getUser();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>User ID</em>'.
+   * @see org.eclipse.net4j.net4jdefs.User#getUserID()
+   * @see #getUser()
+   * @generated
+   */
+  EAttribute getUser_UserID();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Password</em>'.
+   * @see org.eclipse.net4j.net4jdefs.User#getPassword()
+   * @see #getUser()
+   * @generated
+   */
+  EAttribute getUser_Password();
+
+  /**
+   * 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
+   */
+  Net4jDefsFactory getNet4jDefsFactory();
+
+  /**
+   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+   * <ul>
+   * <li>each class,</li>
+   * <li>each feature of each class,</li>
+   * <li>each enum,</li>
+   * <li>and each data type</li>
+   * </ul>
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  interface Literals
+  {
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl <em>Connector Def</em>}
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getConnectorDef()
+     * @generated
+     */
+    EClass CONNECTOR_DEF = eINSTANCE.getConnectorDef();
+
+    /**
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute CONNECTOR_DEF__USER_ID = eINSTANCE.getConnectorDef_UserID();
+
+    /**
+     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CONNECTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getConnectorDef_BufferProvider();
+
+    /**
+     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CONNECTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getConnectorDef_ExecutorService();
+
+    /**
+     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CONNECTOR_DEF__NEGOTIATOR = eINSTANCE.getConnectorDef_Negotiator();
+
+    /**
+     * The meta object literal for the '<em><b>Client Protocol Provider</b></em>' reference list feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
+     * <em>Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
+     * @generated
+     */
+    EClass CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getClientProtocolFactoryDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
+     * <em>TCP Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
+     * @generated
+     */
+    EClass TCP_CONNECTOR_DEF = eINSTANCE.getTCPConnectorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPConnectorDef_TcpSelectorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Host</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute TCP_CONNECTOR_DEF__HOST = eINSTANCE.getTCPConnectorDef_Host();
+
+    /**
+     * The meta object literal for the '<em><b>Port</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute TCP_CONNECTOR_DEF__PORT = eINSTANCE.getTCPConnectorDef_Port();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl <em>Acceptor Def</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getAcceptorDef()
+     * @generated
+     */
+    EClass ACCEPTOR_DEF = eINSTANCE.getAcceptorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference ACCEPTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getAcceptorDef_BufferProvider();
+
+    /**
+     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference ACCEPTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getAcceptorDef_ExecutorService();
+
+    /**
+     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference ACCEPTOR_DEF__NEGOTIATOR = eINSTANCE.getAcceptorDef_Negotiator();
+
+    /**
+     * The meta object literal for the '<em><b>Server Protocol Provider</b></em>' reference list feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl
+     * <em>TCP Acceptor Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
+     * @generated
+     */
+    EClass TCP_ACCEPTOR_DEF = eINSTANCE.getTCPAcceptorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Host</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute TCP_ACCEPTOR_DEF__HOST = eINSTANCE.getTCPAcceptorDef_Host();
+
+    /**
+     * The meta object literal for the '<em><b>Port</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute TCP_ACCEPTOR_DEF__PORT = eINSTANCE.getTCPAcceptorDef_Port();
+
+    /**
+     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPAcceptorDef_TcpSelectorDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl
+     * <em>JVM Acceptor Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
+     * @generated
+     */
+    EClass JVM_ACCEPTOR_DEF = eINSTANCE.getJVMAcceptorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute JVM_ACCEPTOR_DEF__NAME = eINSTANCE.getJVMAcceptorDef_Name();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
+     * <em>JVM Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
+     * @generated
+     */
+    EClass JVM_CONNECTOR_DEF = eINSTANCE.getJVMConnectorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute JVM_CONNECTOR_DEF__NAME = eINSTANCE.getJVMConnectorDef_Name();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
+     * <em>HTTP Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
+     * @generated
+     */
+    EClass HTTP_CONNECTOR_DEF = eINSTANCE.getHTTPConnectorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Url</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute HTTP_CONNECTOR_DEF__URL = eINSTANCE.getHTTPConnectorDef_Url();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl
+     * <em>Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.NegotiatorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getNegotiatorDef()
+     * @generated
+     */
+    EClass NEGOTIATOR_DEF = eINSTANCE.getNegotiatorDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
+     * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getResponseNegotiatorDef()
+     * @generated
+     */
+    EClass RESPONSE_NEGOTIATOR_DEF = eINSTANCE.getResponseNegotiatorDef();
+
+    /**
+     * The meta object literal for the '<em><b>Credentials Provider</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = eINSTANCE.getResponseNegotiatorDef_CredentialsProvider();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
+     * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getChallengeNegotiatorDef()
+     * @generated
+     */
+    EClass CHALLENGE_NEGOTIATOR_DEF = eINSTANCE.getChallengeNegotiatorDef();
+
+    /**
+     * The meta object literal for the '<em><b>User Manager</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = eINSTANCE.getChallengeNegotiatorDef_UserManager();
+
+    /**
+     * The meta object literal for the '<em><b>Randomizer</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = eINSTANCE.getChallengeNegotiatorDef_Randomizer();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl
+     * <em>TCP Selector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.TCPSelectorDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
+     * @generated
+     */
+    EClass TCP_SELECTOR_DEF = eINSTANCE.getTCPSelectorDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
+     * <em>Server Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
+     * @generated
+     */
+    EClass SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getServerProtocolFactoryDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
+     * <em>Buffer Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
+     * @generated
+     */
+    EClass BUFFER_PROVIDER_DEF = eINSTANCE.getBufferProviderDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl
+     * <em>Buffer Pool Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.BufferPoolDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
+     * @generated
+     */
+    EClass BUFFER_POOL_DEF = eINSTANCE.getBufferPoolDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
+     * <em>Protocol Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
+     * @generated
+     */
+    EClass PROTOCOL_PROVIDER_DEF = eINSTANCE.getProtocolProviderDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
+     * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getCredentialsProviderDef()
+     * @generated
+     */
+    EClass CREDENTIALS_PROVIDER_DEF = eINSTANCE.getCredentialsProviderDef();
+
+    /**
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute CREDENTIALS_PROVIDER_DEF__USER_ID = eINSTANCE.getCredentialsProviderDef_UserID();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
+     * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getPasswordCredentialsProviderDef()
+     * @generated
+     */
+    EClass PASSWORD_CREDENTIALS_PROVIDER_DEF = eINSTANCE.getPasswordCredentialsProviderDef();
+
+    /**
+     * The meta object literal for the '<em><b>Password</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = eINSTANCE.getPasswordCredentialsProviderDef_Password();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl
+     * <em>User Manager Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUserManagerDef()
+     * @generated
+     */
+    EClass USER_MANAGER_DEF = eINSTANCE.getUserManagerDef();
+
+    /**
+     * The meta object literal for the '<em><b>User</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference USER_MANAGER_DEF__USER = eINSTANCE.getUserManagerDef_User();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
+     * <em>Randomizer Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getRandomizerDef()
+     * @generated
+     */
+    EClass RANDOMIZER_DEF = eINSTANCE.getRandomizerDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.UserImpl <em>User</em>}' class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.net4jdefs.impl.UserImpl
+     * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getUser()
+     * @generated
+     */
+    EClass USER = eINSTANCE.getUser();
+
+    /**
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute USER__USER_ID = eINSTANCE.getUser_UserID();
+
+    /**
+     * The meta object literal for the '<em><b>Password</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute USER__PASSWORD = eINSTANCE.getUser_Password();
+
+  }
+
+} // Net4jDefsPackage
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/PasswordCredentialsProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/PasswordCredentialsProviderDef.java
index 847867775c..92b33e3eea 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/PasswordCredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/PasswordCredentialsProviderDef.java
@@ -2,52 +2,51 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PasswordCredentialsProviderDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: PasswordCredentialsProviderDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Password Credentials Provider Def</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Password Credentials Provider Def</b></em>'.
  * <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getPasswordCredentialsProviderDef()
  * @model
  * @generated
  */
-public interface PasswordCredentialsProviderDef extends CredentialsProviderDef {
-	/**
-	 * Returns the value of the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Password</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Password</em>' attribute.
-	 * @see #setPassword(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getPasswordCredentialsProviderDef_Password()
-	 * @model
-	 * @generated
-	 */
-	String getPassword();
+public interface PasswordCredentialsProviderDef extends CredentialsProviderDef
+{
+  /**
+   * Returns the value of the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Password</em>' attribute.
+   * @see #setPassword(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getPasswordCredentialsProviderDef_Password()
+   * @model
+   * @generated
+   */
+  String getPassword();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Password</em>' attribute.
-	 * @see #getPassword()
-	 * @generated
-	 */
-	void setPassword(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef#getPassword
+   * <em>Password</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Password</em>' attribute.
+   * @see #getPassword()
+   * @generated
+   */
+  void setPassword(String value);
 
 } // PasswordCredentialsProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ProtocolProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ProtocolProviderDef.java
index 5265323637..77e07ecd15 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ProtocolProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ProtocolProviderDef.java
@@ -2,22 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProtocolProviderDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ProtocolProviderDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Protocol Provider Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getProtocolProviderDef()
  * @model abstract="true"
  * @generated
  */
-public interface ProtocolProviderDef extends Def {
+public interface ProtocolProviderDef extends Def
+{
 } // ProtocolProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/RandomizerDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/RandomizerDef.java
index c2d6c9118f..48ac17b58c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/RandomizerDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/RandomizerDef.java
@@ -2,21 +2,19 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RandomizerDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: RandomizerDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Randomizer Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Randomizer Def</b></em>'. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getRandomizerDef()
  * @model
  * @generated
  */
-public interface RandomizerDef extends Def {
+public interface RandomizerDef extends Def
+{
 } // RandomizerDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ResponseNegotiatorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ResponseNegotiatorDef.java
index f4a5d4440c..d397687a92 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ResponseNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ResponseNegotiatorDef.java
@@ -2,52 +2,51 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ResponseNegotiatorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ResponseNegotiatorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Response Negotiator Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Response Negotiator Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getResponseNegotiatorDef()
  * @model
  * @generated
  */
-public interface ResponseNegotiatorDef extends NegotiatorDef {
+public interface ResponseNegotiatorDef extends NegotiatorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>Credentials Provider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Credentials Provider</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Credentials Provider</em>' reference.
-	 * @see #setCredentialsProvider(CredentialsProviderDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getResponseNegotiatorDef_CredentialsProvider()
-	 * @model
-	 * @generated
-	 */
-	CredentialsProviderDef getCredentialsProvider();
+  /**
+   * Returns the value of the '<em><b>Credentials Provider</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Credentials Provider</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Credentials Provider</em>' reference.
+   * @see #setCredentialsProvider(CredentialsProviderDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getResponseNegotiatorDef_CredentialsProvider()
+   * @model
+   * @generated
+   */
+  CredentialsProviderDef getCredentialsProvider();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Credentials Provider</em>' reference.
-	 * @see #getCredentialsProvider()
-	 * @generated
-	 */
-	void setCredentialsProvider(CredentialsProviderDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef#getCredentialsProvider
+   * <em>Credentials Provider</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Credentials Provider</em>' reference.
+   * @see #getCredentialsProvider()
+   * @generated
+   */
+  void setCredentialsProvider(CredentialsProviderDef value);
 } // ResponseNegotiatorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerConnector.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerConnector.java
index f579b7366b..60aa39c30b 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerConnector.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerConnector.java
@@ -2,52 +2,51 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ServerConnector.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ServerConnector.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Server Connector</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Server Connector</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.ServerConnector#getAcceptorDef <em>Acceptor Def</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.ServerConnector#getAcceptorDef <em>Acceptor Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jdefsPackage#getServerConnector()
  * @model abstract="true"
  * @generated
  */
-public interface ServerConnector extends ConnectorDef {
-	/**
-	 * Returns the value of the '<em><b>Acceptor Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Acceptor 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>Acceptor Def</em>' reference.
-	 * @see #setAcceptorDef(AcceptorDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jdefsPackage#getServerConnector_AcceptorDef()
-	 * @model
-	 * @generated
-	 */
-	AcceptorDef getAcceptorDef();
+public interface ServerConnector extends ConnectorDef
+{
+  /**
+   * Returns the value of the '<em><b>Acceptor Def</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Acceptor 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>Acceptor Def</em>' reference.
+   * @see #setAcceptorDef(AcceptorDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jdefsPackage#getServerConnector_AcceptorDef()
+   * @model
+   * @generated
+   */
+  AcceptorDef getAcceptorDef();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ServerConnector#getAcceptorDef <em>Acceptor Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Acceptor Def</em>' reference.
-	 * @see #getAcceptorDef()
-	 * @generated
-	 */
-	void setAcceptorDef(AcceptorDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.ServerConnector#getAcceptorDef <em>Acceptor Def</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Acceptor Def</em>' reference.
+   * @see #getAcceptorDef()
+   * @generated
+   */
+  void setAcceptorDef(AcceptorDef value);
 
 } // ServerConnector
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerProtocolFactoryDef.java
index d11fac3505..758ba80770 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerProtocolFactoryDef.java
@@ -2,20 +2,18 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ServerProtocolFactoryDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: ServerProtocolFactoryDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Server Protocol Factory Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Server Protocol Factory Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getServerProtocolFactoryDef()
  * @model abstract="true"
  * @generated
  */
-public interface ServerProtocolFactoryDef extends ProtocolProviderDef {
+public interface ServerProtocolFactoryDef extends ProtocolProviderDef
+{
 } // ServerProtocolFactoryDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/SeverProtocolFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/SeverProtocolFactory.java
index cb3c739159..cd060b3c03 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/SeverProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/SeverProtocolFactory.java
@@ -2,21 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SeverProtocolFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: SeverProtocolFactory.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sever Protocol Factory</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Sever Protocol Factory</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jdefsPackage#getSeverProtocolFactory()
  * @model
  * @generated
  */
-public interface SeverProtocolFactory extends Def {
+public interface SeverProtocolFactory extends Def
+{
 } // SeverProtocolFactory
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPAcceptorDef.java
index fcb5985d89..6215807aed 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPAcceptorDef.java
@@ -2,106 +2,105 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPAcceptorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: TCPAcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCP Acceptor Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef()
  * @model
  * @generated
  */
-public interface TCPAcceptorDef extends AcceptorDef {
+public interface TCPAcceptorDef extends AcceptorDef
+{
 
-	/**
-	 * Returns the value of the '<em><b>Host</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Host</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Host</em>' attribute.
-	 * @see #setHost(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Host()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getHost();
+  /**
+   * Returns the value of the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Host</em>' attribute.
+   * @see #setHost(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Host()
+   * @model required="true"
+   * @generated
+   */
+  String getHost();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Host</em>' attribute.
-	 * @see #getHost()
-	 * @generated
-	 */
-	void setHost(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getHost <em>Host</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Host</em>' attribute.
+   * @see #getHost()
+   * @generated
+   */
+  void setHost(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Port</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port</em>' attribute.
-	 * @see #setPort(int)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Port()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getPort();
+  /**
+   * Returns the value of the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Port</em>' attribute.
+   * @see #setPort(int)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Port()
+   * @model required="true"
+   * @generated
+   */
+  int getPort();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port</em>' attribute.
-	 * @see #getPort()
-	 * @generated
-	 */
-	void setPort(int value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getPort <em>Port</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Port</em>' attribute.
+   * @see #getPort()
+   * @generated
+   */
+  void setPort(int value);
 
-	/**
-	 * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tcp Selector 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>Tcp Selector Def</em>' reference.
-	 * @see #setTcpSelectorDef(TCPSelectorDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_TcpSelectorDef()
-	 * @model required="true"
-	 * @generated
-	 */
-	TCPSelectorDef getTcpSelectorDef();
+  /**
+   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Tcp Selector 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>Tcp Selector Def</em>' reference.
+   * @see #setTcpSelectorDef(TCPSelectorDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_TcpSelectorDef()
+   * @model required="true"
+   * @generated
+   */
+  TCPSelectorDef getTcpSelectorDef();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
-	 * @see #getTcpSelectorDef()
-	 * @generated
-	 */
-	void setTcpSelectorDef(TCPSelectorDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef
+   * <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Tcp Selector Def</em>' reference.
+   * @see #getTcpSelectorDef()
+   * @generated
+   */
+  void setTcpSelectorDef(TCPSelectorDef value);
 } // TCPAcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPConnectorDef.java
index 50b0d74b56..c64c2be5f9 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPConnectorDef.java
@@ -2,133 +2,132 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPConnectorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: TCPConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCP Connector Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Connector Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost <em>Host</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost <em>Host</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef()
  * @model
  * @generated
  */
-public interface TCPConnectorDef extends ConnectorDef {
-	/**
-	 * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tcp Selector 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>Tcp Selector Def</em>' reference.
-	 * @see #setTcpSelectorDef(TCPSelectorDef)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_TcpSelectorDef()
-	 * @model
-	 * @generated
-	 */
-	TCPSelectorDef getTcpSelectorDef();
+public interface TCPConnectorDef extends ConnectorDef
+{
+  /**
+   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Tcp Selector 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>Tcp Selector Def</em>' reference.
+   * @see #setTcpSelectorDef(TCPSelectorDef)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_TcpSelectorDef()
+   * @model
+   * @generated
+   */
+  TCPSelectorDef getTcpSelectorDef();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
-	 * @see #getTcpSelectorDef()
-	 * @generated
-	 */
-	void setTcpSelectorDef(TCPSelectorDef value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef
+   * <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Tcp Selector Def</em>' reference.
+   * @see #getTcpSelectorDef()
+   * @generated
+   */
+  void setTcpSelectorDef(TCPSelectorDef value);
 
-	/**
-	 * Returns the value of the '<em><b>Host</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Host</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Host</em>' attribute.
-	 * @see #setHost(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Host()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getHost();
+  /**
+   * Returns the value of the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Host</em>' attribute.
+   * @see #setHost(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Host()
+   * @model required="true"
+   * @generated
+   */
+  String getHost();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Host</em>' attribute.
-	 * @see #getHost()
-	 * @generated
-	 */
-	void setHost(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getHost <em>Host</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Host</em>' attribute.
+   * @see #getHost()
+   * @generated
+   */
+  void setHost(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Port</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port</em>' attribute.
-	 * @see #isSetPort()
-	 * @see #unsetPort()
-	 * @see #setPort(int)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Port()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	int getPort();
+  /**
+   * Returns the value of the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Port</em>' attribute.
+   * @see #isSetPort()
+   * @see #unsetPort()
+   * @see #setPort(int)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Port()
+   * @model unsettable="true"
+   * @generated
+   */
+  int getPort();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port</em>' attribute.
-	 * @see #isSetPort()
-	 * @see #unsetPort()
-	 * @see #getPort()
-	 * @generated
-	 */
-	void setPort(int value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Port</em>' attribute.
+   * @see #isSetPort()
+   * @see #unsetPort()
+   * @see #getPort()
+   * @generated
+   */
+  void setPort(int value);
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPort()
-	 * @see #getPort()
-	 * @see #setPort(int)
-	 * @generated
-	 */
-	void unsetPort();
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetPort()
+   * @see #getPort()
+   * @see #setPort(int)
+   * @generated
+   */
+  void unsetPort();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Port</em>' attribute is set.
-	 * @see #unsetPort()
-	 * @see #getPort()
-	 * @see #setPort(int)
-	 * @generated
-	 */
-	boolean isSetPort();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}'
+   * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Port</em>' attribute is set.
+   * @see #unsetPort()
+   * @see #getPort()
+   * @see #setPort(int)
+   * @generated
+   */
+  boolean isSetPort();
 
 } // TCPConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPSelectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPSelectorDef.java
index 78285378cf..841fbbaf16 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPSelectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPSelectorDef.java
@@ -2,21 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPSelectorDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: TCPSelectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.net4j.util.net4jutildefs.Def;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCP Selector Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPSelectorDef()
  * @model
  * @generated
  */
-public interface TCPSelectorDef extends Def {
+public interface TCPSelectorDef extends Def
+{
 } // TCPSelectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/User.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/User.java
index 4a54e6976b..e6bb5b4451 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/User.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/User.java
@@ -2,80 +2,80 @@
  * <copyright>
  * </copyright>
  *
- * $Id: User.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: User.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>User</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>User</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUser()
  * @model
  * @generated
  */
-public interface User extends EObject {
-	/**
-	 * Returns the value of the '<em><b>User ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User ID</em>' attribute.
-	 * @see #setUserID(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUser_UserID()
-	 * @model
-	 * @generated
-	 */
-	String getUserID();
+public interface User extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>User ID</em>' attribute.
+   * @see #setUserID(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUser_UserID()
+   * @model
+   * @generated
+   */
+  String getUserID();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User ID</em>' attribute.
-	 * @see #getUserID()
-	 * @generated
-	 */
-	void setUserID(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.User#getUserID <em>User ID</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>User ID</em>' attribute.
+   * @see #getUserID()
+   * @generated
+   */
+  void setUserID(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Password</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Password</em>' attribute.
-	 * @see #setPassword(String)
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUser_Password()
-	 * @model
-	 * @generated
-	 */
-	String getPassword();
+  /**
+   * Returns the value of the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Password</em>' attribute.
+   * @see #setPassword(String)
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUser_Password()
+   * @model
+   * @generated
+   */
+  String getPassword();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Password</em>' attribute.
-	 * @see #getPassword()
-	 * @generated
-	 */
-	void setPassword(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.User#getPassword <em>Password</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Password</em>' attribute.
+   * @see #getPassword()
+   * @generated
+   */
+  void setPassword(String value);
 
 } // User
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/UserManagerDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/UserManagerDef.java
index cbef95edc0..c7d36391e0 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/UserManagerDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/UserManagerDef.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UserManagerDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: UserManagerDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs;
 
@@ -11,59 +11,58 @@ import org.eclipse.net4j.util.net4jutildefs.Def;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>User Manager Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>User Manager Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUserManagerDef()
  * @model
  * @generated
  */
-public interface UserManagerDef extends Def {
+public interface UserManagerDef extends Def
+{
 
-	/**
-	 * Returns the value of the '<em><b>User</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.net4j.net4jdefs.User}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User</em>' reference list.
-	 * @see #isSetUser()
-	 * @see #unsetUser()
-	 * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUserManagerDef_User()
-	 * @model unsettable="true" required="true"
-	 * @generated
-	 */
-	EList<User> getUser();
+  /**
+   * Returns the value of the '<em><b>User</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.net4j.net4jdefs.User}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>User</em>' reference list isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>User</em>' reference list.
+   * @see #isSetUser()
+   * @see #unsetUser()
+   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getUserManagerDef_User()
+   * @model unsettable="true" required="true"
+   * @generated
+   */
+  EList<User> getUser();
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUser()
-	 * @see #getUser()
-	 * @generated
-	 */
-	void unsetUser();
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetUser()
+   * @see #getUser()
+   * @generated
+   */
+  void unsetUser();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>User</em>' reference list is set.
-	 * @see #unsetUser()
-	 * @see #getUser()
-	 * @generated
-	 */
-	boolean isSetUser();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.UserManagerDef#getUser <em>User</em>}'
+   * reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>User</em>' reference list is set.
+   * @see #unsetUser()
+   * @see #getUser()
+   * @generated
+   */
+  boolean isSetUser();
 } // UserManagerDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/AcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/AcceptorDefImpl.java
index 9f202f4cad..a328353427 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/AcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/AcceptorDefImpl.java
@@ -2,19 +2,22 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AcceptorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: AcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
+import org.eclipse.net4j.FactoriesProtocolProvider;
 import org.eclipse.net4j.ITransportConfig;
 import org.eclipse.net4j.buffer.IBufferProvider;
 import org.eclipse.net4j.net4jdefs.AcceptorDef;
 import org.eclipse.net4j.net4jdefs.BufferPoolDef;
 import org.eclipse.net4j.net4jdefs.NegotiatorDef;
 import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
+import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
 import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
+import org.eclipse.net4j.protocol.IProtocolProvider;
 import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.factory.IFactory;
 import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
 import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
 import org.eclipse.net4j.util.security.INegotiator;
@@ -28,360 +31,471 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef {
-	/**
-	 * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getBufferProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected BufferPoolDef bufferProvider;
-
-	/**
-	 * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getExecutorService()
-	 * @generated
-	 * @ordered
-	 */
-	protected ThreadPoolDef executorService;
-
-	/**
-	 * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getNegotiator()
-	 * @generated
-	 * @ordered
-	 */
-	protected NegotiatorDef negotiator;
-
-	/**
-	 * This is true if the Negotiator reference has been set. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean negotiatorESet;
-
-	/**
-	 * The cached value of the '{@link #getServerProtocolProvider() <em>Server Protocol Provider</em>}' reference list.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getServerProtocolProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ServerProtocolFactoryDef> serverProtocolProvider;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AcceptorDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.ACCEPTOR_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BufferPoolDef getBufferProvider() {
-		if (bufferProvider != null && bufferProvider.eIsProxy()) {
-			InternalEObject oldBufferProvider = (InternalEObject)bufferProvider;
-			bufferProvider = (BufferPoolDef)eResolveProxy(oldBufferProvider);
-			if (bufferProvider != oldBufferProvider) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider));
-			}
-		}
-		return bufferProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BufferPoolDef basicGetBufferProvider() {
-		return bufferProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBufferProvider(BufferPoolDef newBufferProvider) {
-		BufferPoolDef oldBufferProvider = bufferProvider;
-		bufferProvider = newBufferProvider;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ThreadPoolDef getExecutorService() {
-		if (executorService != null && executorService.eIsProxy()) {
-			InternalEObject oldExecutorService = (InternalEObject)executorService;
-			executorService = (ThreadPoolDef)eResolveProxy(oldExecutorService);
-			if (executorService != oldExecutorService) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService));
-			}
-		}
-		return executorService;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ThreadPoolDef basicGetExecutorService() {
-		return executorService;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExecutorService(ThreadPoolDef newExecutorService) {
-		ThreadPoolDef oldExecutorService = executorService;
-		executorService = newExecutorService;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NegotiatorDef getNegotiator() {
-		if (negotiator != null && negotiator.eIsProxy()) {
-			InternalEObject oldNegotiator = (InternalEObject)negotiator;
-			negotiator = (NegotiatorDef)eResolveProxy(oldNegotiator);
-			if (negotiator != oldNegotiator) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator));
-			}
-		}
-		return negotiator;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NegotiatorDef basicGetNegotiator() {
-		return negotiator;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNegotiator(NegotiatorDef newNegotiator) {
-		NegotiatorDef oldNegotiator = negotiator;
-		negotiator = newNegotiator;
-		boolean oldNegotiatorESet = negotiatorESet;
-		negotiatorESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator, !oldNegotiatorESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetNegotiator() {
-		NegotiatorDef oldNegotiator = negotiator;
-		boolean oldNegotiatorESet = negotiatorESet;
-		negotiator = null;
-		negotiatorESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, null, oldNegotiatorESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetNegotiator() {
-		return negotiatorESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ServerProtocolFactoryDef> getServerProtocolProvider() {
-		if (serverProtocolProvider == null) {
-			serverProtocolProvider = new EObjectResolvingEList.Unsettable<ServerProtocolFactoryDef>(ServerProtocolFactoryDef.class, this, Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
-		}
-		return serverProtocolProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetServerProtocolProvider() {
-		if (serverProtocolProvider != null) ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetServerProtocolProvider() {
-		return serverProtocolProvider != null && ((InternalEList.Unsettable<?>)serverProtocolProvider).isSet();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-				if (resolve) return getBufferProvider();
-				return basicGetBufferProvider();
-			case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-				if (resolve) return getExecutorService();
-				return basicGetExecutorService();
-			case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-				if (resolve) return getNegotiator();
-				return basicGetNegotiator();
-			case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-				return getServerProtocolProvider();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-				setBufferProvider((BufferPoolDef)newValue);
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-				setExecutorService((ThreadPoolDef)newValue);
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-				setNegotiator((NegotiatorDef)newValue);
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-				getServerProtocolProvider().clear();
-				getServerProtocolProvider().addAll((Collection<? extends ServerProtocolFactoryDef>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-				setBufferProvider((BufferPoolDef)null);
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-				setExecutorService((ThreadPoolDef)null);
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-				unsetNegotiator();
-				return;
-			case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-				unsetServerProtocolProvider();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-				return bufferProvider != null;
-			case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-				return executorService != null;
-			case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-				return isSetNegotiator();
-			case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-				return isSetServerProtocolProvider();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE),
-				"thread pool not set!");
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER),
-				"buffer pool not set!");
-		if (isSetServerProtocolProvider()) {
-			CheckUtil.checkState(getServerProtocolProvider().size() >= 1, "server protocol provider is set but has no protocol factories!");
-		}
-	}
-
-	protected void configure(ITransportConfig config) {
-
-		config.setBufferProvider((IBufferProvider) getBufferProvider()
-				.getInstance());
-		config.setReceiveExecutor((ExecutorService) getExecutorService()
-				.getInstance());
-		if (isSetServerProtocolProvider()
-				&& getServerProtocolProvider().size() > 0) {
-			config
-					.setProtocolProvider(Net4jDefsUtil
-							.createFactoriesProtocolProvider(getServerProtocolProvider()));
-		}
-		if (isSetNegotiator()) {
-			config.setNegotiator((INegotiator) getNegotiator().getInstance());
-		}
-	}
+public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
+{
+  /**
+   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getBufferProvider()
+   * @generated
+   * @ordered
+   */
+  protected BufferPoolDef bufferProvider;
+
+  /**
+   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @see #getExecutorService()
+   * @generated
+   * @ordered
+   */
+  protected ThreadPoolDef executorService;
+
+  /**
+   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getNegotiator()
+   * @generated
+   * @ordered
+   */
+  protected NegotiatorDef negotiator;
+
+  /**
+   * This is true if the Negotiator reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  protected boolean negotiatorESet;
+
+  /**
+   * The cached value of the '{@link #getServerProtocolProvider() <em>Server Protocol Provider</em>}' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getServerProtocolProvider()
+   * @generated
+   * @ordered
+   */
+  protected EList<ServerProtocolFactoryDef> serverProtocolProvider;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected AcceptorDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.ACCEPTOR_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public BufferPoolDef getBufferProvider()
+  {
+    if (bufferProvider != null && bufferProvider.eIsProxy())
+    {
+      InternalEObject oldBufferProvider = (InternalEObject)bufferProvider;
+      bufferProvider = (BufferPoolDef)eResolveProxy(oldBufferProvider);
+      if (bufferProvider != oldBufferProvider)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
+              oldBufferProvider, bufferProvider));
+        }
+      }
+    }
+    return bufferProvider;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public BufferPoolDef basicGetBufferProvider()
+  {
+    return bufferProvider;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setBufferProvider(BufferPoolDef newBufferProvider)
+  {
+    BufferPoolDef oldBufferProvider = bufferProvider;
+    bufferProvider = newBufferProvider;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
+          oldBufferProvider, bufferProvider));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ThreadPoolDef getExecutorService()
+  {
+    if (executorService != null && executorService.eIsProxy())
+    {
+      InternalEObject oldExecutorService = (InternalEObject)executorService;
+      executorService = (ThreadPoolDef)eResolveProxy(oldExecutorService);
+      if (executorService != oldExecutorService)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
+              oldExecutorService, executorService));
+        }
+      }
+    }
+    return executorService;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ThreadPoolDef basicGetExecutorService()
+  {
+    return executorService;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setExecutorService(ThreadPoolDef newExecutorService)
+  {
+    ThreadPoolDef oldExecutorService = executorService;
+    executorService = newExecutorService;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
+          oldExecutorService, executorService));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NegotiatorDef getNegotiator()
+  {
+    if (negotiator != null && negotiator.eIsProxy())
+    {
+      InternalEObject oldNegotiator = (InternalEObject)negotiator;
+      negotiator = (NegotiatorDef)eResolveProxy(oldNegotiator);
+      if (negotiator != oldNegotiator)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR,
+              oldNegotiator, negotiator));
+        }
+      }
+    }
+    return negotiator;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NegotiatorDef basicGetNegotiator()
+  {
+    return negotiator;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setNegotiator(NegotiatorDef newNegotiator)
+  {
+    NegotiatorDef oldNegotiator = negotiator;
+    negotiator = newNegotiator;
+    boolean oldNegotiatorESet = negotiatorESet;
+    negotiatorESet = true;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
+          negotiator, !oldNegotiatorESet));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetNegotiator()
+  {
+    NegotiatorDef oldNegotiator = negotiator;
+    boolean oldNegotiatorESet = negotiatorESet;
+    negotiator = null;
+    negotiatorESet = false;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
+          null, oldNegotiatorESet));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetNegotiator()
+  {
+    return negotiatorESet;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EList<ServerProtocolFactoryDef> getServerProtocolProvider()
+  {
+    if (serverProtocolProvider == null)
+    {
+      serverProtocolProvider = new EObjectResolvingEList.Unsettable<ServerProtocolFactoryDef>(
+          ServerProtocolFactoryDef.class, this, Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
+    }
+    return serverProtocolProvider;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetServerProtocolProvider()
+  {
+    if (serverProtocolProvider != null)
+    {
+      ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetServerProtocolProvider()
+  {
+    return serverProtocolProvider != null && ((InternalEList.Unsettable<?>)serverProtocolProvider).isSet();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
+      if (resolve)
+      {
+        return getBufferProvider();
+      }
+      return basicGetBufferProvider();
+    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
+      if (resolve)
+      {
+        return getExecutorService();
+      }
+      return basicGetExecutorService();
+    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
+      if (resolve)
+      {
+        return getNegotiator();
+      }
+      return basicGetNegotiator();
+    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
+      return getServerProtocolProvider();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
+      setBufferProvider((BufferPoolDef)newValue);
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
+      setExecutorService((ThreadPoolDef)newValue);
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
+      setNegotiator((NegotiatorDef)newValue);
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
+      getServerProtocolProvider().clear();
+      getServerProtocolProvider().addAll((Collection<? extends ServerProtocolFactoryDef>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
+      setBufferProvider((BufferPoolDef)null);
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
+      setExecutorService((ThreadPoolDef)null);
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
+      unsetNegotiator();
+      return;
+    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
+      unsetServerProtocolProvider();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
+      return bufferProvider != null;
+    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
+      return executorService != null;
+    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
+      return isSetNegotiator();
+    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
+      return isSetServerProtocolProvider();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    super.validateDefinition();
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE), "thread pool not set!");
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER), "buffer pool not set!");
+    if (isSetServerProtocolProvider())
+    {
+      CheckUtil.checkState(getServerProtocolProvider().size() >= 1,
+          "server protocol provider is set but has no protocol factories!");
+    }
+  }
+
+  /**
+   * @ADDED
+   */
+  protected void configure(ITransportConfig config)
+  {
+    config.setBufferProvider((IBufferProvider)getBufferProvider().getInstance());
+    config.setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
+    if (isSetServerProtocolProvider() && getServerProtocolProvider().size() > 0)
+    {
+      config.setProtocolProvider(AcceptorDefImpl.createFactoriesProtocolProvider(getServerProtocolProvider()));
+    }
+    
+    if (isSetNegotiator())
+    {
+      config.setNegotiator((INegotiator)getNegotiator().getInstance());
+    }
+  }
+
+  /**
+   * Creates the factories protocol provider. The current implementation uses a {@link FactoriesProtocolProvider}.
+   * 
+   * @ADDED
+   */
+  public static <PPD extends ProtocolProviderDef> IProtocolProvider createFactoriesProtocolProvider(
+      List<PPD> protocolFactoryDef)
+  {
+    FactoriesProtocolProvider protocolProvider = new FactoriesProtocolProvider();
+    for (Iterator<PPD> it = protocolFactoryDef.iterator(); it.hasNext();)
+    {
+      PPD protocolProviderDef = it.next();
+      protocolProvider.addFactory((IFactory)protocolProviderDef.getInstance());
+    }
+
+    return protocolProvider;
+  }
 
 } // AcceptorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferPoolDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferPoolDefImpl.java
index 142bacd018..5915415f2e 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferPoolDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferPoolDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BufferPoolDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: BufferPoolDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -14,45 +14,47 @@ import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Buffer Pool Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPoolDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BufferPoolDefImpl() {
-		super();
-	}
+public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPoolDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected BufferPoolDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.BUFFER_POOL_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.BUFFER_POOL_DEF;
+  }
 
-	/**
-	 * creates and returns a buffer provider. 
-	 * 
-	 * @generated NOT
-	 */
-	@Override
-	protected Object createInstance() {
-		IBufferProvider bufferProvider = Net4jUtil.createBufferPool();
-//		LifecycleUtil.activate(bufferProvider);
-		return bufferProvider;
-	}
+  /**
+   * creates and returns a buffer provider.
+   * 
+   * @generated NOT
+   */
+  @Override
+  protected Object createInstance()
+  {
+    IBufferProvider bufferProvider = Net4jUtil.createBufferPool();
+    // LifecycleUtil.activate(bufferProvider);
+    return bufferProvider;
+  }
 
-	
-} //BufferPoolDefImpl
+} // BufferPoolDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferProviderDefImpl.java
index 3b9d926704..a4dbad459e 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/BufferProviderDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BufferProviderDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: BufferProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -13,32 +13,34 @@ 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>Buffer Provider Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Buffer Provider Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class BufferProviderDefImpl extends DefImpl implements BufferProviderDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BufferProviderDefImpl() {
-		super();
-	}
+public abstract class BufferProviderDefImpl extends DefImpl implements BufferProviderDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected BufferProviderDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.BUFFER_PROVIDER_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.BUFFER_PROVIDER_DEF;
+  }
 
-} //BufferProviderDefImpl
+} // BufferProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java
index fb2eb40efa..7eff6eafa3 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ChallengeNegotiatorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ChallengeNegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -91,8 +91,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (userManager != oldUserManager)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
+        }
       }
     }
     return userManager;
@@ -118,8 +120,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     UserManagerDef oldUserManager = userManager;
     userManager = newUserManager;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER,
           oldUserManager, userManager));
+    }
   }
 
   /**
@@ -136,8 +140,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (randomizer != oldRandomizer)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer));
+        }
       }
     }
     return randomizer;
@@ -163,8 +169,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     RandomizerDef oldRandomizer = randomizer;
     randomizer = newRandomizer;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER,
           oldRandomizer, randomizer));
+    }
   }
 
   /**
@@ -179,11 +187,15 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     {
     case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
       if (resolve)
+      {
         return getUserManager();
+      }
       return basicGetUserManager();
     case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
       if (resolve)
+      {
         return getRandomizer();
+      }
       return basicGetRandomizer();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -247,6 +259,9 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     return super.eIsSet(featureID);
   }
 
+  /**
+   * @ADDED
+   */
   @Override
   protected Object createInstance()
   {
@@ -257,6 +272,9 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     return challengeNegotiator;
   }
 
+  /**
+   * @ADDED
+   */
   @Override
   protected void validateDefinition()
   {
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ClientProtocolFactoryDefImpl.java
index a330831f31..367550018d 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ClientProtocolFactoryDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ClientProtocolFactoryDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ClientProtocolFactoryDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -12,32 +12,34 @@ import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Client Protocol Factory Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class ClientProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ClientProtocolFactoryDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClientProtocolFactoryDefImpl() {
-		super();
-	}
+public abstract class ClientProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ClientProtocolFactoryDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ClientProtocolFactoryDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.CLIENT_PROTOCOL_FACTORY_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.CLIENT_PROTOCOL_FACTORY_DEF;
+  }
 
-} //ClientProtocolFactoryDefImpl
+} // ClientProtocolFactoryDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ConnectorDefImpl.java
index ff11316cf7..348f4f7871 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ConnectorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConnectorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -14,7 +14,6 @@ import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
 import org.eclipse.net4j.net4jdefs.ConnectorDef;
 import org.eclipse.net4j.net4jdefs.NegotiatorDef;
 import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil;
 import org.eclipse.net4j.protocol.IProtocolProvider;
 import org.eclipse.net4j.util.CheckUtil;
 import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
@@ -193,8 +192,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldUserIDESet = userIDESet;
     userIDESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, userID,
           !oldUserIDESet));
+    }
   }
 
   /**
@@ -209,8 +210,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     userID = USER_ID_EDEFAULT;
     userIDESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID,
           USER_ID_EDEFAULT, oldUserIDESet));
+    }
   }
 
   /**
@@ -237,8 +240,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
+        }
       }
     }
     return bufferProvider;
@@ -264,8 +269,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     BufferProviderDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
+    }
   }
 
   /**
@@ -282,8 +289,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
+        }
       }
     }
     return executorService;
@@ -309,8 +318,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     ExecutorServiceDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
+    }
   }
 
   /**
@@ -327,8 +338,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
+        }
       }
     }
     return negotiator;
@@ -356,8 +369,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
+    }
   }
 
   /**
@@ -372,8 +387,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
           oldNegotiator, null, oldNegotiatorESet));
+    }
   }
 
   /**
@@ -409,7 +426,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public void unsetClientProtocolProvider()
   {
     if (clientProtocolProvider != null)
+    {
       ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
+    }
   }
 
   /**
@@ -443,15 +462,21 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       return getUserID();
     case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
       if (resolve)
+      {
         return getBufferProvider();
+      }
       return basicGetBufferProvider();
     case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
       if (resolve)
+      {
         return getExecutorService();
+      }
       return basicGetExecutorService();
     case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
       if (resolve)
+      {
         return getNegotiator();
+      }
       return basicGetNegotiator();
     case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
       return getClientProtocolProvider();
@@ -562,14 +587,20 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
     if (userIDESet)
+    {
       result.append(userID);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
@@ -583,8 +614,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
    * <li>{@link IProtocolProvider}</li>
    * </ul>
    * 
-   * @param config
-   *          the transport config
+   * @ADDED
    */
   protected void configure(ITransportConfig config)
   {
@@ -592,7 +622,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     config.setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
     if (isSetClientProtocolProvider())
     {
-      config.setProtocolProvider(Net4jDefsUtil.createFactoriesProtocolProvider(getClientProtocolProvider()));
+      config.setProtocolProvider(AcceptorDefImpl.createFactoriesProtocolProvider(getClientProtocolProvider()));
     }
     if (isSetNegotiator())
     {
@@ -600,6 +630,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     }
   }
 
+  /**
+   * @ADDED
+   */
   protected void configure(Connector connector)
   {
     if (isSetUserID())
@@ -609,6 +642,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     configure(connector.getConfig());
   }
 
+  /**
+   * @ADDED
+   */
   @Override
   protected void validateDefinition()
   {
@@ -622,6 +658,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   }
 
+  /**
+   * @ADDED
+   */
+  @Override
   protected abstract IConnector createInstance();
 
 } // ConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/CredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/CredentialsProviderDefImpl.java
index 972c7bbd8f..3f83587ea7 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/CredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/CredentialsProviderDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CredentialsProviderDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: CredentialsProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -15,151 +15,170 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Credentials Provider Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Credentials Provider Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.CredentialsProviderDefImpl#getUserID <em>User ID</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class CredentialsProviderDefImpl extends DefImpl implements CredentialsProviderDef {
-	/**
-	 * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USER_ID_EDEFAULT = null;
+public abstract class CredentialsProviderDefImpl extends DefImpl implements CredentialsProviderDef
+{
+  /**
+   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getUserID()
+   * @generated
+   * @ordered
+   */
+  protected static final String USER_ID_EDEFAULT = null;
 
-	/**
-	 * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String userID = USER_ID_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getUserID()
+   * @generated
+   * @ordered
+   */
+  protected String userID = USER_ID_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CredentialsProviderDefImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected CredentialsProviderDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.CREDENTIALS_PROVIDER_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.CREDENTIALS_PROVIDER_DEF;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUserID() {
-		return userID;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getUserID()
+  {
+    return userID;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUserID(String newUserID) {
-		String oldUserID = userID;
-		userID = newUserID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID, oldUserID, userID));
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setUserID(String newUserID)
+  {
+    String oldUserID = userID;
+    userID = newUserID;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID,
+          oldUserID, userID));
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
-				return getUserID();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
+      return getUserID();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
-				setUserID((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
+      setUserID((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
-				setUserID(USER_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
+      setUserID(USER_ID_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
-				return USER_ID_EDEFAULT == null ? userID != null : !USER_ID_EDEFAULT.equals(userID);
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID:
+      return USER_ID_EDEFAULT == null ? userID != null : !USER_ID_EDEFAULT.equals(userID);
+    }
+    return super.eIsSet(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+    {
+      return super.toString();
+    }
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (userID: ");
-		result.append(userID);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (userID: ");
+    result.append(userID);
+    result.append(')');
+    return result.toString();
+  }
 
-} //CredentialsProviderDefImpl
+} // CredentialsProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/HTTPConnectorDefImpl.java
index 2dfd8ff7a0..af2a794eb6 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/HTTPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/HTTPConnectorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HTTPConnectorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: HTTPConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -17,156 +17,191 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>HTTP Connector Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>HTTP Connector Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class HTTPConnectorDefImpl extends ConnectorDefImpl implements
-		HTTPConnectorDef {
-	/**
-	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getUrl()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getUrl()
-	 * @generated
-	 * @ordered
-	 */
-	protected String url = URL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPConnectorDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.HTTP_CONNECTOR_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUrl(String newUrl) {
-		String oldUrl = url;
-		url = newUrl;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-				return getUrl();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-				setUrl((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-				setUrl(URL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
-		}
-		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(" (url: ");
-		result.append(url);
-		result.append(')');
-		return result.toString();
-	}
-
-	protected IHTTPConnector createInstance() {
-		HTTPClientConnector connector = new HTTPClientConnector();
-
-		configure(connector.getConfig());
-		connector.setURL(getUrl());
-		connector.activate();
-
-		return connector;
-	}
-
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL), "url not set!");
-	}
+public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnectorDef
+{
+  /**
+   * The default value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getUrl()
+   * @generated
+   * @ordered
+   */
+  protected static final String URL_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getUrl()
+   * @generated
+   * @ordered
+   */
+  protected String url = URL_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected HTTPConnectorDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.HTTP_CONNECTOR_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getUrl()
+  {
+    return url;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setUrl(String newUrl)
+  {
+    String oldUrl = url;
+    url = newUrl;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
+      return getUrl();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
+      setUrl((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
+      setUrl(URL_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
+      return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+    }
+    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(" (url: ");
+    result.append(url);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected IHTTPConnector createInstance()
+  {
+    HTTPClientConnector connector = new HTTPClientConnector();
+
+    configure(connector.getConfig());
+    connector.setURL(getUrl());
+    connector.activate();
+
+    return connector;
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    super.validateDefinition();
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL), "url not set!");
+  }
 } // HTTPConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMAcceptorDefImpl.java
index a79197825c..2d0c3e9525 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMAcceptorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JVMAcceptorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: JVMAcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -19,155 +19,190 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import java.util.concurrent.ExecutorService;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>JVM Acceptor Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>JVM Acceptor Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class JVMAcceptorDefImpl extends AcceptorDefImpl implements
-		JVMAcceptorDef {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JVMAcceptorDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.JVM_ACCEPTOR_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		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(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	@Override
-	protected Object createInstance() {
-		JVMAcceptor jvmAcceptor = new JVMAcceptor();
-		jvmAcceptor.getConfig().setBufferProvider(
-				(IBufferProvider) getBufferProvider().getInstance());
-		jvmAcceptor.getConfig().setReceiveExecutor(
-				(ExecutorService) getExecutorService().getInstance());
-		jvmAcceptor.setName(getName());
-		return jvmAcceptor;
-	}
-
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME), "name not set!");
-	}
+public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDef
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected JVMAcceptorDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.JVM_ACCEPTOR_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
+      return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
+      setName((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    }
+    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(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected Object createInstance()
+  {
+    JVMAcceptor jvmAcceptor = new JVMAcceptor();
+    jvmAcceptor.getConfig().setBufferProvider((IBufferProvider)getBufferProvider().getInstance());
+    jvmAcceptor.getConfig().setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
+    jvmAcceptor.setName(getName());
+    return jvmAcceptor;
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    super.validateDefinition();
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME), "name not set!");
+  }
 } // JVMAcceptorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMConnectorDefImpl.java
index a1ab84c887..483431a154 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/JVMConnectorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JVMConnectorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: JVMConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -17,163 +17,191 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>JVM Connector Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>JVM Connector Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class JVMConnectorDefImpl extends ConnectorDefImpl implements
-		JVMConnectorDef {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JVMConnectorDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.JVM_CONNECTOR_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		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(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	@Override
-	protected IJVMConnector createInstance() {
-		JVMClientConnector connector = new JVMClientConnector();
-		configure(connector);
-
-		connector.setName(getName());
-		return connector;
-	}
-
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME), "name not set!");
-	}
+public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnectorDef
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected JVMConnectorDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.JVM_CONNECTOR_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
+      return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
+      setName((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    }
+    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(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected IJVMConnector createInstance()
+  {
+    JVMClientConnector connector = new JVMClientConnector();
+    configure(connector);
+
+    connector.setName(getName());
+    return connector;
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    super.validateDefinition();
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME), "name not set!");
+  }
 
 } // JVMConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/NegotiatorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/NegotiatorDefImpl.java
index 819b94e6e3..9e9657e19b 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/NegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/NegotiatorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NegotiatorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: NegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -13,32 +13,33 @@ 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>Negotiator Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Negotiator Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class NegotiatorDefImpl extends DefImpl implements NegotiatorDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NegotiatorDefImpl() {
-		super();
-	}
+public abstract class NegotiatorDefImpl extends DefImpl implements NegotiatorDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected NegotiatorDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.NEGOTIATOR_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.NEGOTIATOR_DEF;
+  }
 
-} //NegotiatorDefImpl
+} // NegotiatorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsFactoryImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsFactoryImpl.java
index 5fa36b5d55..e36245f0f5 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsFactoryImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: Net4jDefsFactoryImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -29,215 +29,236 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Net4jDefsFactory init() {
-		try {
-			Net4jDefsFactory theNet4jDefsFactory = (Net4jDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/NET4J/defs/1.0.0"); 
-			if (theNet4jDefsFactory != null) {
-				return theNet4jDefsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new Net4jDefsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jDefsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF: return createTCPConnectorDef();
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF: return createTCPAcceptorDef();
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF: return createJVMAcceptorDef();
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF: return createJVMConnectorDef();
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF: return createHTTPConnectorDef();
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF: return createResponseNegotiatorDef();
-			case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF: return createChallengeNegotiatorDef();
-			case Net4jDefsPackage.TCP_SELECTOR_DEF: return createTCPSelectorDef();
-			case Net4jDefsPackage.BUFFER_POOL_DEF: return createBufferPoolDef();
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF: return createPasswordCredentialsProviderDef();
-			case Net4jDefsPackage.USER: return createUser();
-			case Net4jDefsPackage.USER_MANAGER_DEF: return createUserManagerDef();
-			case Net4jDefsPackage.RANDOMIZER_DEF: return createRandomizerDef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TCPConnectorDef createTCPConnectorDef() {
-		TCPConnectorDefImpl tcpConnectorDef = new TCPConnectorDefImpl();
-		return tcpConnectorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TCPAcceptorDef createTCPAcceptorDef() {
-		TCPAcceptorDefImpl tcpAcceptorDef = new TCPAcceptorDefImpl();
-		return tcpAcceptorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JVMAcceptorDef createJVMAcceptorDef() {
-		JVMAcceptorDefImpl jvmAcceptorDef = new JVMAcceptorDefImpl();
-		return jvmAcceptorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JVMConnectorDef createJVMConnectorDef() {
-		JVMConnectorDefImpl jvmConnectorDef = new JVMConnectorDefImpl();
-		return jvmConnectorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPConnectorDef createHTTPConnectorDef() {
-		HTTPConnectorDefImpl httpConnectorDef = new HTTPConnectorDefImpl();
-		return httpConnectorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResponseNegotiatorDef createResponseNegotiatorDef() {
-		ResponseNegotiatorDefImpl responseNegotiatorDef = new ResponseNegotiatorDefImpl();
-		return responseNegotiatorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChallengeNegotiatorDef createChallengeNegotiatorDef() {
-		ChallengeNegotiatorDefImpl challengeNegotiatorDef = new ChallengeNegotiatorDefImpl();
-		return challengeNegotiatorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TCPSelectorDef createTCPSelectorDef() {
-		TCPSelectorDefImpl tcpSelectorDef = new TCPSelectorDefImpl();
-		return tcpSelectorDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BufferPoolDef createBufferPoolDef() {
-		BufferPoolDefImpl bufferPoolDef = new BufferPoolDefImpl();
-		return bufferPoolDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PasswordCredentialsProviderDef createPasswordCredentialsProviderDef() {
-		PasswordCredentialsProviderDefImpl passwordCredentialsProviderDef = new PasswordCredentialsProviderDefImpl();
-		return passwordCredentialsProviderDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UserManagerDef createUserManagerDef() {
-		UserManagerDefImpl userManagerDef = new UserManagerDefImpl();
-		return userManagerDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomizerDef createRandomizerDef() {
-		RandomizerDefImpl randomizerDef = new RandomizerDefImpl();
-		return randomizerDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public User createUser() {
-		UserImpl user = new UserImpl();
-		return user;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jDefsPackage getNet4jDefsPackage() {
-		return (Net4jDefsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static Net4jDefsPackage getPackage() {
-		return Net4jDefsPackage.eINSTANCE;
-	}
-
-} //Net4jDefsFactoryImpl
+public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFactory
+{
+  /**
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public static Net4jDefsFactory init()
+  {
+    try
+    {
+      Net4jDefsFactory theNet4jDefsFactory = (Net4jDefsFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://www.eclipse.org/NET4J/defs/1.0.0");
+      if (theNet4jDefsFactory != null)
+      {
+        return theNet4jDefsFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new Net4jDefsFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jDefsFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF:
+      return createTCPConnectorDef();
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF:
+      return createTCPAcceptorDef();
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF:
+      return createJVMAcceptorDef();
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF:
+      return createJVMConnectorDef();
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF:
+      return createHTTPConnectorDef();
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF:
+      return createResponseNegotiatorDef();
+    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF:
+      return createChallengeNegotiatorDef();
+    case Net4jDefsPackage.TCP_SELECTOR_DEF:
+      return createTCPSelectorDef();
+    case Net4jDefsPackage.BUFFER_POOL_DEF:
+      return createBufferPoolDef();
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF:
+      return createPasswordCredentialsProviderDef();
+    case Net4jDefsPackage.USER:
+      return createUser();
+    case Net4jDefsPackage.USER_MANAGER_DEF:
+      return createUserManagerDef();
+    case Net4jDefsPackage.RANDOMIZER_DEF:
+      return createRandomizerDef();
+    default:
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public TCPConnectorDef createTCPConnectorDef()
+  {
+    TCPConnectorDefImpl tcpConnectorDef = new TCPConnectorDefImpl();
+    return tcpConnectorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public TCPAcceptorDef createTCPAcceptorDef()
+  {
+    TCPAcceptorDefImpl tcpAcceptorDef = new TCPAcceptorDefImpl();
+    return tcpAcceptorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public JVMAcceptorDef createJVMAcceptorDef()
+  {
+    JVMAcceptorDefImpl jvmAcceptorDef = new JVMAcceptorDefImpl();
+    return jvmAcceptorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public JVMConnectorDef createJVMConnectorDef()
+  {
+    JVMConnectorDefImpl jvmConnectorDef = new JVMConnectorDefImpl();
+    return jvmConnectorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public HTTPConnectorDef createHTTPConnectorDef()
+  {
+    HTTPConnectorDefImpl httpConnectorDef = new HTTPConnectorDefImpl();
+    return httpConnectorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ResponseNegotiatorDef createResponseNegotiatorDef()
+  {
+    ResponseNegotiatorDefImpl responseNegotiatorDef = new ResponseNegotiatorDefImpl();
+    return responseNegotiatorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ChallengeNegotiatorDef createChallengeNegotiatorDef()
+  {
+    ChallengeNegotiatorDefImpl challengeNegotiatorDef = new ChallengeNegotiatorDefImpl();
+    return challengeNegotiatorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public TCPSelectorDef createTCPSelectorDef()
+  {
+    TCPSelectorDefImpl tcpSelectorDef = new TCPSelectorDefImpl();
+    return tcpSelectorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public BufferPoolDef createBufferPoolDef()
+  {
+    BufferPoolDefImpl bufferPoolDef = new BufferPoolDefImpl();
+    return bufferPoolDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public PasswordCredentialsProviderDef createPasswordCredentialsProviderDef()
+  {
+    PasswordCredentialsProviderDefImpl passwordCredentialsProviderDef = new PasswordCredentialsProviderDefImpl();
+    return passwordCredentialsProviderDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public UserManagerDef createUserManagerDef()
+  {
+    UserManagerDefImpl userManagerDef = new UserManagerDefImpl();
+    return userManagerDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public RandomizerDef createRandomizerDef()
+  {
+    RandomizerDefImpl randomizerDef = new RandomizerDefImpl();
+    return randomizerDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public User createUser()
+  {
+    UserImpl user = new UserImpl();
+    return user;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jDefsPackage getNet4jDefsPackage()
+  {
+    return (Net4jDefsPackage)getEPackage();
+  }
+} // Net4jDefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsPackageImpl.java
index 47cd12e5ca..8494fe522d 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/Net4jDefsPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsPackageImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: Net4jDefsPackageImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -38,873 +38,991 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass clientProtocolFactoryDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tcpConnectorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass acceptorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tcpAcceptorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jvmAcceptorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jvmConnectorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpConnectorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass negotiatorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass responseNegotiatorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass challengeNegotiatorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tcpSelectorDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serverProtocolFactoryDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bufferProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bufferPoolDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass protocolProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass credentialsProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass passwordCredentialsProviderDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userManagerDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass randomizerDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userEClass = 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.net4j.net4jdefs.Net4jDefsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private Net4jDefsPackageImpl() {
-		super(eNS_URI, Net4jDefsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  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 Net4jDefsPackage init() {
-		if (isInited) return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Net4jDefsPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		Net4jUtilDefsPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theNet4jDefsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNet4jDefsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNet4jDefsPackage.freeze();
-
-		return theNet4jDefsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConnectorDef() {
-		return connectorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectorDef_UserID() {
-		return (EAttribute)connectorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectorDef_BufferProvider() {
-		return (EReference)connectorDefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectorDef_ExecutorService() {
-		return (EReference)connectorDefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectorDef_Negotiator() {
-		return (EReference)connectorDefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectorDef_ClientProtocolProvider() {
-		return (EReference)connectorDefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getClientProtocolFactoryDef() {
-		return clientProtocolFactoryDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTCPConnectorDef() {
-		return tcpConnectorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTCPConnectorDef_TcpSelectorDef() {
-		return (EReference)tcpConnectorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTCPConnectorDef_Host() {
-		return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTCPConnectorDef_Port() {
-		return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAcceptorDef() {
-		return acceptorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAcceptorDef_BufferProvider() {
-		return (EReference)acceptorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAcceptorDef_ExecutorService() {
-		return (EReference)acceptorDefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAcceptorDef_Negotiator() {
-		return (EReference)acceptorDefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAcceptorDef_ServerProtocolProvider() {
-		return (EReference)acceptorDefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTCPAcceptorDef() {
-		return tcpAcceptorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTCPAcceptorDef_Host() {
-		return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTCPAcceptorDef_Port() {
-		return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTCPAcceptorDef_TcpSelectorDef() {
-		return (EReference)tcpAcceptorDefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJVMAcceptorDef() {
-		return jvmAcceptorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJVMAcceptorDef_Name() {
-		return (EAttribute)jvmAcceptorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJVMConnectorDef() {
-		return jvmConnectorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJVMConnectorDef_Name() {
-		return (EAttribute)jvmConnectorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPConnectorDef() {
-		return httpConnectorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPConnectorDef_Url() {
-		return (EAttribute)httpConnectorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNegotiatorDef() {
-		return negotiatorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getResponseNegotiatorDef() {
-		return responseNegotiatorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResponseNegotiatorDef_CredentialsProvider() {
-		return (EReference)responseNegotiatorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChallengeNegotiatorDef() {
-		return challengeNegotiatorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChallengeNegotiatorDef_UserManager() {
-		return (EReference)challengeNegotiatorDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChallengeNegotiatorDef_Randomizer() {
-		return (EReference)challengeNegotiatorDefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTCPSelectorDef() {
-		return tcpSelectorDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServerProtocolFactoryDef() {
-		return serverProtocolFactoryDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBufferProviderDef() {
-		return bufferProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBufferPoolDef() {
-		return bufferPoolDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProtocolProviderDef() {
-		return protocolProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCredentialsProviderDef() {
-		return credentialsProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCredentialsProviderDef_UserID() {
-		return (EAttribute)credentialsProviderDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPasswordCredentialsProviderDef() {
-		return passwordCredentialsProviderDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPasswordCredentialsProviderDef_Password() {
-		return (EAttribute)passwordCredentialsProviderDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUserManagerDef() {
-		return userManagerDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUserManagerDef_User() {
-		return (EReference)userManagerDefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRandomizerDef() {
-		return randomizerDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUser() {
-		return userEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUser_UserID() {
-		return (EAttribute)userEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUser_Password() {
-		return (EAttribute)userEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jDefsFactory getNet4jDefsFactory() {
-		return (Net4jDefsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		connectorDefEClass = createEClass(CONNECTOR_DEF);
-		createEAttribute(connectorDefEClass, CONNECTOR_DEF__USER_ID);
-		createEReference(connectorDefEClass, CONNECTOR_DEF__BUFFER_PROVIDER);
-		createEReference(connectorDefEClass, CONNECTOR_DEF__EXECUTOR_SERVICE);
-		createEReference(connectorDefEClass, CONNECTOR_DEF__NEGOTIATOR);
-		createEReference(connectorDefEClass, CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER);
-
-		clientProtocolFactoryDefEClass = createEClass(CLIENT_PROTOCOL_FACTORY_DEF);
-
-		tcpConnectorDefEClass = createEClass(TCP_CONNECTOR_DEF);
-		createEReference(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF);
-		createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__HOST);
-		createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__PORT);
-
-		acceptorDefEClass = createEClass(ACCEPTOR_DEF);
-		createEReference(acceptorDefEClass, ACCEPTOR_DEF__BUFFER_PROVIDER);
-		createEReference(acceptorDefEClass, ACCEPTOR_DEF__EXECUTOR_SERVICE);
-		createEReference(acceptorDefEClass, ACCEPTOR_DEF__NEGOTIATOR);
-		createEReference(acceptorDefEClass, ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
-
-		tcpAcceptorDefEClass = createEClass(TCP_ACCEPTOR_DEF);
-		createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__HOST);
-		createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__PORT);
-		createEReference(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF);
-
-		jvmAcceptorDefEClass = createEClass(JVM_ACCEPTOR_DEF);
-		createEAttribute(jvmAcceptorDefEClass, JVM_ACCEPTOR_DEF__NAME);
-
-		jvmConnectorDefEClass = createEClass(JVM_CONNECTOR_DEF);
-		createEAttribute(jvmConnectorDefEClass, JVM_CONNECTOR_DEF__NAME);
-
-		httpConnectorDefEClass = createEClass(HTTP_CONNECTOR_DEF);
-		createEAttribute(httpConnectorDefEClass, HTTP_CONNECTOR_DEF__URL);
-
-		negotiatorDefEClass = createEClass(NEGOTIATOR_DEF);
-
-		responseNegotiatorDefEClass = createEClass(RESPONSE_NEGOTIATOR_DEF);
-		createEReference(responseNegotiatorDefEClass, RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER);
-
-		challengeNegotiatorDefEClass = createEClass(CHALLENGE_NEGOTIATOR_DEF);
-		createEReference(challengeNegotiatorDefEClass, CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER);
-		createEReference(challengeNegotiatorDefEClass, CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER);
-
-		tcpSelectorDefEClass = createEClass(TCP_SELECTOR_DEF);
-
-		serverProtocolFactoryDefEClass = createEClass(SERVER_PROTOCOL_FACTORY_DEF);
-
-		bufferProviderDefEClass = createEClass(BUFFER_PROVIDER_DEF);
-
-		bufferPoolDefEClass = createEClass(BUFFER_POOL_DEF);
-
-		protocolProviderDefEClass = createEClass(PROTOCOL_PROVIDER_DEF);
-
-		credentialsProviderDefEClass = createEClass(CREDENTIALS_PROVIDER_DEF);
-		createEAttribute(credentialsProviderDefEClass, CREDENTIALS_PROVIDER_DEF__USER_ID);
-
-		passwordCredentialsProviderDefEClass = createEClass(PASSWORD_CREDENTIALS_PROVIDER_DEF);
-		createEAttribute(passwordCredentialsProviderDefEClass, PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD);
-
-		userEClass = createEClass(USER);
-		createEAttribute(userEClass, USER__USER_ID);
-		createEAttribute(userEClass, USER__PASSWORD);
-
-		userManagerDefEClass = createEClass(USER_MANAGER_DEF);
-		createEReference(userManagerDefEClass, USER_MANAGER_DEF__USER);
-
-		randomizerDefEClass = createEClass(RANDOMIZER_DEF);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
-		tcpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
-		acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-		jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-		jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
-		httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
-		negotiatorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		responseNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
-		challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
-		tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
-		bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		bufferPoolDefEClass.getESuperTypes().add(this.getBufferProviderDef());
-		protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		credentialsProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		passwordCredentialsProviderDefEClass.getESuperTypes().add(this.getCredentialsProviderDef());
-		userManagerDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-		randomizerDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(connectorDefEClass, ConnectorDef.class, "ConnectorDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null, "executorService", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnectorDef_Negotiator(), this.getNegotiatorDef(), null, "negotiator", null, 0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnectorDef_ClientProtocolProvider(), this.getClientProtocolFactoryDef(), null, "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(clientProtocolFactoryDefEClass, ClientProtocolFactoryDef.class, "ClientProtocolFactoryDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1, TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTCPConnectorDef_Port(), ecorePackage.getEInt(), "port", null, 0, 1, TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null, "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAcceptorDef_Negotiator(), this.getNegotiatorDef(), null, "negotiator", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAcceptorDef_ServerProtocolProvider(), this.getServerProtocolFactoryDef(), null, "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tcpAcceptorDefEClass, TCPAcceptorDef.class, "TCPAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTCPAcceptorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1, TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jvmAcceptorDefEClass, JVMAcceptorDef.class, "JVMAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJVMAcceptorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jvmConnectorDefEClass, JVMConnectorDef.class, "JVMConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJVMConnectorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(httpConnectorDefEClass, HTTPConnectorDef.class, "HTTPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHTTPConnectorDef_Url(), ecorePackage.getEString(), "url", null, 0, 1, HTTPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(negotiatorDefEClass, NegotiatorDef.class, "NegotiatorDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null, "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1, ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1, ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tcpSelectorDefEClass, TCPSelectorDef.class, "TCPSelectorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(serverProtocolFactoryDefEClass, ServerProtocolFactoryDef.class, "ServerProtocolFactoryDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(bufferProviderDefEClass, BufferProviderDef.class, "BufferProviderDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(bufferPoolDefEClass, BufferPoolDef.class, "BufferPoolDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(protocolProviderDefEClass, ProtocolProviderDef.class, "ProtocolProviderDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(credentialsProviderDefEClass, CredentialsProviderDef.class, "CredentialsProviderDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCredentialsProviderDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, CredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(passwordCredentialsProviderDefEClass, PasswordCredentialsProviderDef.class, "PasswordCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPasswordCredentialsProviderDef_Password(), ecorePackage.getEString(), "password", null, 0, 1, PasswordCredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(randomizerDefEClass, RandomizerDef.class, "RandomizerDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //Net4jDefsPackageImpl
+public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPackage
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass connectorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass clientProtocolFactoryDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass tcpConnectorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass acceptorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass tcpAcceptorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass jvmAcceptorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass jvmConnectorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass httpConnectorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass negotiatorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass responseNegotiatorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass challengeNegotiatorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass tcpSelectorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass serverProtocolFactoryDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass bufferProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass bufferPoolDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass protocolProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass credentialsProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass passwordCredentialsProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass userManagerDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass randomizerDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass userEClass = 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.net4j.net4jdefs.Net4jDefsPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private Net4jDefsPackageImpl()
+  {
+    super(eNS_URI, Net4jDefsFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * 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 Net4jDefsPackage init()
+  {
+    if (isInited)
+    {
+      return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
+    }
+
+    // Obtain or create and register package
+    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE
+        .getEPackage(eNS_URI)
+        : new Net4jDefsPackageImpl());
+
+    isInited = true;
+
+    // Initialize simple dependencies
+    Net4jUtilDefsPackage.eINSTANCE.eClass();
+
+    // Create package meta-data objects
+    theNet4jDefsPackage.createPackageContents();
+
+    // Initialize created meta-data
+    theNet4jDefsPackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theNet4jDefsPackage.freeze();
+
+    return theNet4jDefsPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getConnectorDef()
+  {
+    return connectorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getConnectorDef_UserID()
+  {
+    return (EAttribute)connectorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getConnectorDef_BufferProvider()
+  {
+    return (EReference)connectorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getConnectorDef_ExecutorService()
+  {
+    return (EReference)connectorDefEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getConnectorDef_Negotiator()
+  {
+    return (EReference)connectorDefEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getConnectorDef_ClientProtocolProvider()
+  {
+    return (EReference)connectorDefEClass.getEStructuralFeatures().get(4);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getClientProtocolFactoryDef()
+  {
+    return clientProtocolFactoryDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getTCPConnectorDef()
+  {
+    return tcpConnectorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getTCPConnectorDef_TcpSelectorDef()
+  {
+    return (EReference)tcpConnectorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getTCPConnectorDef_Host()
+  {
+    return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getTCPConnectorDef_Port()
+  {
+    return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getAcceptorDef()
+  {
+    return acceptorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getAcceptorDef_BufferProvider()
+  {
+    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getAcceptorDef_ExecutorService()
+  {
+    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getAcceptorDef_Negotiator()
+  {
+    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getAcceptorDef_ServerProtocolProvider()
+  {
+    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getTCPAcceptorDef()
+  {
+    return tcpAcceptorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getTCPAcceptorDef_Host()
+  {
+    return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getTCPAcceptorDef_Port()
+  {
+    return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getTCPAcceptorDef_TcpSelectorDef()
+  {
+    return (EReference)tcpAcceptorDefEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getJVMAcceptorDef()
+  {
+    return jvmAcceptorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getJVMAcceptorDef_Name()
+  {
+    return (EAttribute)jvmAcceptorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getJVMConnectorDef()
+  {
+    return jvmConnectorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getJVMConnectorDef_Name()
+  {
+    return (EAttribute)jvmConnectorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getHTTPConnectorDef()
+  {
+    return httpConnectorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getHTTPConnectorDef_Url()
+  {
+    return (EAttribute)httpConnectorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getNegotiatorDef()
+  {
+    return negotiatorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getResponseNegotiatorDef()
+  {
+    return responseNegotiatorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getResponseNegotiatorDef_CredentialsProvider()
+  {
+    return (EReference)responseNegotiatorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getChallengeNegotiatorDef()
+  {
+    return challengeNegotiatorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getChallengeNegotiatorDef_UserManager()
+  {
+    return (EReference)challengeNegotiatorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getChallengeNegotiatorDef_Randomizer()
+  {
+    return (EReference)challengeNegotiatorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getTCPSelectorDef()
+  {
+    return tcpSelectorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getServerProtocolFactoryDef()
+  {
+    return serverProtocolFactoryDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getBufferProviderDef()
+  {
+    return bufferProviderDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getBufferPoolDef()
+  {
+    return bufferPoolDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getProtocolProviderDef()
+  {
+    return protocolProviderDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getCredentialsProviderDef()
+  {
+    return credentialsProviderDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getCredentialsProviderDef_UserID()
+  {
+    return (EAttribute)credentialsProviderDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getPasswordCredentialsProviderDef()
+  {
+    return passwordCredentialsProviderDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getPasswordCredentialsProviderDef_Password()
+  {
+    return (EAttribute)passwordCredentialsProviderDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getUserManagerDef()
+  {
+    return userManagerDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getUserManagerDef_User()
+  {
+    return (EReference)userManagerDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getRandomizerDef()
+  {
+    return randomizerDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getUser()
+  {
+    return userEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getUser_UserID()
+  {
+    return (EAttribute)userEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getUser_Password()
+  {
+    return (EAttribute)userEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jDefsFactory getNet4jDefsFactory()
+  {
+    return (Net4jDefsFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private boolean isCreated = false;
+
+  /**
+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated)
+    {
+      return;
+    }
+    isCreated = true;
+
+    // Create classes and their features
+    connectorDefEClass = createEClass(CONNECTOR_DEF);
+    createEAttribute(connectorDefEClass, CONNECTOR_DEF__USER_ID);
+    createEReference(connectorDefEClass, CONNECTOR_DEF__BUFFER_PROVIDER);
+    createEReference(connectorDefEClass, CONNECTOR_DEF__EXECUTOR_SERVICE);
+    createEReference(connectorDefEClass, CONNECTOR_DEF__NEGOTIATOR);
+    createEReference(connectorDefEClass, CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER);
+
+    clientProtocolFactoryDefEClass = createEClass(CLIENT_PROTOCOL_FACTORY_DEF);
+
+    tcpConnectorDefEClass = createEClass(TCP_CONNECTOR_DEF);
+    createEReference(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF);
+    createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__HOST);
+    createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__PORT);
+
+    acceptorDefEClass = createEClass(ACCEPTOR_DEF);
+    createEReference(acceptorDefEClass, ACCEPTOR_DEF__BUFFER_PROVIDER);
+    createEReference(acceptorDefEClass, ACCEPTOR_DEF__EXECUTOR_SERVICE);
+    createEReference(acceptorDefEClass, ACCEPTOR_DEF__NEGOTIATOR);
+    createEReference(acceptorDefEClass, ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
+
+    tcpAcceptorDefEClass = createEClass(TCP_ACCEPTOR_DEF);
+    createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__HOST);
+    createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__PORT);
+    createEReference(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF);
+
+    jvmAcceptorDefEClass = createEClass(JVM_ACCEPTOR_DEF);
+    createEAttribute(jvmAcceptorDefEClass, JVM_ACCEPTOR_DEF__NAME);
+
+    jvmConnectorDefEClass = createEClass(JVM_CONNECTOR_DEF);
+    createEAttribute(jvmConnectorDefEClass, JVM_CONNECTOR_DEF__NAME);
+
+    httpConnectorDefEClass = createEClass(HTTP_CONNECTOR_DEF);
+    createEAttribute(httpConnectorDefEClass, HTTP_CONNECTOR_DEF__URL);
+
+    negotiatorDefEClass = createEClass(NEGOTIATOR_DEF);
+
+    responseNegotiatorDefEClass = createEClass(RESPONSE_NEGOTIATOR_DEF);
+    createEReference(responseNegotiatorDefEClass, RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER);
+
+    challengeNegotiatorDefEClass = createEClass(CHALLENGE_NEGOTIATOR_DEF);
+    createEReference(challengeNegotiatorDefEClass, CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER);
+    createEReference(challengeNegotiatorDefEClass, CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER);
+
+    tcpSelectorDefEClass = createEClass(TCP_SELECTOR_DEF);
+
+    serverProtocolFactoryDefEClass = createEClass(SERVER_PROTOCOL_FACTORY_DEF);
+
+    bufferProviderDefEClass = createEClass(BUFFER_PROVIDER_DEF);
+
+    bufferPoolDefEClass = createEClass(BUFFER_POOL_DEF);
+
+    protocolProviderDefEClass = createEClass(PROTOCOL_PROVIDER_DEF);
+
+    credentialsProviderDefEClass = createEClass(CREDENTIALS_PROVIDER_DEF);
+    createEAttribute(credentialsProviderDefEClass, CREDENTIALS_PROVIDER_DEF__USER_ID);
+
+    passwordCredentialsProviderDefEClass = createEClass(PASSWORD_CREDENTIALS_PROVIDER_DEF);
+    createEAttribute(passwordCredentialsProviderDefEClass, PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD);
+
+    userEClass = createEClass(USER);
+    createEAttribute(userEClass, USER__USER_ID);
+    createEAttribute(userEClass, USER__PASSWORD);
+
+    userManagerDefEClass = createEClass(USER_MANAGER_DEF);
+    createEReference(userManagerDefEClass, USER_MANAGER_DEF__USER);
+
+    randomizerDefEClass = createEClass(RANDOMIZER_DEF);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @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);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    httpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    negotiatorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    responseNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
+    challengeNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
+    tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
+    protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    credentialsProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    passwordCredentialsProviderDefEClass.getESuperTypes().add(getCredentialsProviderDef());
+    userManagerDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    randomizerDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(connectorDefEClass, ConnectorDef.class, "ConnectorDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConnectorDef_BufferProvider(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
+        ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null,
+        "executorService", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConnectorDef_Negotiator(), getNegotiatorDef(), null, "negotiator", null, 0, 1,
+        ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConnectorDef_ClientProtocolProvider(), getClientProtocolFactoryDef(), null,
+        "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(clientProtocolFactoryDefEClass, ClientProtocolFactoryDef.class, "ClientProtocolFactoryDef", IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
+        TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTCPConnectorDef_Port(), ecorePackage.getEInt(), "port", null, 0, 1, TCPConnectorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
+        AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null,
+        "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAcceptorDef_Negotiator(), getNegotiatorDef(), null, "negotiator", null, 0, 1, AcceptorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getAcceptorDef_ServerProtocolProvider(), getServerProtocolFactoryDef(), null,
+        "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(tcpAcceptorDefEClass, TCPAcceptorDef.class, "TCPAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getTCPAcceptorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPAcceptorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTCPAcceptorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
+        TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(jvmAcceptorDefEClass, JVMAcceptorDef.class, "JVMAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getJVMAcceptorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMAcceptorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(jvmConnectorDefEClass, JVMConnectorDef.class, "JVMConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getJVMConnectorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMConnectorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(httpConnectorDefEClass, HTTPConnectorDef.class, "HTTPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getHTTPConnectorDef_Url(), ecorePackage.getEString(), "url", null, 0, 1, HTTPConnectorDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(negotiatorDefEClass, NegotiatorDef.class, "NegotiatorDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getResponseNegotiatorDef_CredentialsProvider(), getCredentialsProviderDef(), null,
+        "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChallengeNegotiatorDef_UserManager(), getUserManagerDef(), null, "userManager", null, 0, 1,
+        ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getChallengeNegotiatorDef_Randomizer(), getRandomizerDef(), null, "randomizer", null, 0, 1,
+        ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(tcpSelectorDefEClass, TCPSelectorDef.class, "TCPSelectorDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(serverProtocolFactoryDefEClass, ServerProtocolFactoryDef.class, "ServerProtocolFactoryDef", IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(bufferProviderDefEClass, BufferProviderDef.class, "BufferProviderDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(bufferPoolDefEClass, BufferPoolDef.class, "BufferPoolDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(protocolProviderDefEClass, ProtocolProviderDef.class, "ProtocolProviderDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(credentialsProviderDefEClass, CredentialsProviderDef.class, "CredentialsProviderDef", IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCredentialsProviderDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1,
+        CredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(passwordCredentialsProviderDefEClass, PasswordCredentialsProviderDef.class,
+        "PasswordCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPasswordCredentialsProviderDef_Password(), ecorePackage.getEString(), "password", null, 0, 1,
+        PasswordCredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, User.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getUserManagerDef_User(), getUser(), null, "user", null, 1, -1, UserManagerDef.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+
+    initEClass(randomizerDefEClass, RandomizerDef.class, "RandomizerDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    // Create resource
+    createResource(eNS_URI);
+  }
+
+} // Net4jDefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/PasswordCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/PasswordCredentialsProviderDefImpl.java
index a2365a2ece..f8990d1630 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/PasswordCredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/PasswordCredentialsProviderDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PasswordCredentialsProviderDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: PasswordCredentialsProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -18,167 +18,194 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Password Credentials Provider Def</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Password Credentials Provider Def</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl#getPassword <em>Password</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.PasswordCredentialsProviderDefImpl#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefImpl implements PasswordCredentialsProviderDef {
-
-	/**
-	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PASSWORD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected String password = PASSWORD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PasswordCredentialsProviderDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.PASSWORD_CREDENTIALS_PROVIDER_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPassword(String newPassword) {
-		String oldPassword = password;
-		password = newPassword;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD, oldPassword, password));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
-				return getPassword();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
-				setPassword((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
-				setPassword(PASSWORD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
-				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
-		}
-		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(" (password: ");
-		result.append(password);
-		result.append(')');
-		return result.toString();
-	}
-
-	@Override
-	protected Object createInstance() {
-		IPasswordCredentials passwordCredential = new PasswordCredentials(getUserID(), getPassword().toCharArray());
-		PasswordCredentialsProvider passwordCredentialsProvider = new PasswordCredentialsProvider(passwordCredential );
-		return passwordCredentialsProvider;
-	}
-	
-	@Override
-	protected void validateDefinition() {
-		CheckUtil.checkState(getUserID() != null && getUserID().length() > 0, "userID is not set!");
-		CheckUtil.checkState(getPassword() != null && getPassword().length() > 0, "password is not set!");
-		super.validateDefinition();
-	}
-	
-
-} //PasswordCredentialsProviderDefImpl
+public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefImpl implements
+    PasswordCredentialsProviderDef
+{
+
+  /**
+   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getPassword()
+   * @generated
+   * @ordered
+   */
+  protected static final String PASSWORD_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getPassword()
+   * @generated
+   * @ordered
+   */
+  protected String password = PASSWORD_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected PasswordCredentialsProviderDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.PASSWORD_CREDENTIALS_PROVIDER_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getPassword()
+  {
+    return password;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setPassword(String newPassword)
+  {
+    String oldPassword = password;
+    password = newPassword;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET,
+          Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD, oldPassword, password));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
+      return getPassword();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
+      setPassword((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
+      setPassword(PASSWORD_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD:
+      return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+    }
+    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(" (password: ");
+    result.append(password);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected Object createInstance()
+  {
+    IPasswordCredentials passwordCredential = new PasswordCredentials(getUserID(), getPassword().toCharArray());
+    PasswordCredentialsProvider passwordCredentialsProvider = new PasswordCredentialsProvider(passwordCredential);
+    return passwordCredentialsProvider;
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    CheckUtil.checkState(getUserID() != null && getUserID().length() > 0, "userID is not set!");
+    CheckUtil.checkState(getPassword() != null && getPassword().length() > 0, "password is not set!");
+    super.validateDefinition();
+  }
+
+} // PasswordCredentialsProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ProtocolProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ProtocolProviderDefImpl.java
index 18ea454aae..c971ea6b90 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ProtocolProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ProtocolProviderDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProtocolProviderDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ProtocolProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -13,32 +13,34 @@ 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>Protocol Provider Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class ProtocolProviderDefImpl extends DefImpl implements ProtocolProviderDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProtocolProviderDefImpl() {
-		super();
-	}
+public abstract class ProtocolProviderDefImpl extends DefImpl implements ProtocolProviderDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ProtocolProviderDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.PROTOCOL_PROVIDER_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.PROTOCOL_PROVIDER_DEF;
+  }
 
-} //ProtocolProviderDefImpl
+} // ProtocolProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ResponseNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ResponseNegotiatorDefImpl.java
index 87fb99bc68..57f3f96527 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ResponseNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ResponseNegotiatorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ResponseNegotiatorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ResponseNegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -18,144 +18,180 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Response Negotiator Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Response Negotiator Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl#getCredentialsProvider <em>Credentials Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.ResponseNegotiatorDefImpl#getCredentialsProvider <em>Credentials Provider
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements
-		ResponseNegotiatorDef {
-	/**
-	 * The cached value of the '{@link #getCredentialsProvider() <em>Credentials Provider</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getCredentialsProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected CredentialsProviderDef credentialsProvider;
+public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements ResponseNegotiatorDef
+{
+  /**
+   * The cached value of the '{@link #getCredentialsProvider() <em>Credentials Provider</em>}' reference. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getCredentialsProvider()
+   * @generated
+   * @ordered
+   */
+  protected CredentialsProviderDef credentialsProvider;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResponseNegotiatorDefImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ResponseNegotiatorDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.RESPONSE_NEGOTIATOR_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.RESPONSE_NEGOTIATOR_DEF;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CredentialsProviderDef getCredentialsProvider() {
-		if (credentialsProvider != null && credentialsProvider.eIsProxy()) {
-			InternalEObject oldCredentialsProvider = (InternalEObject)credentialsProvider;
-			credentialsProvider = (CredentialsProviderDef)eResolveProxy(oldCredentialsProvider);
-			if (credentialsProvider != oldCredentialsProvider) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider, credentialsProvider));
-			}
-		}
-		return credentialsProvider;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CredentialsProviderDef getCredentialsProvider()
+  {
+    if (credentialsProvider != null && credentialsProvider.eIsProxy())
+    {
+      InternalEObject oldCredentialsProvider = (InternalEObject)credentialsProvider;
+      credentialsProvider = (CredentialsProviderDef)eResolveProxy(oldCredentialsProvider);
+      if (credentialsProvider != oldCredentialsProvider)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider,
+              credentialsProvider));
+        }
+      }
+    }
+    return credentialsProvider;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CredentialsProviderDef basicGetCredentialsProvider() {
-		return credentialsProvider;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CredentialsProviderDef basicGetCredentialsProvider()
+  {
+    return credentialsProvider;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCredentialsProvider(
-			CredentialsProviderDef newCredentialsProvider) {
-		CredentialsProviderDef oldCredentialsProvider = credentialsProvider;
-		credentialsProvider = newCredentialsProvider;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider, credentialsProvider));
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setCredentialsProvider(CredentialsProviderDef newCredentialsProvider)
+  {
+    CredentialsProviderDef oldCredentialsProvider = credentialsProvider;
+    credentialsProvider = newCredentialsProvider;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET,
+          Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider, credentialsProvider));
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
-				if (resolve) return getCredentialsProvider();
-				return basicGetCredentialsProvider();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
+      if (resolve)
+      {
+        return getCredentialsProvider();
+      }
+      return basicGetCredentialsProvider();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
-				setCredentialsProvider((CredentialsProviderDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
+      setCredentialsProvider((CredentialsProviderDef)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
-				setCredentialsProvider((CredentialsProviderDef)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
+      setCredentialsProvider((CredentialsProviderDef)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
-				return credentialsProvider != null;
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
+      return credentialsProvider != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
-	@Override
-	protected Object createInstance() {
-		ResponseNegotiator responseNegotiator = new ResponseNegotiator();
-		responseNegotiator
-				.setCredentialsProvider((IPasswordCredentialsProvider) getCredentialsProvider()
-						.getInstance());
-		return responseNegotiator;
-	}
+  /**
+   * @ADDED
+   */
+  @Override
+  protected Object createInstance()
+  {
+    ResponseNegotiator responseNegotiator = new ResponseNegotiator();
+    responseNegotiator.setCredentialsProvider((IPasswordCredentialsProvider)getCredentialsProvider().getInstance());
+    return responseNegotiator;
+  }
 
 } // ResponseNegotiatorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPAcceptorDefImpl.java
index 3d40bac6eb..e62f07d4dc 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPAcceptorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPAcceptorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: TCPAcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -20,270 +20,332 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getHost <em>Host</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getHost <em>Host</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class TCPAcceptorDefImpl extends AcceptorDefImpl implements
-		TCPAcceptorDef {
-	/**
-	 * The default value of the '{@link #getHost() <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getHost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOST_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getHost()
-	 * @generated
-	 * @ordered
-	 */
-	protected String host = HOST_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getPort() <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getPort()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PORT_EDEFAULT = 0;
-	/**
-	 * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getPort()
-	 * @generated
-	 * @ordered
-	 */
-	protected int port = PORT_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getTcpSelectorDef()
-	 * @generated
-	 * @ordered
-	 */
-	protected TCPSelectorDef tcpSelectorDef;
+public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDef
+{
+  /**
+   * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getHost()
+   * @generated
+   * @ordered
+   */
+  protected static final String HOST_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getHost()
+   * @generated
+   * @ordered
+   */
+  protected String host = HOST_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getPort()
+   * @generated
+   * @ordered
+   */
+  protected static final int PORT_EDEFAULT = 0;
+
+  /**
+   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getPort()
+   * @generated
+   * @ordered
+   */
+  protected int port = PORT_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getTcpSelectorDef()
+   * @generated
+   * @ordered
+   */
+  protected TCPSelectorDef tcpSelectorDef;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TCPAcceptorDefImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected TCPAcceptorDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.TCP_ACCEPTOR_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.TCP_ACCEPTOR_DEF;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHost() {
-		return host;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getHost()
+  {
+    return host;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHost(String newHost) {
-		String oldHost = host;
-		host = newHost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHost(String newHost)
+  {
+    String oldHost = host;
+    host = newHost;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getPort() {
-		return port;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getPort()
+  {
+    return port;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPort(int newPort) {
-		int oldPort = port;
-		port = newPort;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setPort(int newPort)
+  {
+    int oldPort = port;
+    port = newPort;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TCPSelectorDef getTcpSelectorDef() {
-		if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy()) {
-			InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
-			tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
-			if (tcpSelectorDef != oldTcpSelectorDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-			}
-		}
-		return tcpSelectorDef;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public TCPSelectorDef getTcpSelectorDef()
+  {
+    if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy())
+    {
+      InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
+      tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
+      if (tcpSelectorDef != oldTcpSelectorDef)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        }
+      }
+    }
+    return tcpSelectorDef;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TCPSelectorDef basicGetTcpSelectorDef() {
-		return tcpSelectorDef;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public TCPSelectorDef basicGetTcpSelectorDef()
+  {
+    return tcpSelectorDef;
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef) {
-		TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
-		tcpSelectorDef = newTcpSelectorDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
+  {
+    TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
+    tcpSelectorDef = newTcpSelectorDef;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
+          oldTcpSelectorDef, tcpSelectorDef));
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-				return getHost();
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-				return new Integer(getPort());
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-				if (resolve) return getTcpSelectorDef();
-				return basicGetTcpSelectorDef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
+      return getHost();
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
+      return new Integer(getPort());
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
+      if (resolve)
+      {
+        return getTcpSelectorDef();
+      }
+      return basicGetTcpSelectorDef();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-				setHost((String)newValue);
-				return;
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-				setPort(((Integer)newValue).intValue());
-				return;
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-				setTcpSelectorDef((TCPSelectorDef)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
+      setHost((String)newValue);
+      return;
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
+      setPort(((Integer)newValue).intValue());
+      return;
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
+      setTcpSelectorDef((TCPSelectorDef)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-				setHost(HOST_EDEFAULT);
-				return;
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-				setPort(PORT_EDEFAULT);
-				return;
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-				setTcpSelectorDef((TCPSelectorDef)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
+      setHost(HOST_EDEFAULT);
+      return;
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
+      setPort(PORT_EDEFAULT);
+      return;
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
+      setTcpSelectorDef((TCPSelectorDef)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-				return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-				return port != PORT_EDEFAULT;
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-				return tcpSelectorDef != null;
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
+      return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
+      return port != PORT_EDEFAULT;
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
+      return tcpSelectorDef != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+    {
+      return super.toString();
+    }
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (host: ");
-		result.append(host);
-		result.append(", port: ");
-		result.append(port);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (host: ");
+    result.append(host);
+    result.append(", port: ");
+    result.append(port);
+    result.append(')');
+    return result.toString();
+  }
 
-	@Override
-	protected ITCPAcceptor createInstance() {
-		TCPSelector tcpSelector = (TCPSelector) getTcpSelectorDef()
-				.getInstance();
+  /**
+   * @ADDED
+   */
+  @Override
+  protected ITCPAcceptor createInstance()
+  {
+    TCPSelector tcpSelector = (TCPSelector)getTcpSelectorDef().getInstance();
 
-		TCPAcceptor tcpAcceptor = new TCPAcceptor();
+    TCPAcceptor tcpAcceptor = new TCPAcceptor();
 
-		tcpAcceptor.setStartSynchronously(true);
-		tcpAcceptor.setSynchronousStartTimeout(500l);
-		configure(tcpAcceptor.getConfig());
-		tcpAcceptor.setSelector(tcpSelector);
+    tcpAcceptor.setStartSynchronously(true);
+    tcpAcceptor.setSynchronousStartTimeout(500l);
+    configure(tcpAcceptor.getConfig());
+    tcpAcceptor.setSelector(tcpSelector);
 
-		tcpAcceptor.setAddress(getHost());
-		tcpAcceptor.setPort(getPort());
+    tcpAcceptor.setAddress(getHost());
+    tcpAcceptor.setPort(getPort());
 
-		return tcpAcceptor;
-	}
+    return tcpAcceptor;
+  }
 
-	@Override
-	protected void validateDefinition() {
-		super.validateDefinition();
-		CheckUtil.checkState(getTcpSelectorDef() != null,
-				"tcp selector not set!");
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST), "host not set!");
-		CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT), "port not set!");
-	}
+  /**
+   * @ADDED
+   */
+  @Override
+  protected void validateDefinition()
+  {
+    super.validateDefinition();
+    CheckUtil.checkState(getTcpSelectorDef() != null, "tcp selector not set!");
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST), "host not set!");
+    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT), "port not set!");
+  }
 
 } // TCPAcceptorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPConnectorDefImpl.java
index 5967bcd5db..87ecd817e8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPConnectorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPConnectorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: TCPConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -36,13 +36,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnectorDef
 {
   /**
-	 * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-	 * @see #getTcpSelectorDef()
-	 * @generated
-	 * @ordered
-	 */
+   * 
+   * @see #getTcpSelectorDef()
+   * @generated
+   * @ordered
+   */
   protected TCPSelectorDef tcpSelectorDef;
 
   /**
@@ -56,12 +56,12 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   protected static final String HOST_EDEFAULT = null;
 
   /**
-	 * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getHost()
-	 * @generated
-	 * @ordered
-	 */
+   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getHost()
+   * @generated
+   * @ordered
+   */
   protected String host = HOST_EDEFAULT;
 
   /**
@@ -75,99 +75,116 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   protected static final int PORT_EDEFAULT = 0;
 
   /**
-	 * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getPort()
-	 * @generated
-	 * @ordered
-	 */
+   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getPort()
+   * @generated
+   * @ordered
+   */
   protected int port = PORT_EDEFAULT;
 
   /**
-	 * This is true if the Port attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * This is true if the Port attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
   protected boolean portESet;
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   protected TCPConnectorDefImpl()
   {
-		super();
-	}
+    super();
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-		return Net4jDefsPackage.Literals.TCP_CONNECTOR_DEF;
-	}
+    return Net4jDefsPackage.Literals.TCP_CONNECTOR_DEF;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public TCPSelectorDef getTcpSelectorDef()
   {
-		if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy()) {
-			InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
-			tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
-			if (tcpSelectorDef != oldTcpSelectorDef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-			}
-		}
-		return tcpSelectorDef;
-	}
+    if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy())
+    {
+      InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
+      tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
+      if (tcpSelectorDef != oldTcpSelectorDef)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        }
+      }
+    }
+    return tcpSelectorDef;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public TCPSelectorDef basicGetTcpSelectorDef()
   {
-		return tcpSelectorDef;
-	}
+    return tcpSelectorDef;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
   {
-		TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
-		tcpSelectorDef = newTcpSelectorDef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-	}
+    TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
+    tcpSelectorDef = newTcpSelectorDef;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF,
+          oldTcpSelectorDef, tcpSelectorDef));
+    }
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public String getHost()
   {
-		return host;
-	}
+    return host;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public void setHost(String newHost)
   {
-		String oldHost = host;
-		host = newHost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
-	}
+    String oldHost = host;
+    host = newHost;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
+    }
+  }
 
   /**
    * <!-- begin-user-doc -->gets the <b>port</b> of this connector. If the port was not set, the
@@ -192,143 +209,177 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
    */
   public int getPortGen()
   {
-		return port;
-	}
+    return port;
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public void setPort(int newPort)
   {
-		int oldPort = port;
-		port = newPort;
-		boolean oldPortESet = portESet;
-		portESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port, !oldPortESet));
-	}
+    int oldPort = port;
+    port = newPort;
+    boolean oldPortESet = portESet;
+    portESet = true;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port,
+          !oldPortESet));
+    }
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public void unsetPort()
   {
-		int oldPort = port;
-		boolean oldPortESet = portESet;
-		port = PORT_EDEFAULT;
-		portESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, PORT_EDEFAULT, oldPortESet));
-	}
+    int oldPort = port;
+    boolean oldPortESet = portESet;
+    port = PORT_EDEFAULT;
+    portESet = false;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort,
+          PORT_EDEFAULT, oldPortESet));
+    }
+  }
 
   /**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public boolean isSetPort()
   {
-		return portESet;
-	}
+    return portESet;
+  }
 
   /**
-	 * <!-- 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 Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-				if (resolve) return getTcpSelectorDef();
-				return basicGetTcpSelectorDef();
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-				return getHost();
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-				return new Integer(getPort());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
+      if (resolve)
+      {
+        return getTcpSelectorDef();
+      }
+      return basicGetTcpSelectorDef();
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
+      return getHost();
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
+      return new Integer(getPort());
+    }
+    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 Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-				setTcpSelectorDef((TCPSelectorDef)newValue);
-				return;
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-				setHost((String)newValue);
-				return;
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-				setPort(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
+      setTcpSelectorDef((TCPSelectorDef)newValue);
+      return;
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
+      setHost((String)newValue);
+      return;
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
+      setPort(((Integer)newValue).intValue());
+      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 Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-				setTcpSelectorDef((TCPSelectorDef)null);
-				return;
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-				setHost(HOST_EDEFAULT);
-				return;
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-				unsetPort();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
+      setTcpSelectorDef((TCPSelectorDef)null);
+      return;
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
+      setHost(HOST_EDEFAULT);
+      return;
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
+      unsetPort();
+      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 Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-				return tcpSelectorDef != null;
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-				return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-				return isSetPort();
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
+      return tcpSelectorDef != null;
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
+      return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
+      return isSetPort();
+    }
+    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(" (host: ");
-		result.append(host);
-		result.append(", port: ");
-		if (portESet) result.append(port); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (host: ");
+    result.append(host);
+    result.append(", port: ");
+    if (portESet)
+    {
+      result.append(port);
+    }
+    else
+    {
+      result.append("<unset>");
+    }
+    result.append(')');
+    return result.toString();
+  }
 
+  /**
+   * @ADDED
+   */
   @Override
   protected ITCPConnector createInstance()
   {
@@ -342,6 +393,9 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     return connector;
   }
 
+  /**
+   * @ADDED
+   */
   @Override
   protected void validateDefinition()
   {
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPSelectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPSelectorDefImpl.java
index cdbe3cc61c..393746dbf8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPSelectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/TCPSelectorDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TCPSelectorDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: TCPSelectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -14,45 +14,47 @@ 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>TCP Selector Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TCPSelectorDefImpl() {
-		super();
-	}
+public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected TCPSelectorDefImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.TCP_SELECTOR_DEF;
-	}
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.TCP_SELECTOR_DEF;
+  }
 
-	/**
-	 * Creates and returns a {@link TCPSelector}.
-	 * 
-	 * @return a new tcp selector instance
-	 * 
-	 * @generated NOT
-	 */
-	@Override
-	public Object createInstance() {
-		TCPSelector selector = new TCPSelector();
-		selector.activate();
-		return selector;
-	}
-} //TCPSelectorDefImpl
+  /**
+   * Creates and returns a {@link TCPSelector}.
+   * 
+   * @return a new tcp selector instance
+   * @generated NOT
+   */
+  @Override
+  public Object createInstance()
+  {
+    TCPSelector selector = new TCPSelector();
+    selector.activate();
+    return selector;
+  }
+} // TCPSelectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java
index e7c36a0d46..68df079476 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UserImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: UserImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -15,205 +15,226 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>User</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>User</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.UserImpl#getUserID <em>User ID</em>}</li>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.UserImpl#getPassword <em>Password</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.UserImpl#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.UserImpl#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class UserImpl extends EObjectImpl implements User {
-	/**
-	 * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USER_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String userID = USER_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PASSWORD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected String password = PASSWORD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UserImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.USER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUserID() {
-		return userID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUserID(String newUserID) {
-		String oldUserID = userID;
-		userID = newUserID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.USER__USER_ID, oldUserID, userID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPassword(String newPassword) {
-		String oldPassword = password;
-		password = newPassword;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.USER__PASSWORD, oldPassword, password));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER__USER_ID:
-				return getUserID();
-			case Net4jDefsPackage.USER__PASSWORD:
-				return getPassword();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER__USER_ID:
-				setUserID((String)newValue);
-				return;
-			case Net4jDefsPackage.USER__PASSWORD:
-				setPassword((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER__USER_ID:
-				setUserID(USER_ID_EDEFAULT);
-				return;
-			case Net4jDefsPackage.USER__PASSWORD:
-				setPassword(PASSWORD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER__USER_ID:
-				return USER_ID_EDEFAULT == null ? userID != null : !USER_ID_EDEFAULT.equals(userID);
-			case Net4jDefsPackage.USER__PASSWORD:
-				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
-		}
-		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(" (userID: ");
-		result.append(userID);
-		result.append(", password: ");
-		result.append(password);
-		result.append(')');
-		return result.toString();
-	}
-
-} //UserImpl
+public class UserImpl extends EObjectImpl implements User
+{
+  /**
+   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getUserID()
+   * @generated
+   * @ordered
+   */
+  protected static final String USER_ID_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getUserID()
+   * @generated
+   * @ordered
+   */
+  protected String userID = USER_ID_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getPassword()
+   * @generated
+   * @ordered
+   */
+  protected static final String PASSWORD_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getPassword()
+   * @generated
+   * @ordered
+   */
+  protected String password = PASSWORD_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected UserImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.USER;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getUserID()
+  {
+    return userID;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setUserID(String newUserID)
+  {
+    String oldUserID = userID;
+    userID = newUserID;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.USER__USER_ID, oldUserID, userID));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getPassword()
+  {
+    return password;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setPassword(String newPassword)
+  {
+    String oldPassword = password;
+    password = newPassword;
+    if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.USER__PASSWORD, oldPassword, password));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER__USER_ID:
+      return getUserID();
+    case Net4jDefsPackage.USER__PASSWORD:
+      return getPassword();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER__USER_ID:
+      setUserID((String)newValue);
+      return;
+    case Net4jDefsPackage.USER__PASSWORD:
+      setPassword((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER__USER_ID:
+      setUserID(USER_ID_EDEFAULT);
+      return;
+    case Net4jDefsPackage.USER__PASSWORD:
+      setPassword(PASSWORD_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER__USER_ID:
+      return USER_ID_EDEFAULT == null ? userID != null : !USER_ID_EDEFAULT.equals(userID);
+    case Net4jDefsPackage.USER__PASSWORD:
+      return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+    }
+    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(" (userID: ");
+    result.append(userID);
+    result.append(", password: ");
+    result.append(password);
+    result.append(')');
+    return result.toString();
+  }
+
+} // UserImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserManagerDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserManagerDefImpl.java
index aca1d01729..6c3e856771 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserManagerDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserManagerDefImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UserManagerDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: UserManagerDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.impl;
 
@@ -20,142 +20,164 @@ import org.eclipse.emf.ecore.util.InternalEList;
 import java.util.Collection;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>User Manager Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>User Manager Def</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl#getUser <em>User</em>}</li>
+ * <li>{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl#getUser <em>User</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class UserManagerDefImpl extends DefImpl implements UserManagerDef {
-	/**
-	 * The cached value of the '{@link #getUser() <em>User</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUser()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<User> user;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UserManagerDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jDefsPackage.Literals.USER_MANAGER_DEF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<User> getUser() {
-		if (user == null) {
-			user = new EObjectResolvingEList.Unsettable<User>(User.class, this, Net4jDefsPackage.USER_MANAGER_DEF__USER);
-		}
-		return user;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUser() {
-		if (user != null) ((InternalEList.Unsettable<?>)user).unset();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUser() {
-		return user != null && ((InternalEList.Unsettable<?>)user).isSet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER_MANAGER_DEF__USER:
-				return getUser();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER_MANAGER_DEF__USER:
-				getUser().clear();
-				getUser().addAll((Collection<? extends User>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER_MANAGER_DEF__USER:
-				unsetUser();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jDefsPackage.USER_MANAGER_DEF__USER:
-				return isSetUser();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	@Override
-	protected Object createInstance() {
-		UserManager userManager = new UserManager();
-		return userManager;
-
-	}
-
-} //UserManagerDefImpl
+public class UserManagerDefImpl extends DefImpl implements UserManagerDef
+{
+  /**
+   * The cached value of the '{@link #getUser() <em>User</em>}' reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getUser()
+   * @generated
+   * @ordered
+   */
+  protected EList<User> user;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected UserManagerDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jDefsPackage.Literals.USER_MANAGER_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EList<User> getUser()
+  {
+    if (user == null)
+    {
+      user = new EObjectResolvingEList.Unsettable<User>(User.class, this, Net4jDefsPackage.USER_MANAGER_DEF__USER);
+    }
+    return user;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetUser()
+  {
+    if (user != null)
+    {
+      ((InternalEList.Unsettable<?>)user).unset();
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetUser()
+  {
+    return user != null && ((InternalEList.Unsettable<?>)user).isSet();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER_MANAGER_DEF__USER:
+      return getUser();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER_MANAGER_DEF__USER:
+      getUser().clear();
+      getUser().addAll((Collection<? extends User>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER_MANAGER_DEF__USER:
+      unsetUser();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jDefsPackage.USER_MANAGER_DEF__USER:
+      return isSetUser();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * @ADDED
+   */
+  @Override
+  protected Object createInstance()
+  {
+    UserManager userManager = new UserManager();
+    return userManager;
+
+  }
+
+} // UserManagerDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/ConnectorDefBuilder.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/ConnectorDefBuilder.java
index ad86d31573..6ce76a350a 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/ConnectorDefBuilder.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/ConnectorDefBuilder.java
@@ -1,3 +1,13 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
 package org.eclipse.net4j.net4jdefs.util;
 
 import org.eclipse.net4j.net4jdefs.BufferProviderDef;
@@ -5,9 +15,11 @@ import org.eclipse.net4j.net4jdefs.ConnectorDef;
 import org.eclipse.net4j.util.CheckUtil;
 import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
 
+/**
+ * @author Eike Stepper
+ */
 public class ConnectorDefBuilder
 {
-
   protected BufferProviderDef bufferProviderDef;
 
   protected ExecutorServiceDef executorServiceDef;
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsAdapterFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsAdapterFactory.java
index e70485d0f7..319156804f 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsAdapterFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: Net4jDefsAdapterFactory.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.util;
 
@@ -36,487 +36,545 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
+ * method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage
  * @generated
  */
-public class Net4jDefsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jDefsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = Net4jDefsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		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 -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Net4jDefsSwitch<Adapter> modelSwitch =
-		new Net4jDefsSwitch<Adapter>() {
-			@Override
-			public Adapter caseConnectorDef(ConnectorDef object) {
-				return createConnectorDefAdapter();
-			}
-			@Override
-			public Adapter caseClientProtocolFactoryDef(ClientProtocolFactoryDef object) {
-				return createClientProtocolFactoryDefAdapter();
-			}
-			@Override
-			public Adapter caseTCPConnectorDef(TCPConnectorDef object) {
-				return createTCPConnectorDefAdapter();
-			}
-			@Override
-			public Adapter caseAcceptorDef(AcceptorDef object) {
-				return createAcceptorDefAdapter();
-			}
-			@Override
-			public Adapter caseTCPAcceptorDef(TCPAcceptorDef object) {
-				return createTCPAcceptorDefAdapter();
-			}
-			@Override
-			public Adapter caseJVMAcceptorDef(JVMAcceptorDef object) {
-				return createJVMAcceptorDefAdapter();
-			}
-			@Override
-			public Adapter caseJVMConnectorDef(JVMConnectorDef object) {
-				return createJVMConnectorDefAdapter();
-			}
-			@Override
-			public Adapter caseHTTPConnectorDef(HTTPConnectorDef object) {
-				return createHTTPConnectorDefAdapter();
-			}
-			@Override
-			public Adapter caseNegotiatorDef(NegotiatorDef object) {
-				return createNegotiatorDefAdapter();
-			}
-			@Override
-			public Adapter caseResponseNegotiatorDef(ResponseNegotiatorDef object) {
-				return createResponseNegotiatorDefAdapter();
-			}
-			@Override
-			public Adapter caseChallengeNegotiatorDef(ChallengeNegotiatorDef object) {
-				return createChallengeNegotiatorDefAdapter();
-			}
-			@Override
-			public Adapter caseTCPSelectorDef(TCPSelectorDef object) {
-				return createTCPSelectorDefAdapter();
-			}
-			@Override
-			public Adapter caseServerProtocolFactoryDef(ServerProtocolFactoryDef object) {
-				return createServerProtocolFactoryDefAdapter();
-			}
-			@Override
-			public Adapter caseBufferProviderDef(BufferProviderDef object) {
-				return createBufferProviderDefAdapter();
-			}
-			@Override
-			public Adapter caseBufferPoolDef(BufferPoolDef object) {
-				return createBufferPoolDefAdapter();
-			}
-			@Override
-			public Adapter caseProtocolProviderDef(ProtocolProviderDef object) {
-				return createProtocolProviderDefAdapter();
-			}
-			@Override
-			public Adapter caseCredentialsProviderDef(CredentialsProviderDef object) {
-				return createCredentialsProviderDefAdapter();
-			}
-			@Override
-			public Adapter casePasswordCredentialsProviderDef(PasswordCredentialsProviderDef object) {
-				return createPasswordCredentialsProviderDefAdapter();
-			}
-			@Override
-			public Adapter caseUser(User object) {
-				return createUserAdapter();
-			}
-			@Override
-			public Adapter caseUserManagerDef(UserManagerDef object) {
-				return createUserManagerDefAdapter();
-			}
-			@Override
-			public Adapter caseRandomizerDef(RandomizerDef object) {
-				return createRandomizerDefAdapter();
-			}
-			@Override
-			public Adapter caseDef(Def object) {
-				return createDefAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ConnectorDef <em>Connector 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.ConnectorDef
-	 * @generated
-	 */
-	public Adapter createConnectorDefAdapter() {
-		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 -->
-	 * 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
-	 */
-	public Adapter createClientProtocolFactoryDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef <em>TCP Connector 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.TCPConnectorDef
-	 * @generated
-	 */
-	public Adapter createTCPConnectorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.AcceptorDef <em>Acceptor 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.AcceptorDef
-	 * @generated
-	 */
-	public Adapter createAcceptorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef <em>TCP Acceptor 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.TCPAcceptorDef
-	 * @generated
-	 */
-	public Adapter createTCPAcceptorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef <em>JVM Acceptor 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.JVMAcceptorDef
-	 * @generated
-	 */
-	public Adapter createJVMAcceptorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef <em>JVM Connector 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.JVMConnectorDef
-	 * @generated
-	 */
-	public Adapter createJVMConnectorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef <em>HTTP Connector 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.HTTPConnectorDef
-	 * @generated
-	 */
-	public Adapter createHTTPConnectorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.NegotiatorDef <em>Negotiator 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.NegotiatorDef
-	 * @generated
-	 */
-	public Adapter createNegotiatorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef <em>Response Negotiator 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.ResponseNegotiatorDef
-	 * @generated
-	 */
-	public Adapter createResponseNegotiatorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef <em>Challenge Negotiator 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.ChallengeNegotiatorDef
-	 * @generated
-	 */
-	public Adapter createChallengeNegotiatorDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPSelectorDef <em>TCP Selector 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.TCPSelectorDef
-	 * @generated
-	 */
-	public Adapter createTCPSelectorDefAdapter() {
-		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;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.BufferProviderDef <em>Buffer 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.BufferProviderDef
-	 * @generated
-	 */
-	public Adapter createBufferProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.BufferPoolDef <em>Buffer Pool 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.BufferPoolDef
-	 * @generated
-	 */
-	public Adapter createBufferPoolDefAdapter() {
-		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 -->
-	 * 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
-	 */
-	public Adapter createProtocolProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef <em>Credentials 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.CredentialsProviderDef
-	 * @generated
-	 */
-	public Adapter createCredentialsProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef <em>Password Credentials 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.PasswordCredentialsProviderDef
-	 * @generated
-	 */
-	public Adapter createPasswordCredentialsProviderDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.UserManagerDef <em>User Manager 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.UserManagerDef
-	 * @generated
-	 */
-	public Adapter createUserManagerDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.RandomizerDef <em>Randomizer 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.RandomizerDef
-	 * @generated
-	 */
-	public Adapter createRandomizerDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.User <em>User</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.User
-	 * @generated
-	 */
-	public Adapter createUserAdapter() {
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public Adapter createDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //Net4jDefsAdapterFactory
+public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected static Net4jDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jDefsAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Net4jDefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    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 --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected Net4jDefsSwitch<Adapter> modelSwitch = new Net4jDefsSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseConnectorDef(ConnectorDef object)
+    {
+      return createConnectorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
+    {
+      return createClientProtocolFactoryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseTCPConnectorDef(TCPConnectorDef object)
+    {
+      return createTCPConnectorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseAcceptorDef(AcceptorDef object)
+    {
+      return createAcceptorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseTCPAcceptorDef(TCPAcceptorDef object)
+    {
+      return createTCPAcceptorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseJVMAcceptorDef(JVMAcceptorDef object)
+    {
+      return createJVMAcceptorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseJVMConnectorDef(JVMConnectorDef object)
+    {
+      return createJVMConnectorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseHTTPConnectorDef(HTTPConnectorDef object)
+    {
+      return createHTTPConnectorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseNegotiatorDef(NegotiatorDef object)
+    {
+      return createNegotiatorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseResponseNegotiatorDef(ResponseNegotiatorDef object)
+    {
+      return createResponseNegotiatorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseChallengeNegotiatorDef(ChallengeNegotiatorDef object)
+    {
+      return createChallengeNegotiatorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseTCPSelectorDef(TCPSelectorDef object)
+    {
+      return createTCPSelectorDefAdapter();
+    }
+
+    @Override
+    public Adapter caseServerProtocolFactoryDef(ServerProtocolFactoryDef object)
+    {
+      return createServerProtocolFactoryDefAdapter();
+    }
+
+    @Override
+    public Adapter caseBufferProviderDef(BufferProviderDef object)
+    {
+      return createBufferProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter caseBufferPoolDef(BufferPoolDef object)
+    {
+      return createBufferPoolDefAdapter();
+    }
+
+    @Override
+    public Adapter caseProtocolProviderDef(ProtocolProviderDef object)
+    {
+      return createProtocolProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCredentialsProviderDef(CredentialsProviderDef object)
+    {
+      return createCredentialsProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter casePasswordCredentialsProviderDef(PasswordCredentialsProviderDef object)
+    {
+      return createPasswordCredentialsProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter caseUser(User object)
+    {
+      return createUserAdapter();
+    }
+
+    @Override
+    public Adapter caseUserManagerDef(UserManagerDef object)
+    {
+      return createUserManagerDefAdapter();
+    }
+
+    @Override
+    public Adapter caseRandomizerDef(RandomizerDef object)
+    {
+      return createRandomizerDefAdapter();
+    }
+
+    @Override
+    public Adapter caseDef(Def object)
+    {
+      return createDefAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
+
+  /**
+   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param target
+   *          the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ConnectorDef
+   * <em>Connector 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.ConnectorDef
+   * @generated
+   */
+  public Adapter createConnectorDefAdapter()
+  {
+    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 --> 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
+   */
+  public Adapter createClientProtocolFactoryDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef
+   * <em>TCP Connector 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.TCPConnectorDef
+   * @generated
+   */
+  public Adapter createTCPConnectorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.AcceptorDef <em>Acceptor 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.AcceptorDef
+   * @generated
+   */
+  public Adapter createAcceptorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef
+   * <em>TCP Acceptor 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.TCPAcceptorDef
+   * @generated
+   */
+  public Adapter createTCPAcceptorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef
+   * <em>JVM Acceptor 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.JVMAcceptorDef
+   * @generated
+   */
+  public Adapter createJVMAcceptorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef
+   * <em>JVM Connector 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.JVMConnectorDef
+   * @generated
+   */
+  public Adapter createJVMConnectorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef
+   * <em>HTTP Connector 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.HTTPConnectorDef
+   * @generated
+   */
+  public Adapter createHTTPConnectorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.NegotiatorDef
+   * <em>Negotiator 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.NegotiatorDef
+   * @generated
+   */
+  public Adapter createNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef
+   * <em>Response Negotiator 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.ResponseNegotiatorDef
+   * @generated
+   */
+  public Adapter createResponseNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef
+   * <em>Challenge Negotiator 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.ChallengeNegotiatorDef
+   * @generated
+   */
+  public Adapter createChallengeNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPSelectorDef
+   * <em>TCP Selector 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.TCPSelectorDef
+   * @generated
+   */
+  public Adapter createTCPSelectorDefAdapter()
+  {
+    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;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.BufferProviderDef
+   * <em>Buffer 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.BufferProviderDef
+   * @generated
+   */
+  public Adapter createBufferProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.BufferPoolDef
+   * <em>Buffer Pool 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.BufferPoolDef
+   * @generated
+   */
+  public Adapter createBufferPoolDefAdapter()
+  {
+    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 --> 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
+   */
+  public Adapter createProtocolProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.CredentialsProviderDef
+   * <em>Credentials 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.CredentialsProviderDef
+   * @generated
+   */
+  public Adapter createCredentialsProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef
+   * <em>Password Credentials 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.PasswordCredentialsProviderDef
+   * @generated
+   */
+  public Adapter createPasswordCredentialsProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.UserManagerDef
+   * <em>User Manager 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.UserManagerDef
+   * @generated
+   */
+  public Adapter createUserManagerDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.RandomizerDef
+   * <em>Randomizer 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.RandomizerDef
+   * @generated
+   */
+  public Adapter createRandomizerDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.User <em>User</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.User
+   * @generated
+   */
+  public Adapter createUserAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @generated
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} // Net4jDefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsSwitch.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsSwitch.java
index 2a86b2aa69..9471ca70da 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Net4jDefsSwitch.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: Net4jDefsSwitch.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
 package org.eclipse.net4j.net4jdefs.util;
 
@@ -36,583 +36,769 @@ import org.eclipse.emf.ecore.EObject;
 import java.util.List;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
+ * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage
  * @generated
  */
-public class Net4jDefsSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jDefsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = Net4jDefsPackage.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 -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject 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 -->
-	 * <!-- end-user-doc -->
-	 * @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);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case Net4jDefsPackage.CONNECTOR_DEF: {
-				ConnectorDef connectorDef = (ConnectorDef)theEObject;
-				T result = caseConnectorDef(connectorDef);
-				if (result == null) result = caseDef(connectorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF: {
-				ClientProtocolFactoryDef clientProtocolFactoryDef = (ClientProtocolFactoryDef)theEObject;
-				T result = caseClientProtocolFactoryDef(clientProtocolFactoryDef);
-				if (result == null) result = caseProtocolProviderDef(clientProtocolFactoryDef);
-				if (result == null) result = caseDef(clientProtocolFactoryDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.TCP_CONNECTOR_DEF: {
-				TCPConnectorDef tcpConnectorDef = (TCPConnectorDef)theEObject;
-				T result = caseTCPConnectorDef(tcpConnectorDef);
-				if (result == null) result = caseConnectorDef(tcpConnectorDef);
-				if (result == null) result = caseDef(tcpConnectorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.ACCEPTOR_DEF: {
-				AcceptorDef acceptorDef = (AcceptorDef)theEObject;
-				T result = caseAcceptorDef(acceptorDef);
-				if (result == null) result = caseDef(acceptorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.TCP_ACCEPTOR_DEF: {
-				TCPAcceptorDef tcpAcceptorDef = (TCPAcceptorDef)theEObject;
-				T result = caseTCPAcceptorDef(tcpAcceptorDef);
-				if (result == null) result = caseAcceptorDef(tcpAcceptorDef);
-				if (result == null) result = caseDef(tcpAcceptorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.JVM_ACCEPTOR_DEF: {
-				JVMAcceptorDef jvmAcceptorDef = (JVMAcceptorDef)theEObject;
-				T result = caseJVMAcceptorDef(jvmAcceptorDef);
-				if (result == null) result = caseAcceptorDef(jvmAcceptorDef);
-				if (result == null) result = caseDef(jvmAcceptorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.JVM_CONNECTOR_DEF: {
-				JVMConnectorDef jvmConnectorDef = (JVMConnectorDef)theEObject;
-				T result = caseJVMConnectorDef(jvmConnectorDef);
-				if (result == null) result = caseConnectorDef(jvmConnectorDef);
-				if (result == null) result = caseDef(jvmConnectorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.HTTP_CONNECTOR_DEF: {
-				HTTPConnectorDef httpConnectorDef = (HTTPConnectorDef)theEObject;
-				T result = caseHTTPConnectorDef(httpConnectorDef);
-				if (result == null) result = caseConnectorDef(httpConnectorDef);
-				if (result == null) result = caseDef(httpConnectorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.NEGOTIATOR_DEF: {
-				NegotiatorDef negotiatorDef = (NegotiatorDef)theEObject;
-				T result = caseNegotiatorDef(negotiatorDef);
-				if (result == null) result = caseDef(negotiatorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF: {
-				ResponseNegotiatorDef responseNegotiatorDef = (ResponseNegotiatorDef)theEObject;
-				T result = caseResponseNegotiatorDef(responseNegotiatorDef);
-				if (result == null) result = caseNegotiatorDef(responseNegotiatorDef);
-				if (result == null) result = caseDef(responseNegotiatorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF: {
-				ChallengeNegotiatorDef challengeNegotiatorDef = (ChallengeNegotiatorDef)theEObject;
-				T result = caseChallengeNegotiatorDef(challengeNegotiatorDef);
-				if (result == null) result = caseNegotiatorDef(challengeNegotiatorDef);
-				if (result == null) result = caseDef(challengeNegotiatorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.TCP_SELECTOR_DEF: {
-				TCPSelectorDef tcpSelectorDef = (TCPSelectorDef)theEObject;
-				T result = caseTCPSelectorDef(tcpSelectorDef);
-				if (result == null) result = caseDef(tcpSelectorDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF: {
-				ServerProtocolFactoryDef serverProtocolFactoryDef = (ServerProtocolFactoryDef)theEObject;
-				T result = caseServerProtocolFactoryDef(serverProtocolFactoryDef);
-				if (result == null) result = caseProtocolProviderDef(serverProtocolFactoryDef);
-				if (result == null) result = caseDef(serverProtocolFactoryDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.BUFFER_PROVIDER_DEF: {
-				BufferProviderDef bufferProviderDef = (BufferProviderDef)theEObject;
-				T result = caseBufferProviderDef(bufferProviderDef);
-				if (result == null) result = caseDef(bufferProviderDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.BUFFER_POOL_DEF: {
-				BufferPoolDef bufferPoolDef = (BufferPoolDef)theEObject;
-				T result = caseBufferPoolDef(bufferPoolDef);
-				if (result == null) result = caseBufferProviderDef(bufferPoolDef);
-				if (result == null) result = caseDef(bufferPoolDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.PROTOCOL_PROVIDER_DEF: {
-				ProtocolProviderDef protocolProviderDef = (ProtocolProviderDef)theEObject;
-				T result = caseProtocolProviderDef(protocolProviderDef);
-				if (result == null) result = caseDef(protocolProviderDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF: {
-				CredentialsProviderDef credentialsProviderDef = (CredentialsProviderDef)theEObject;
-				T result = caseCredentialsProviderDef(credentialsProviderDef);
-				if (result == null) result = caseDef(credentialsProviderDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF: {
-				PasswordCredentialsProviderDef passwordCredentialsProviderDef = (PasswordCredentialsProviderDef)theEObject;
-				T result = casePasswordCredentialsProviderDef(passwordCredentialsProviderDef);
-				if (result == null) result = caseCredentialsProviderDef(passwordCredentialsProviderDef);
-				if (result == null) result = caseDef(passwordCredentialsProviderDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.USER: {
-				User user = (User)theEObject;
-				T result = caseUser(user);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.USER_MANAGER_DEF: {
-				UserManagerDef userManagerDef = (UserManagerDef)theEObject;
-				T result = caseUserManagerDef(userManagerDef);
-				if (result == null) result = caseDef(userManagerDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jDefsPackage.RANDOMIZER_DEF: {
-				RandomizerDef randomizerDef = (RandomizerDef)theEObject;
-				T result = caseRandomizerDef(randomizerDef);
-				if (result == null) result = caseDef(randomizerDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Connector 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>Connector Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConnectorDef(ConnectorDef object) {
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public T caseClientProtocolFactoryDef(ClientProtocolFactoryDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>TCP Connector 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>TCP Connector Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTCPConnectorDef(TCPConnectorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Acceptor 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>Acceptor Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAcceptorDef(AcceptorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>TCP Acceptor 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>TCP Acceptor Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTCPAcceptorDef(TCPAcceptorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>JVM Acceptor 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>JVM Acceptor Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseJVMAcceptorDef(JVMAcceptorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>JVM Connector 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>JVM Connector Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseJVMConnectorDef(JVMConnectorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>HTTP Connector 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>HTTP Connector Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseHTTPConnectorDef(HTTPConnectorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Negotiator 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>Negotiator Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNegotiatorDef(NegotiatorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Response Negotiator 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>Response Negotiator Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseResponseNegotiatorDef(ResponseNegotiatorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Challenge Negotiator 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>Challenge Negotiator Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseChallengeNegotiatorDef(ChallengeNegotiatorDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>TCP Selector 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>TCP Selector Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTCPSelectorDef(TCPSelectorDef 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;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Buffer 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>Buffer Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBufferProviderDef(BufferProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Buffer Pool 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>Buffer Pool Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBufferPoolDef(BufferPoolDef object) {
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public T caseProtocolProviderDef(ProtocolProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Credentials 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>Credentials Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCredentialsProviderDef(CredentialsProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Password Credentials 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>Password Credentials Provider Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePasswordCredentialsProviderDef(PasswordCredentialsProviderDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>User Manager 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>User Manager Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUserManagerDef(UserManagerDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Randomizer 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>Randomizer Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRandomizerDef(RandomizerDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>User</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>User</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUser(User object) {
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public T caseDef(Def object) {
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //Net4jDefsSwitch
+public class Net4jDefsSwitch<T>
+{
+  /**
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected static Net4jDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jDefsSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Net4jDefsPackage.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 --> <!-- end-user-doc -->
+   * 
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  public T doSwitch(EObject 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 --> <!-- end-user-doc -->
+   * 
+   * @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);
+    }
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case Net4jDefsPackage.CONNECTOR_DEF:
+    {
+      ConnectorDef connectorDef = (ConnectorDef)theEObject;
+      T result = caseConnectorDef(connectorDef);
+      if (result == null)
+      {
+        result = caseDef(connectorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF:
+    {
+      ClientProtocolFactoryDef clientProtocolFactoryDef = (ClientProtocolFactoryDef)theEObject;
+      T result = caseClientProtocolFactoryDef(clientProtocolFactoryDef);
+      if (result == null)
+      {
+        result = caseProtocolProviderDef(clientProtocolFactoryDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(clientProtocolFactoryDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.TCP_CONNECTOR_DEF:
+    {
+      TCPConnectorDef tcpConnectorDef = (TCPConnectorDef)theEObject;
+      T result = caseTCPConnectorDef(tcpConnectorDef);
+      if (result == null)
+      {
+        result = caseConnectorDef(tcpConnectorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(tcpConnectorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.ACCEPTOR_DEF:
+    {
+      AcceptorDef acceptorDef = (AcceptorDef)theEObject;
+      T result = caseAcceptorDef(acceptorDef);
+      if (result == null)
+      {
+        result = caseDef(acceptorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.TCP_ACCEPTOR_DEF:
+    {
+      TCPAcceptorDef tcpAcceptorDef = (TCPAcceptorDef)theEObject;
+      T result = caseTCPAcceptorDef(tcpAcceptorDef);
+      if (result == null)
+      {
+        result = caseAcceptorDef(tcpAcceptorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(tcpAcceptorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.JVM_ACCEPTOR_DEF:
+    {
+      JVMAcceptorDef jvmAcceptorDef = (JVMAcceptorDef)theEObject;
+      T result = caseJVMAcceptorDef(jvmAcceptorDef);
+      if (result == null)
+      {
+        result = caseAcceptorDef(jvmAcceptorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(jvmAcceptorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.JVM_CONNECTOR_DEF:
+    {
+      JVMConnectorDef jvmConnectorDef = (JVMConnectorDef)theEObject;
+      T result = caseJVMConnectorDef(jvmConnectorDef);
+      if (result == null)
+      {
+        result = caseConnectorDef(jvmConnectorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(jvmConnectorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.HTTP_CONNECTOR_DEF:
+    {
+      HTTPConnectorDef httpConnectorDef = (HTTPConnectorDef)theEObject;
+      T result = caseHTTPConnectorDef(httpConnectorDef);
+      if (result == null)
+      {
+        result = caseConnectorDef(httpConnectorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(httpConnectorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.NEGOTIATOR_DEF:
+    {
+      NegotiatorDef negotiatorDef = (NegotiatorDef)theEObject;
+      T result = caseNegotiatorDef(negotiatorDef);
+      if (result == null)
+      {
+        result = caseDef(negotiatorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF:
+    {
+      ResponseNegotiatorDef responseNegotiatorDef = (ResponseNegotiatorDef)theEObject;
+      T result = caseResponseNegotiatorDef(responseNegotiatorDef);
+      if (result == null)
+      {
+        result = caseNegotiatorDef(responseNegotiatorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(responseNegotiatorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF:
+    {
+      ChallengeNegotiatorDef challengeNegotiatorDef = (ChallengeNegotiatorDef)theEObject;
+      T result = caseChallengeNegotiatorDef(challengeNegotiatorDef);
+      if (result == null)
+      {
+        result = caseNegotiatorDef(challengeNegotiatorDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(challengeNegotiatorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.TCP_SELECTOR_DEF:
+    {
+      TCPSelectorDef tcpSelectorDef = (TCPSelectorDef)theEObject;
+      T result = caseTCPSelectorDef(tcpSelectorDef);
+      if (result == null)
+      {
+        result = caseDef(tcpSelectorDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF:
+    {
+      ServerProtocolFactoryDef serverProtocolFactoryDef = (ServerProtocolFactoryDef)theEObject;
+      T result = caseServerProtocolFactoryDef(serverProtocolFactoryDef);
+      if (result == null)
+      {
+        result = caseProtocolProviderDef(serverProtocolFactoryDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(serverProtocolFactoryDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.BUFFER_PROVIDER_DEF:
+    {
+      BufferProviderDef bufferProviderDef = (BufferProviderDef)theEObject;
+      T result = caseBufferProviderDef(bufferProviderDef);
+      if (result == null)
+      {
+        result = caseDef(bufferProviderDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.BUFFER_POOL_DEF:
+    {
+      BufferPoolDef bufferPoolDef = (BufferPoolDef)theEObject;
+      T result = caseBufferPoolDef(bufferPoolDef);
+      if (result == null)
+      {
+        result = caseBufferProviderDef(bufferPoolDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(bufferPoolDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.PROTOCOL_PROVIDER_DEF:
+    {
+      ProtocolProviderDef protocolProviderDef = (ProtocolProviderDef)theEObject;
+      T result = caseProtocolProviderDef(protocolProviderDef);
+      if (result == null)
+      {
+        result = caseDef(protocolProviderDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.CREDENTIALS_PROVIDER_DEF:
+    {
+      CredentialsProviderDef credentialsProviderDef = (CredentialsProviderDef)theEObject;
+      T result = caseCredentialsProviderDef(credentialsProviderDef);
+      if (result == null)
+      {
+        result = caseDef(credentialsProviderDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF:
+    {
+      PasswordCredentialsProviderDef passwordCredentialsProviderDef = (PasswordCredentialsProviderDef)theEObject;
+      T result = casePasswordCredentialsProviderDef(passwordCredentialsProviderDef);
+      if (result == null)
+      {
+        result = caseCredentialsProviderDef(passwordCredentialsProviderDef);
+      }
+      if (result == null)
+      {
+        result = caseDef(passwordCredentialsProviderDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.USER:
+    {
+      User user = (User)theEObject;
+      T result = caseUser(user);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.USER_MANAGER_DEF:
+    {
+      UserManagerDef userManagerDef = (UserManagerDef)theEObject;
+      T result = caseUserManagerDef(userManagerDef);
+      if (result == null)
+      {
+        result = caseDef(userManagerDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    case Net4jDefsPackage.RANDOMIZER_DEF:
+    {
+      RandomizerDef randomizerDef = (RandomizerDef)theEObject;
+      T result = caseRandomizerDef(randomizerDef);
+      if (result == null)
+      {
+        result = caseDef(randomizerDef);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Connector 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>Connector Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseConnectorDef(ConnectorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>TCP Connector 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>TCP Connector Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTCPConnectorDef(TCPConnectorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Acceptor 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>Acceptor Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseAcceptorDef(AcceptorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>TCP Acceptor 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>TCP Acceptor Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTCPAcceptorDef(TCPAcceptorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>JVM Acceptor 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>JVM Acceptor Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseJVMAcceptorDef(JVMAcceptorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>JVM Connector 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>JVM Connector Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseJVMConnectorDef(JVMConnectorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>HTTP Connector 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>HTTP Connector Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseHTTPConnectorDef(HTTPConnectorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Negotiator 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>Negotiator Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseNegotiatorDef(NegotiatorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Response Negotiator 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>Response Negotiator Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseResponseNegotiatorDef(ResponseNegotiatorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Challenge Negotiator 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>Challenge Negotiator Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseChallengeNegotiatorDef(ChallengeNegotiatorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>TCP Selector 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>TCP Selector Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTCPSelectorDef(TCPSelectorDef 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;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Buffer 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>Buffer Provider Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBufferProviderDef(BufferProviderDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Buffer Pool 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>Buffer Pool Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBufferPoolDef(BufferPoolDef object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T caseProtocolProviderDef(ProtocolProviderDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Credentials 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>Credentials Provider Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseCredentialsProviderDef(CredentialsProviderDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Password Credentials 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>Password Credentials Provider Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T casePasswordCredentialsProviderDef(PasswordCredentialsProviderDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>User Manager 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>User Manager Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseUserManagerDef(UserManagerDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Randomizer 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>Randomizer Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseRandomizerDef(RandomizerDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>User</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>User</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseUser(User object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T caseDef(Def object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} // Net4jDefsSwitch
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsUtil.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsUtil.java
index a42661912b..ee9c3c905a 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsUtil.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsUtil.java
@@ -1,53 +1,48 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
 package org.eclipse.net4j.net4jdefs.util;
 
-import org.eclipse.net4j.FactoriesProtocolProvider;
 import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
-import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
 import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.protocol.IProtocolProvider;
 import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.util.factory.IFactory;
 import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
 
-import java.util.Iterator;
-import java.util.List;
-
-public class Net4jDefsUtil
+/**
+ * @author Eike Stepper
+ */
+public abstract class Net4jDefsUtil
 {
-  /**
-   * Creates the factories protocol provider. The current implementation uses a {@link FactoriesProtocolProvider}.
-   * 
-   * @param clientProtocolFactoryDef
-   *          the client protocol factory definition
-   * @return the protocol provider
-   */
-  public static <PPD extends ProtocolProviderDef> IProtocolProvider createFactoriesProtocolProvider(
-      List<PPD> protocolFactoryDef)
+  private Net4jDefsUtil()
   {
-    FactoriesProtocolProvider protocolProvider = new FactoriesProtocolProvider();
-    for (Iterator<PPD> iterator = protocolFactoryDef.iterator(); iterator.hasNext();)
-    {
-      PPD protocolProviderDef = iterator.next();
-      protocolProvider.addFactory((IFactory)protocolProviderDef.getInstance());
-    }
-    return protocolProvider;
   }
 
+  /*
+   * TODO: Is this only used by tests? --> Move to tests
+   */
   public static TCPConnectorDef createTCPConnectorDef(final String host)
   {
     return createTCPConnectorDef(host, ITCPConnector.DEFAULT_PORT);
   }
 
+  /*
+   * TODO: Is this only used by tests? --> Move to tests
+   */
   public static TCPConnectorDef createTCPConnectorDef(final String host, final int port)
   {
     TCPConnectorDef tcpConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
-
     tcpConnectorDef.setHost(host);
     tcpConnectorDef.setPort(port);
     tcpConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
     tcpConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
     tcpConnectorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
-
     return tcpConnectorDef;
   }
 }
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/TCPClientConnectorBuilder.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/TCPClientConnectorBuilder.java
index 32b6a84a40..6ce4f8d930 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/TCPClientConnectorBuilder.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/TCPClientConnectorBuilder.java
@@ -1,3 +1,13 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
 package org.eclipse.net4j.net4jdefs.util;
 
 import org.eclipse.net4j.net4jdefs.BufferPoolDef;
@@ -11,19 +21,25 @@ import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
 import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
 import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
 
+/**
+ * @author Eike Stepper
+ */
 public class TCPClientConnectorBuilder
 {
+  private String host;
 
   private int port = ITCPConnector.DEFAULT_PORT;
 
-  private String host;
-
   private BufferProviderDef bufferProviderDef = Net4jDefsFactory.eINSTANCE.createBufferPoolDef();
 
   private ExecutorServiceDef executorService = Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef();
 
   private TCPSelectorDef tcpSelectorDef = Net4jDefsFactory.eINSTANCE.createTCPSelectorDef();
 
+  public TCPClientConnectorBuilder()
+  {
+  }
+
   public TCPClientConnectorBuilder port(int port)
   {
     this.port = port;
@@ -38,13 +54,13 @@ public class TCPClientConnectorBuilder
 
   public TCPClientConnectorBuilder executorServiceDef(ThreadPoolDef threadPoolDef)
   {
-    this.executorService = threadPoolDef;
+    executorService = threadPoolDef;
     return this;
   }
 
   public TCPClientConnectorBuilder bufferDef(BufferPoolDef bufferPoolDef)
   {
-    this.bufferProviderDef = bufferPoolDef;
+    bufferProviderDef = bufferPoolDef;
     return this;
   }
 
diff --git a/plugins/org.eclipse.net4j.tests/.classpath b/plugins/org.eclipse.net4j.tests/.classpath
index 64c5e31b7a..aa30c2ea48 100644
--- a/plugins/org.eclipse.net4j.tests/.classpath
+++ b/plugins/org.eclipse.net4j.tests/.classpath
@@ -1,7 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="var" path="ECLIPSE_CORE_RUNTIME">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.core.runtime"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="ECLIPSE_CORE_RESOURCES">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.core.resources"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="EMF_COMMON">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.emf.common"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="EMF_ECORE">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.emf.ecore"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index b4f234630e..a34a9678fe 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -12,10 +12,19 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  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,
+ org.eclipse.net4j.http.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ 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.junit;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.net4j.tests;version="2.0.0",
  org.eclipse.net4j.tests.bugzilla;version="2.0.0",
  org.eclipse.net4j.tests.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.tests.defs;version="2.0.0",
  org.eclipse.net4j.tests.signal;version="2.0.0",
  org.eclipse.net4j.util.tests;version="2.0.0",
- org.eclipse.net4j.util.tests.cache;version="2.0.0"
+ org.eclipse.net4j.util.tests.cache;version="2.0.0",
+ org.eclipse.net4j.util.tests.defs;version="2.0.0",
+ org.eclipse.net4j.util.tests.defs.impl;version="2.0.0",
+ org.eclipse.net4j.util.tests.defs.util;version="2.0.0",
+ org.eclipse.net4j.util.tests.defs.validation;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.tests/build.properties b/plugins/org.eclipse.net4j.tests/build.properties
index 70ca82aa6f..65490e94d8 100644
--- a/plugins/org.eclipse.net4j.tests/build.properties
+++ b/plugins/org.eclipse.net4j.tests/build.properties
@@ -24,4 +24,5 @@ bin.includes = META-INF/,\
                about.properties,\
                modeling32.png,\
                plugin.xml,\
-               .options
+               .options,\
+               model/
diff --git a/plugins/org.eclipse.net4j.tests/model/TestDef.ecore b/plugins/org.eclipse.net4j.tests/model/TestDef.ecore
new file mode 100644
index 0000000000..be24e7f978
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/model/TestDef.ecore
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defs"
+    nsURI="http://www.eclipse.org/NET4J/defs/tests/1.0.0" nsPrefix="net4j.defs.tests">
+  <eClassifiers xsi:type="ecore:EClass" name="TestDef" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.net4j.tests/model/TestDef.genmodel b/plugins/org.eclipse.net4j.tests/model/TestDef.genmodel
new file mode 100644
index 0000000000..3b57f72837
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/model/TestDef.genmodel
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2008 Eike Stepper, Germany.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation"
+    modelDirectory="/org.eclipse.net4j.tests/src" editDirectory="" editorDirectory=""
+    modelPluginID="" modelName="TestDef" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//net4jutildefs">
+  <foreignModel>TestDef.ecore</foreignModel>
+  <genPackages prefix="Defs" basePackage="org.eclipse.net4j.util.tests" disposableProviderFactory="true"
+      ecorePackage="TestDef.ecore#/">
+    <genClasses ecoreClass="TestDef.ecore#//TestDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TestDef.ecore#//TestDef/references"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TestDef.ecore#//TestDef/attribute"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
new file mode 100644
index 0000000000..dbb1bd3a0e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
@@ -0,0 +1,97 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.tests.defs;
+
+import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.buffer.IBufferPool;
+import org.eclipse.net4j.internal.jvm.JVMClientConnector;
+import org.eclipse.net4j.jvm.IJVMAcceptor;
+import org.eclipse.net4j.jvm.IJVMConnector;
+import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
+import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.tests.AbstractOMTest;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author Eike Stepper
+ */
+public class JVMAcceptorDefImplTest extends AbstractOMTest
+{
+
+  private static final String NAME = "JVMConnector1";
+
+  private static final long TIMEOUT = 10000l;
+
+  private static final long DELAY = 500l;
+
+  private IJVMConnector jvmConnector;
+
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    jvmConnector = createJVMClientConnector();
+  }
+
+  @Override
+  protected void doTearDown() throws Exception
+  {
+    LifecycleUtil.deactivate(jvmConnector);
+  }
+
+  public void testAcceptorDefOpensConnection()
+  {
+    JVMAcceptorDef jvmAcceptorDef = Net4jDefsFactory.eINSTANCE.createJVMAcceptorDef();
+    jvmAcceptorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    jvmAcceptorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    jvmAcceptorDef.setName(NAME);
+
+    IJVMAcceptor jvmAcceptor = (IJVMAcceptor)jvmAcceptorDef.getInstance();
+
+    assertTrue(LifecycleUtil.isActive(jvmAcceptor));
+
+    LifecycleUtil.activate(jvmConnector);
+    boolean connected = jvmConnector.waitForConnection(DELAY + TIMEOUT);
+
+    assertTrue(connected);
+    assertTrue(LifecycleUtil.isActive(jvmConnector));
+
+    LifecycleUtil.deactivate(jvmAcceptor);
+  }
+
+  protected IJVMConnector createJVMClientConnector()
+  {
+
+    JVMClientConnector jvmClientConnector = new JVMClientConnector();
+    jvmClientConnector.getConfig().setBufferProvider(createBufferPool());
+    jvmClientConnector.getConfig().setReceiveExecutor(createThreadPool());
+    jvmClientConnector.setName(NAME);
+
+    return jvmClientConnector;
+  }
+
+  private IBufferPool createBufferPool()
+  {
+    IBufferPool bufferPool = Net4jUtil.createBufferPool();
+    LifecycleUtil.activate(bufferPool);
+    return bufferPool;
+  }
+
+  private ExecutorService createThreadPool()
+  {
+    ExecutorService threadPool = Executors.newCachedThreadPool();
+    LifecycleUtil.activate(threadPool);
+    return threadPool;
+  }
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java
new file mode 100644
index 0000000000..722a653440
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java
@@ -0,0 +1,80 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.tests.defs;
+
+import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.buffer.IBufferPool;
+import org.eclipse.net4j.internal.jvm.JVMAcceptor;
+import org.eclipse.net4j.jvm.IJVMAcceptor;
+import org.eclipse.net4j.jvm.IJVMConnector;
+import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
+import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.tests.AbstractOMTest;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author Eike Stepper
+ */
+public class JVMConnectorDefImplTest extends AbstractOMTest
+{
+
+  private static final String NAME = "test1";
+
+  public void testIncompleteInitializationThrowsIllegalArgumentException()
+  {
+    try
+    {
+      Net4jDefsFactory.eINSTANCE.createJVMConnectorDef().getInstance();
+      fail("IllegalStateException expected!");
+    }
+    catch (IllegalStateException e)
+    {
+    }
+  }
+
+  public void testConnectorLaunchableOpensConnection()
+  {
+    IJVMAcceptor jvmAcceptor = createJVMAcceptor();
+
+    JVMConnectorDef jvmConnectorDef = Net4jDefsFactory.eINSTANCE.createJVMConnectorDef();
+
+    jvmConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    jvmConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    jvmConnectorDef.setName(NAME);
+    IJVMConnector jvmConnector = (IJVMConnector)jvmConnectorDef.getInstance();
+    jvmConnector.connect(500L);
+    assertTrue(jvmConnector.isConnected());
+
+    LifecycleUtil.deactivate(jvmConnector);
+    LifecycleUtil.deactivate(jvmAcceptor);
+  }
+
+  private IJVMAcceptor createJVMAcceptor()
+  {
+    ExecutorService threadPool = Executors.newCachedThreadPool();
+    LifecycleUtil.activate(threadPool);
+
+    IBufferPool bufferPool = Net4jUtil.createBufferPool();
+    LifecycleUtil.activate(bufferPool);
+
+    JVMAcceptor jvmAcceptor = new JVMAcceptor();
+    jvmAcceptor.setName(NAME);
+    jvmAcceptor.getConfig().setBufferProvider(bufferPool);
+    jvmAcceptor.getConfig().setReceiveExecutor(threadPool);
+    LifecycleUtil.activate(jvmAcceptor);
+
+    return jvmAcceptor;
+  }
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
new file mode 100644
index 0000000000..e7dc2fe0c4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
@@ -0,0 +1,116 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.tests.defs;
+
+import org.eclipse.net4j.internal.tcp.TCPConnector;
+import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
+import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
+import org.eclipse.net4j.net4jdefs.User;
+import org.eclipse.net4j.net4jdefs.UserManagerDef;
+import org.eclipse.net4j.tcp.ITCPAcceptor;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.tests.AbstractOMTest;
+
+/**
+ * @author Eike Stepper
+ */
+public class TCPAcceptorDefImplTest extends AbstractOMTest
+{
+  private static final long TIMEOUT = 10000;
+
+  private static final long DELAY = 500;
+
+  private static final String HOST = "localhost";
+
+  private static final int PORT = 2036;
+
+  private static final String USERID = "André";
+
+  private static final String PASSWORD = "aPassword";
+
+  private TCPConnector tcpConnector;
+
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    tcpConnector = Util.createTCPClientConnector(HOST, PORT, Util.createTCPSelector());
+  }
+
+  @Override
+  protected void doTearDown() throws Exception
+  {
+    LifecycleUtil.deactivate(tcpConnector);
+  }
+
+  public void testAcceptorDefOpensConnection()
+  {
+    TCPAcceptorDef tcpAcceptorDef = createTCPAcceptorDef();
+
+    ITCPAcceptor tcpAcceptor = (ITCPAcceptor)tcpAcceptorDef.getInstance();
+
+    assertTrue(LifecycleUtil.isActive(tcpAcceptor));
+
+    LifecycleUtil.activate(tcpConnector);
+    boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
+
+    assertTrue(connected);
+    assertTrue(LifecycleUtil.isActive(tcpConnector));
+
+    LifecycleUtil.deactivate(tcpAcceptor);
+  }
+
+  /**
+   * Doesn't work yet: UserManager does not add its users yet
+   */
+  public void _testCredentialsProvider()
+  {
+    TCPAcceptorDef tcpAcceptorDef = createTCPAcceptorDef();
+
+    User user = Net4jDefsFactory.eINSTANCE.createUser();
+    user.setUserID(USERID);
+    user.setPassword(PASSWORD);
+
+    UserManagerDef userManagerDef = Net4jDefsFactory.eINSTANCE.createUserManagerDef();
+    userManagerDef.getUser().add(user);
+
+    ChallengeNegotiatorDef challengeNegotiatorDef = Net4jDefsFactory.eINSTANCE.createChallengeNegotiatorDef();
+    challengeNegotiatorDef.setRandomizer(Net4jDefsFactory.eINSTANCE.createRandomizerDef());
+    challengeNegotiatorDef.setUserManager(userManagerDef);
+
+    tcpAcceptorDef.setNegotiator(challengeNegotiatorDef);
+    ITCPAcceptor tcpAcceptor = (ITCPAcceptor)tcpAcceptorDef.getInstance();
+    assertTrue(LifecycleUtil.isActive(tcpAcceptor));
+
+    Util.addNegotiator(USERID, PASSWORD, tcpConnector);
+    LifecycleUtil.activate(tcpConnector);
+
+    boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
+    assertTrue(connected);
+
+    LifecycleUtil.deactivate(tcpConnector);
+
+    Util.removeNegotiator(tcpConnector);
+    LifecycleUtil.deactivate(tcpAcceptor);
+  }
+
+  private TCPAcceptorDef createTCPAcceptorDef()
+  {
+    TCPAcceptorDef tcpAcceptorDef = Net4jDefsFactory.eINSTANCE.createTCPAcceptorDef();
+    tcpAcceptorDef.setHost(HOST);
+    tcpAcceptorDef.setPort(PORT);
+    tcpAcceptorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    tcpAcceptorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    tcpAcceptorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
+    return tcpAcceptorDef;
+  }
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
new file mode 100644
index 0000000000..c2d85f08c8
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
@@ -0,0 +1,131 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.tests.defs;
+
+import org.eclipse.net4j.internal.tcp.TCPAcceptor;
+import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
+import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
+import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
+import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
+import org.eclipse.net4j.tcp.ITCPConnector;
+import org.eclipse.net4j.tests.AbstractProtocolTest;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
+
+/**
+ * @author Eike Stepper
+ */
+public class TCPConnectorDefImplTest extends AbstractProtocolTest
+{
+
+  private static final long DELAY = 500l;
+
+  private static final int PORT = 2036;
+
+  private static final long TIMEOUT = 10000l;
+
+  private static final String USERID = "André";
+
+  private static final String PASSWORD = "aPassword";
+
+  private TCPAcceptor tcpAcceptor;
+
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    tcpAcceptor = Util.createTCPAcceptor(HOST, PORT, DELAY);
+  }
+
+  @Override
+  protected void doTearDown() throws Exception
+  {
+    LifecycleUtil.deactivate(tcpAcceptor);
+  }
+
+  public void testConnectorDefOpensConnection()
+  {
+
+    TCPConnectorDef tcpConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
+
+    tcpConnectorDef.setHost(HOST);
+    tcpConnectorDef.setPort(PORT);
+    tcpConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    tcpConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    tcpConnectorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
+
+    ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
+
+    boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
+    assertTrue(connected);
+    assertTrue(LifecycleUtil.isActive(tcpConnector));
+
+    LifecycleUtil.deactivate(tcpConnector);
+  }
+
+  public void testNewInstanceWhenTouched()
+  {
+    TCPConnectorDef tcpConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
+
+    tcpConnectorDef.setHost(HOST);
+    tcpConnectorDef.setPort(PORT);
+    tcpConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    tcpConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    tcpConnectorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
+
+    ITCPConnector thisTcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
+    tcpConnectorDef.setPort(PORT + 1);
+
+    assertTrue(tcpConnectorDef.isTouched());
+
+    ITCPConnector thatTcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
+
+    assertTrue(!LifecycleUtil.isActive(thisTcpConnector));
+    assertTrue(!tcpConnectorDef.isTouched());
+    assertTrue(thisTcpConnector != thatTcpConnector);
+
+    LifecycleUtil.deactivate(thisTcpConnector);
+    LifecycleUtil.deactivate(thatTcpConnector);
+  }
+
+  public void testCredentialsProvider()
+  {
+
+    Util.addNegotiator(USERID, PASSWORD, tcpAcceptor);
+
+    TCPConnectorDef tcpConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
+
+    tcpConnectorDef.setHost(HOST);
+    tcpConnectorDef.setPort(PORT);
+    tcpConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
+    tcpConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
+    tcpConnectorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
+
+    PasswordCredentialsProviderDef credentialsProviderDef = Net4jDefsFactory.eINSTANCE
+        .createPasswordCredentialsProviderDef();
+    credentialsProviderDef.setUserID(USERID);
+    credentialsProviderDef.setPassword(PASSWORD);
+
+    ResponseNegotiatorDef negotiatorDef = Net4jDefsFactory.eINSTANCE.createResponseNegotiatorDef();
+    negotiatorDef.setCredentialsProvider(credentialsProviderDef);
+    tcpConnectorDef.setNegotiator(negotiatorDef);
+
+    ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
+
+    boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
+    assertTrue(connected);
+    assertTrue(LifecycleUtil.isActive(tcpConnector));
+
+    LifecycleUtil.deactivate(tcpConnector);
+
+    Util.removeNegotiator(tcpAcceptor);
+  }
+
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java
new file mode 100644
index 0000000000..f808796917
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java
@@ -0,0 +1,138 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.tests.defs;
+
+import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.buffer.IBufferPool;
+import org.eclipse.net4j.internal.tcp.TCPAcceptor;
+import org.eclipse.net4j.internal.tcp.TCPClientConnector;
+import org.eclipse.net4j.internal.tcp.TCPConnector;
+import org.eclipse.net4j.internal.tcp.TCPSelector;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.security.ChallengeNegotiator;
+import org.eclipse.net4j.util.security.INegotiator;
+import org.eclipse.net4j.util.security.IRandomizer;
+import org.eclipse.net4j.util.security.PasswordCredentials;
+import org.eclipse.net4j.util.security.PasswordCredentialsProvider;
+import org.eclipse.net4j.util.security.Randomizer;
+import org.eclipse.net4j.util.security.ResponseNegotiator;
+import org.eclipse.net4j.util.security.UserManager;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author Eike Stepper
+ */
+class Util
+{
+  public static TCPAcceptor createTCPAcceptor(String host, int port, long timeout)
+  {
+    TCPAcceptor acceptor = new TCPAcceptor();
+    acceptor.setStartSynchronously(true);
+    acceptor.setSynchronousStartTimeout(timeout);
+    acceptor.getConfig().setBufferProvider(createBufferPool());
+    acceptor.getConfig().setReceiveExecutor(createThreadPool());
+    acceptor.setSelector(createTCPSelector());
+    acceptor.setAddress(host);
+    acceptor.setPort(port);
+
+    LifecycleUtil.activate(acceptor);
+
+    return acceptor;
+  }
+
+  private static IRandomizer createRandomizer()
+  {
+    Randomizer randomizer = new Randomizer();
+    LifecycleUtil.activate(randomizer);
+
+    return randomizer;
+  }
+
+  public static void addNegotiator(String userId, String password, TCPAcceptor tcpAcceptor)
+  {
+    UserManager userManager = new UserManager();
+    LifecycleUtil.activate(userManager);
+    userManager.addUser(userId, password.toCharArray());
+
+    ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator();
+    challengeNegotiator.setRandomizer(createRandomizer());
+    challengeNegotiator.setUserManager(userManager);
+    LifecycleUtil.activate(challengeNegotiator);
+
+    tcpAcceptor.getConfig().setNegotiator(challengeNegotiator);
+  }
+
+  public static void removeNegotiator(TCPAcceptor tcpAcceptor)
+  {
+    INegotiator negotiator = tcpAcceptor.getConfig().getNegotiator();
+    tcpAcceptor.getConfig().setNegotiator(null);
+    LifecycleUtil.deactivate(negotiator);
+  }
+
+  public static TCPConnector createTCPClientConnector(String host, int port, TCPSelector tcpSelector)
+  {
+    TCPClientConnector tcpConnector = new TCPClientConnector();
+    tcpConnector.getConfig().setBufferProvider(createBufferPool());
+    tcpConnector.getConfig().setReceiveExecutor(createThreadPool());
+    tcpConnector.setSelector(tcpSelector);
+    tcpConnector.setHost(host);
+    tcpConnector.setPort(port);
+
+    return tcpConnector;
+  }
+
+  public static void addNegotiator(String userId, String password, TCPConnector tcpConnector)
+  {
+    PasswordCredentials passwordCredentials = new PasswordCredentials(userId, password.toCharArray());
+    PasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(passwordCredentials);
+    LifecycleUtil.activate(credentialsProvider);
+
+    tcpConnector.getConfig().setNegotiator(createResponseNegotiator(credentialsProvider));
+  }
+
+  public static ResponseNegotiator createResponseNegotiator(PasswordCredentialsProvider credentialsProvider)
+  {
+    ResponseNegotiator responseNegotiator = new ResponseNegotiator();
+    responseNegotiator.setCredentialsProvider(credentialsProvider);
+    LifecycleUtil.activate(responseNegotiator);
+    return responseNegotiator;
+  }
+
+  public static void removeNegotiator(TCPConnector tcpConnector)
+  {
+    INegotiator negotiator = tcpConnector.getConfig().getNegotiator();
+    tcpConnector.setNegotiator(null);
+    LifecycleUtil.deactivate(negotiator);
+  }
+
+  public static TCPSelector createTCPSelector()
+  {
+    TCPSelector selector = new TCPSelector();
+    LifecycleUtil.activate(selector);
+    return selector;
+  }
+
+  public static IBufferPool createBufferPool()
+  {
+    IBufferPool bufferPool = Net4jUtil.createBufferPool();
+    LifecycleUtil.activate(bufferPool);
+    return bufferPool;
+  }
+
+  public static ExecutorService createThreadPool()
+  {
+    ExecutorService threadPool = Executors.newCachedThreadPool();
+    LifecycleUtil.activate(threadPool);
+    return threadPool;
+  }
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java
new file mode 100644
index 0000000000..eb523707a4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsFactory.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.net4j.util.tests.defs.DefsPackage
+ * @generated
+ */
+public interface DefsFactory extends EFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  DefsFactory eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl.init();
+
+  /**
+   * Returns a new object of class '<em>Test Def</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Test Def</em>'.
+   * @generated
+   */
+  TestDef createTestDef();
+
+  /**
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
+  DefsPackage getDefsPackage();
+
+} //DefsFactory
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java
new file mode 100644
index 0000000000..9a061fb2fb
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsPackage.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs;
+
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.net4j.util.tests.defs.DefsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DefsPackage extends EPackage
+{
+  /**
+   * The package name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNAME = "defs";
+
+  /**
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0";
+
+  /**
+   * The package namespace name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_PREFIX = "net4j.defs.tests";
+
+  /**
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  DefsPackage eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
+   * @see org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl#getTestDef()
+   * @generated
+   */
+  int TEST_DEF = 0;
+
+  /**
+   * The feature id for the '<em><b>References</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TEST_DEF__REFERENCES = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Attribute</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TEST_DEF__ATTRIBUTE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Test Def</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TEST_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
+
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test Def</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Test Def</em>'.
+   * @see org.eclipse.net4j.util.tests.defs.TestDef
+   * @generated
+   */
+  EClass getTestDef();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences <em>References</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>References</em>'.
+   * @see org.eclipse.net4j.util.tests.defs.TestDef#getReferences()
+   * @see #getTestDef()
+   * @generated
+   */
+  EReference getTestDef_References();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Attribute</em>'.
+   * @see org.eclipse.net4j.util.tests.defs.TestDef#getAttribute()
+   * @see #getTestDef()
+   * @generated
+   */
+  EAttribute getTestDef_Attribute();
+
+  /**
+   * 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
+   */
+  DefsFactory getDefsFactory();
+
+  /**
+   * <!-- begin-user-doc -->
+   * Defines literals for the meta objects that represent
+   * <ul>
+   *   <li>each class,</li>
+   *   <li>each feature of each class,</li>
+   *   <li>each enum,</li>
+   *   <li>and each data type</li>
+   * </ul>
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  interface Literals
+  {
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
+     * @see org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl#getTestDef()
+     * @generated
+     */
+    EClass TEST_DEF = eINSTANCE.getTestDef();
+
+    /**
+     * The meta object literal for the '<em><b>References</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference TEST_DEF__REFERENCES = eINSTANCE.getTestDef_References();
+
+    /**
+     * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute TEST_DEF__ATTRIBUTE = eINSTANCE.getTestDef_Attribute();
+
+  }
+
+} //DefsPackage
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
new file mode 100644
index 0000000000..58515beafb
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
@@ -0,0 +1,73 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TestDef.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs;
+
+import org.eclipse.net4j.util.net4jutildefs.Def;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Test Def</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences <em>References</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.net4j.util.tests.defs.DefsPackage#getTestDef()
+ * @model
+ * @generated
+ */
+public interface TestDef extends Def {
+	/**
+   * Returns the value of the '<em><b>References</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.net4j.util.net4jutildefs.Def}.
+   * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>References</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+   * @return the value of the '<em>References</em>' reference list.
+   * @see org.eclipse.net4j.util.tests.defs.DefsPackage#getTestDef_References()
+   * @model
+   * @generated
+   */
+	EList<Def> getReferences();
+
+	/**
+   * Returns the value of the '<em><b>Attribute</b></em>' attribute.
+   * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Attribute</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+   * @return the value of the '<em>Attribute</em>' attribute.
+   * @see #setAttribute(String)
+   * @see org.eclipse.net4j.util.tests.defs.DefsPackage#getTestDef_Attribute()
+   * @model
+   * @generated
+   */
+	String getAttribute();
+
+	/**
+   * Sets the value of the '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}' attribute.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Attribute</em>' attribute.
+   * @see #getAttribute()
+   * @generated
+   */
+	void setAttribute(String value);
+
+} // TestDef
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
new file mode 100644
index 0000000000..20c5421c7a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
@@ -0,0 +1,255 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.util.tests.defs;
+
+import org.eclipse.net4j.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.util.lifecycle.LifecycleException;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.net4jutildefs.Def;
+import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.util.tests.AbstractOMTest;
+
+import org.eclipse.emf.common.notify.Notifier;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * @author Eike Stepper
+ */
+public class TestDefTest extends AbstractOMTest
+{
+  private Def def;
+
+  public TestDefTest()
+  {
+  }
+
+  @Override
+  public void doSetUp()
+  {
+    def = new BlockingTokenDef();
+  }
+
+  public void testGetInstanceReturnsSameInstance()
+  {
+    Object thisInstance = def.getInstance();
+    Object thatInstance = def.getInstance();
+    assertTrue(thisInstance == thatInstance);
+  }
+
+  public void testInstanceCreatedIsActivated()
+  {
+    Object thisInstance = def.getInstance();
+    assertTrue(LifecycleUtil.isActive(thisInstance));
+  }
+
+  public void testNewInstanceIsCreatedIfDefWasTouchedAfterwards() throws Exception
+  {
+    Def def = new DefImpl()
+    {
+      @Override
+      public boolean isTouched()
+      {
+        return true;
+      }
+
+      @Override
+      protected Object createInstance()
+      {
+        return new String("");
+      }
+    };
+
+    Object thisInstance = def.getInstance();
+    Object thatInstance = def.getInstance();
+    assertTrue(thatInstance != thisInstance);
+  }
+
+  public void testSameInstanceIfDefWasntTouched() throws Exception
+  {
+    Def def = new DefImpl()
+    {
+      @Override
+      public boolean isTouched()
+      {
+        return false;
+      }
+
+      @Override
+      protected Object createInstance()
+      {
+        return new String("");
+      }
+    };
+
+    Object thisInstance = def.getInstance();
+    Object thatInstance = def.getInstance();
+    assertTrue(thatInstance == thisInstance);
+  }
+
+  public void testSetAttributeTouches()
+  {
+    TestDef def = createTestDef();
+    assertTrue(!def.isTouched());
+    def.setAttribute("aValue");
+    assertTrue(def.isTouched());
+    def.getInstance(); // clears touched
+    assertTrue(!def.isTouched());
+  }
+
+  public void testAddReferenceTouches()
+  {
+    TestDef def = createTestDef();
+    assertTrue(!def.isTouched());
+    def.getReferences().add(createTestDef());
+    assertTrue(def.isTouched());
+  }
+
+  public void testSetInReferencedDefTouchesReferenchingDef()
+  {
+    TestDef def = createTestDef();
+    assertTrue(!def.isTouched());
+
+    TestDef referencedDef = createTestDef();
+    def.getReferences().add(referencedDef);
+    assertTrue(!referencedDef.isTouched());
+
+    referencedDef.setAttribute("newValue");
+    assertTrue(referencedDef.isTouched());
+    assertTrue(def.isTouched());
+  }
+
+  public void testNewInstanceIsCreatedIfCurrentIsDeactivated() throws Exception
+  {
+    BlockingToken thisInstance = (BlockingToken)def.getInstance();
+    LifecycleUtil.deactivate(thisInstance);
+
+    // Wait until instance gets deactivated
+    thisInstance.waitForDeactivation();
+    BlockingToken thatInstance = (BlockingToken)def.getInstance();
+    assertTrue(thatInstance != thisInstance);
+  }
+
+  public void testNewInstanceIsCreatedIfCurrentIsUnset() throws Exception
+  {
+    BlockingToken thisInstance = (BlockingToken)def.getInstance();
+    def.unsetInstance();
+
+    // Wait until instance gets deactivated
+    thisInstance.waitForDeactivation();
+    BlockingToken thatInstance = (BlockingToken)def.getInstance();
+    assertTrue(thatInstance != thisInstance);
+  }
+
+  private TestDef createTestDef()
+  {
+    return DefsFactory.eINSTANCE.createTestDef();
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  private static final class BlockingTokenDef extends DefImpl
+  {
+    public BlockingTokenDef()
+    {
+    }
+
+    @Override
+    protected Object createInstance()
+    {
+      return new BlockingToken();
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  private static final class BlockingToken extends Lifecycle
+  {
+    private static final long WAIT_TIMEOUT = 1000l;
+
+    private volatile boolean isActive = false;
+
+    private ReentrantLock reentrantLock = new ReentrantLock();
+
+    private Condition lockReleaseCondition = reentrantLock.newCondition();
+
+    public BlockingToken()
+    {
+    }
+
+    /**
+     * (Blocking) Wait for deactivation. The deactivation is triggered in a separate thread. This method allows you
+     * blocking wait for deactivation
+     * 
+     * @throws InterruptedException
+     *           the interrupted exception
+     * @see Notifier#fireEvent
+     */
+    public void waitForDeactivation() throws InterruptedException
+    {
+      long startTime = System.currentTimeMillis();
+      reentrantLock.lock();
+      try
+      {
+        while (isActive)
+        {
+          if (isTimeout(startTime))
+          {
+            throw new IllegalStateException("was not deactivated while waiting for '" + WAIT_TIMEOUT + "'!");
+          }
+
+          reentrantLock.wait(WAIT_TIMEOUT);
+        }
+      }
+      finally
+      {
+        reentrantLock.unlock();
+      }
+    }
+
+    @Override
+    protected void doActivate() throws LifecycleException
+    {
+      try
+      {
+        reentrantLock.lock();
+        isActive = true;
+      }
+      finally
+      {
+        reentrantLock.unlock();
+      }
+    }
+
+    @Override
+    protected void doDeactivate()
+    {
+      try
+      {
+        reentrantLock.lock();
+        isActive = false;
+        lockReleaseCondition.signal();
+      }
+      finally
+      {
+        reentrantLock.unlock();
+      }
+    }
+
+    private boolean isTimeout(long startTime)
+    {
+      return System.currentTimeMillis() - startTime > WAIT_TIMEOUT;
+    }
+  }
+}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java
new file mode 100644
index 0000000000..bedc3cca24
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsFactoryImpl.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.impl;
+
+import org.eclipse.net4j.util.tests.defs.DefsFactory;
+import org.eclipse.net4j.util.tests.defs.DefsPackage;
+import org.eclipse.net4j.util.tests.defs.TestDef;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
+{
+  /**
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static DefsFactory init()
+  {
+    try
+    {
+      DefsFactory theDefsFactory = (DefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); 
+      if (theDefsFactory != null)
+      {
+        return theDefsFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new DefsFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefsFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+      case DefsPackage.TEST_DEF: return createTestDef();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public TestDef createTestDef()
+  {
+    TestDefImpl testDef = new TestDefImpl();
+    return testDef;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefsPackage getDefsPackage()
+  {
+    return (DefsPackage)getEPackage();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @deprecated
+   * @generated
+   */
+  @Deprecated
+  public static DefsPackage getPackage()
+  {
+    return DefsPackage.eINSTANCE;
+  }
+
+} //DefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java
new file mode 100644
index 0000000000..cac94f0d68
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java
@@ -0,0 +1,222 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsPackageImpl.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.impl;
+
+import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.tests.defs.DefsFactory;
+import org.eclipse.net4j.util.tests.defs.DefsPackage;
+import org.eclipse.net4j.util.tests.defs.TestDef;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DefsPackageImpl extends EPackageImpl implements DefsPackage
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass testDefEClass = 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.net4j.util.tests.defs.DefsPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private DefsPackageImpl()
+  {
+    super(eNS_URI, DefsFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this
+   * model, and for any others upon which it depends.  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 DefsPackage init()
+  {
+    if (isInited) return (DefsPackage)EPackage.Registry.INSTANCE.getEPackage(DefsPackage.eNS_URI);
+
+    // Obtain or create and register package
+    DefsPackageImpl theDefsPackage = (DefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DefsPackageImpl());
+
+    isInited = true;
+
+    // Initialize simple dependencies
+    Net4jUtilDefsPackage.eINSTANCE.eClass();
+
+    // Create package meta-data objects
+    theDefsPackage.createPackageContents();
+
+    // Initialize created meta-data
+    theDefsPackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theDefsPackage.freeze();
+
+    return theDefsPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getTestDef()
+  {
+    return testDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getTestDef_References()
+  {
+    return (EReference)testDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getTestDef_Attribute()
+  {
+    return (EAttribute)testDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefsFactory getDefsFactory()
+  {
+    return (DefsFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isCreated = false;
+
+  /**
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated) return;
+    isCreated = true;
+
+    // Create classes and their features
+    testDefEClass = createEClass(TEST_DEF);
+    createEReference(testDefEClass, TEST_DEF__REFERENCES);
+    createEAttribute(testDefEClass, TEST_DEF__ATTRIBUTE);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @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);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    testDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Create resource
+    createResource(eNS_URI);
+  }
+
+} //DefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
new file mode 100644
index 0000000000..fcc5952d96
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
@@ -0,0 +1,215 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TestDefImpl.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.impl;
+
+import org.eclipse.net4j.util.net4jutildefs.Def;
+import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.util.tests.defs.DefsPackage;
+import org.eclipse.net4j.util.tests.defs.TestDef;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Def</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getReferences <em>References</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getAttribute <em>Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TestDefImpl extends DefImpl implements TestDef {
+	/**
+   * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see #getReferences()
+   * @generated
+   * @ordered
+   */
+	protected EList<Def> references;
+
+	/**
+   * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see #getAttribute()
+   * @generated
+   * @ordered
+   */
+	protected static final String ATTRIBUTE_EDEFAULT = null;
+	/**
+   * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see #getAttribute()
+   * @generated
+   * @ordered
+   */
+	protected String attribute = ATTRIBUTE_EDEFAULT;
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	protected TestDefImpl() {
+    super();
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	@Override
+	protected EClass eStaticClass() {
+    return DefsPackage.Literals.TEST_DEF;
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	public EList<Def> getReferences() {
+    if (references == null)
+    {
+      references = new EObjectResolvingEList<Def>(Def.class, this, DefsPackage.TEST_DEF__REFERENCES);
+    }
+    return references;
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	public String getAttribute() {
+    return attribute;
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	public void setAttribute(String newAttribute) {
+    String oldAttribute = attribute;
+    attribute = newAttribute;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, DefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute, attribute));
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+    switch (featureID)
+    {
+      case DefsPackage.TEST_DEF__REFERENCES:
+        return getReferences();
+      case DefsPackage.TEST_DEF__ATTRIBUTE:
+        return getAttribute();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+    switch (featureID)
+    {
+      case DefsPackage.TEST_DEF__REFERENCES:
+        getReferences().clear();
+        getReferences().addAll((Collection<? extends Def>)newValue);
+        return;
+      case DefsPackage.TEST_DEF__ATTRIBUTE:
+        setAttribute((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	@Override
+	public void eUnset(int featureID) {
+    switch (featureID)
+    {
+      case DefsPackage.TEST_DEF__REFERENCES:
+        getReferences().clear();
+        return;
+      case DefsPackage.TEST_DEF__ATTRIBUTE:
+        setAttribute(ATTRIBUTE_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+	/**
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @generated
+   */
+	@Override
+	public boolean eIsSet(int featureID) {
+    switch (featureID)
+    {
+      case DefsPackage.TEST_DEF__REFERENCES:
+        return references != null && !references.isEmpty();
+      case DefsPackage.TEST_DEF__ATTRIBUTE:
+        return ATTRIBUTE_EDEFAULT == null ? attribute != null : !ATTRIBUTE_EDEFAULT.equals(attribute);
+    }
+    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(" (attribute: ");
+    result.append(attribute);
+    result.append(')');
+    return result.toString();
+  }
+
+		@Override
+  protected Object createInstance()
+  {
+    return new String("TestDefStringInstance");
+  }
+
+} //TestDefImpl
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java
new file mode 100644
index 0000000000..5885ef4974
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsAdapterFactory.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.util;
+
+import org.eclipse.net4j.util.net4jutildefs.Def;
+import org.eclipse.net4j.util.tests.defs.DefsPackage;
+import org.eclipse.net4j.util.tests.defs.TestDef;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.net4j.util.tests.defs.DefsPackage
+ * @generated
+ */
+public class DefsAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static DefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefsAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = DefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    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 -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DefsSwitch<Adapter> modelSwitch =
+    new DefsSwitch<Adapter>()
+    {
+      @Override
+      public Adapter caseTestDef(TestDef object)
+      {
+        return createTestDefAdapter();
+      }
+      @Override
+      public Adapter caseDef(Def object)
+      {
+        return createDefAdapter();
+      }
+      @Override
+      public Adapter defaultCase(EObject object)
+      {
+        return createEObjectAdapter();
+      }
+    };
+
+  /**
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test 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.tests.defs.TestDef
+   * @generated
+   */
+  public Adapter createTestDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @generated
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} //DefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java
new file mode 100644
index 0000000000..857ab943f3
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java
@@ -0,0 +1,167 @@
+/**
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: DefsSwitch.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.util;
+
+import org.eclipse.net4j.util.net4jutildefs.Def;
+import org.eclipse.net4j.util.tests.defs.DefsPackage;
+import org.eclipse.net4j.util.tests.defs.TestDef;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.net4j.util.tests.defs.DefsPackage
+ * @generated
+ */
+public class DefsSwitch<T>
+{
+  /**
+   * The cached model package
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static DefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefsSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = DefsPackage.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 -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  public T doSwitch(EObject 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 -->
+   * <!-- end-user-doc -->
+   * @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);
+    }
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+      case DefsPackage.TEST_DEF:
+      {
+        TestDef testDef = (TestDef)theEObject;
+        T result = caseTestDef(testDef);
+        if (result == null) result = caseDef(testDef);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      default: return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Test 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>Test Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTestDef(TestDef object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T caseDef(Def object)
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} //DefsSwitch
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/validation/TestDefValidator.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/validation/TestDefValidator.java
new file mode 100644
index 0000000000..0a401e9bdb
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/validation/TestDefValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TestDefValidator.java,v 1.1 2008-12-30 08:43:08 estepper Exp $
+ */
+package org.eclipse.net4j.util.tests.defs.validation;
+
+import org.eclipse.net4j.util.net4jutildefs.Def;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * A sample validator interface for {@link org.eclipse.net4j.util.tests.defs.TestDef}.
+ * 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 TestDefValidator
+{
+  boolean validate();
+
+  boolean validateReferences(EList<Def> value);
+  boolean validateAttribute(String value);
+}
diff --git a/plugins/org.eclipse.net4j.tests/text/description.txt b/plugins/org.eclipse.net4j.tests/text/description.txt
new file mode 100644
index 0000000000..1ab3266821
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tests/text/description.txt
@@ -0,0 +1,12 @@
+Model TestDef
+
+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 defs <http://www.eclipse.org/NET4J/defs/tests/1.0.0>
+
+  Class TestDef -> Def
+    Reference references : Def<<0..*>>
+    Attribute attribute : EString