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

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

60 files changed, 1011 insertions, 4482 deletions

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/defs/AcceptorDef.java
index 1ccaf5fee0..36633e37cf 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/AcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
@@ -1,13 +1,20 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: AcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: AcceptorDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -16,14 +23,14 @@ import org.eclipse.emf.common.util.EList;
  * <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.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef()
  * @model abstract="true"
  * @generated
  */
@@ -39,14 +46,14 @@ public interface AcceptorDef extends Def
    * 
    * @return the value of the '<em>Buffer Provider</em>' reference.
    * @see #setBufferProvider(BufferPoolDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
    * @model
    * @generated
    */
   BufferPoolDef getBufferProvider();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'
+   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -66,15 +73,15 @@ public interface AcceptorDef extends Def
    * 
    * @return the value of the '<em>Executor Service</em>' reference.
    * @see #setExecutorService(ThreadPoolDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ExecutorService()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.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.
@@ -95,15 +102,15 @@ public interface AcceptorDef extends Def
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
    * @see #setNegotiator(NegotiatorDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_Negotiator()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
    *          the new value of the '<em>Negotiator</em>' reference.
@@ -115,8 +122,8 @@ public interface AcceptorDef extends Def
   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 -->
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetNegotiator()
    * @see #getNegotiator()
@@ -126,8 +133,8 @@ public interface AcceptorDef extends Def
   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 -->
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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()
@@ -139,7 +146,7 @@ public interface AcceptorDef extends Def
 
   /**
    * 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 -->
+   * {@link org.eclipse.net4j.defs.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...
@@ -149,14 +156,14 @@ public interface AcceptorDef extends Def
    * @return the value of the '<em>Server Protocol Provider</em>' reference list.
    * @see #isSetServerProtocolProvider()
    * @see #unsetServerProtocolProvider()
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getAcceptorDef_ServerProtocolProvider()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_ServerProtocolProvider()
    * @model unsettable="true" required="true"
    * @generated
    */
   EList<ServerProtocolFactoryDef> getServerProtocolProvider();
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider
    * <em>Server Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetServerProtocolProvider()
@@ -166,7 +173,7 @@ public interface AcceptorDef extends Def
   void unsetServerProtocolProvider();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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.
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
new file mode 100644
index 0000000000..f2b0bc0b05
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: BufferPoolDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferPoolDef()
+ * @model
+ * @generated
+ */
+public interface BufferPoolDef extends BufferProviderDef
+{
+
+} // BufferPoolDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
new file mode 100644
index 0000000000..72214b8c49
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: BufferProviderDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+import org.eclipse.net4j.util.defs.Def;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Provider Def</b></em>'. <!-- end-user-doc
+ * -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferProviderDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface BufferProviderDef extends Def
+{
+
+} // BufferProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
new file mode 100644
index 0000000000..6785110b88
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: ClientProtocolFactoryDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getClientProtocolFactoryDef()
+ * @model abstract="true"
+ * @generated
+ */
+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/defs/ConnectorDef.java
index 4bb0c1e386..10c733c1e6 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
@@ -1,13 +1,20 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: ConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: ConnectorDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -16,15 +23,15 @@ import org.eclipse.emf.common.util.EList;
  * <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.defs.ConnectorDef#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef()
  * @model abstract="true"
  * @generated
  */
@@ -42,14 +49,14 @@ public interface ConnectorDef extends Def
    * @see #isSetUserID()
    * @see #unsetUserID()
    * @see #setUserID(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_UserID()
+   * @see org.eclipse.net4j.defs.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. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -62,8 +69,8 @@ public interface ConnectorDef extends Def
   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 -->
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetUserID()
    * @see #getUserID()
@@ -73,8 +80,8 @@ public interface ConnectorDef extends Def
   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 -->
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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()
@@ -94,14 +101,14 @@ public interface ConnectorDef extends Def
    * 
    * @return the value of the '<em>Buffer Provider</em>' reference.
    * @see #setBufferProvider(BufferProviderDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_BufferProvider()
+   * @see org.eclipse.net4j.defs.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>}'
+   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -121,15 +128,15 @@ public interface ConnectorDef extends Def
    * 
    * @return the value of the '<em>Executor Service</em>' reference.
    * @see #setExecutorService(ExecutorServiceDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ExecutorService()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.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.
@@ -150,15 +157,15 @@ public interface ConnectorDef extends Def
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
    * @see #setNegotiator(NegotiatorDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_Negotiator()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
    *          the new value of the '<em>Negotiator</em>' reference.
@@ -170,8 +177,8 @@ public interface ConnectorDef extends Def
   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 -->
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetNegotiator()
    * @see #getNegotiator()
@@ -181,8 +188,8 @@ public interface ConnectorDef extends Def
   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 -->
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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()
@@ -194,7 +201,7 @@ public interface ConnectorDef extends Def
 
   /**
    * 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 -->
+   * {@link org.eclipse.net4j.defs.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...
@@ -204,14 +211,14 @@ public interface ConnectorDef extends Def
    * @return the value of the '<em>Client Protocol Provider</em>' reference list.
    * @see #isSetClientProtocolProvider()
    * @see #unsetClientProtocolProvider()
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getConnectorDef_ClientProtocolProvider()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_ClientProtocolProvider()
    * @model unsettable="true" required="true"
    * @generated
    */
   EList<ClientProtocolFactoryDef> getClientProtocolProvider();
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider
    * <em>Client Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetClientProtocolProvider()
@@ -221,7 +228,7 @@ public interface ConnectorDef extends Def
   void unsetClientProtocolProvider();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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.
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/defs/HTTPConnectorDef.java
index 881d64a8e4..24630b2aaf 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/HTTPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: HTTPConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: HTTPConnectorDef.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>HTTP Connector Def</b></em>'. <!-- end-user-doc
@@ -12,17 +18,16 @@ package org.eclipse.net4j.net4jdefs;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getHTTPConnectorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef()
  * @model
  * @generated
  */
 public interface HTTPConnectorDef extends ConnectorDef
 {
-
   /**
    * Returns the value of the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
@@ -32,14 +37,14 @@ public interface HTTPConnectorDef extends ConnectorDef
    * 
    * @return the value of the '<em>Url</em>' attribute.
    * @see #setUrl(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getHTTPConnectorDef_Url()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef_Url()
    * @model
    * @generated
    */
   String getUrl();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -48,4 +53,5 @@ public interface HTTPConnectorDef extends ConnectorDef
    * @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/defs/JVMAcceptorDef.java
index 3a5449906a..6416ffd78f 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: JVMAcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: JVMAcceptorDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Acceptor Def</b></em>'. <!-- end-user-doc
@@ -12,17 +18,16 @@ package org.eclipse.net4j.net4jdefs;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMAcceptorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef()
  * @model
  * @generated
  */
 public interface JVMAcceptorDef extends AcceptorDef
 {
-
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
@@ -32,14 +37,14 @@ public interface JVMAcceptorDef extends AcceptorDef
    * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMAcceptorDef_Name()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef_Name()
    * @model
    * @generated
    */
   String getName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -48,4 +53,5 @@ public interface JVMAcceptorDef extends AcceptorDef
    * @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/defs/JVMConnectorDef.java
index a018982cac..c3e1fa7898 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/JVMConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: JVMConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: JVMConnectorDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Connector Def</b></em>'. <!-- end-user-doc
@@ -12,17 +18,16 @@ package org.eclipse.net4j.net4jdefs;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMConnectorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef()
  * @model
  * @generated
  */
 public interface JVMConnectorDef extends ConnectorDef
 {
-
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
@@ -32,14 +37,14 @@ public interface JVMConnectorDef extends ConnectorDef
    * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getJVMConnectorDef_Name()
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef_Name()
    * @model
    * @generated
    */
   String getName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -48,4 +53,5 @@ public interface JVMConnectorDef extends ConnectorDef
    * @generated
    */
   void setName(String value);
+
 } // JVMConnectorDef
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/defs/Net4jDefsFactory.java
index 30df7c0384..42733d4e2b 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsFactory.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsFactory.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -12,7 +18,7 @@ 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.net4jdefs.Net4jDefsPackage
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
 public interface Net4jDefsFactory extends EFactory
@@ -22,7 +28,7 @@ public interface Net4jDefsFactory extends EFactory
    * 
    * @generated
    */
-  Net4jDefsFactory eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsFactoryImpl.init();
+  Net4jDefsFactory eINSTANCE = org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>TCP Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -65,22 +71,6 @@ public interface Net4jDefsFactory extends EFactory
   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>'.
@@ -97,39 +87,6 @@ public interface Net4jDefsFactory extends EFactory
   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.
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/defs/Net4jDefsPackage.java
index 39c3d5f2d9..7cb02c21e1 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/Net4jDefsPackage.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
@@ -1,12 +1,18 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsPackage.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsPackage.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -23,7 +29,7 @@ import org.eclipse.emf.ecore.EReference;
  * </ul>
  * <!-- end-user-doc -->
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsFactory
+ * @see org.eclipse.net4j.defs.Net4jDefsFactory
  * @model kind="package"
  * @generated
  */
@@ -34,7 +40,7 @@ public interface Net4jDefsPackage extends EPackage
    * 
    * @generated
    */
-  String eNAME = "net4jdefs";
+  String eNAME = "defs";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -48,21 +54,21 @@ public interface Net4jDefsPackage extends EPackage
    * 
    * @generated
    */
-  String eNS_PREFIX = "net4jdefs";
+  String eNS_PREFIX = "net4j.defs";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    */
-  Net4jDefsPackage eINSTANCE = org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl.init();
+  Net4jDefsPackage eINSTANCE = org.eclipse.net4j.defs.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 -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.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()
+   * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
    * @generated
    */
   int CONNECTOR_DEF = 0;
@@ -118,172 +124,52 @@ public interface Net4jDefsPackage extends EPackage
   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 -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
+   * <em>Protocol 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()
+   * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
    * @generated
    */
-  int BUFFER_PROVIDER_DEF = 13;
+  int PROTOCOL_PROVIDER_DEF = 12;
 
   /**
-   * 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 -->
+   * The number of structural features of the '<em>Protocol Provider 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
+   * @ordered
    */
-  int BUFFER_POOL_DEF = 14;
+  int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * 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 -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
+   * <em>Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @see org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
-   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
+   * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
    * @generated
    */
-  int PROTOCOL_PROVIDER_DEF = 15;
+  int CLIENT_PROTOCOL_FACTORY_DEF = 1;
 
   /**
-   * The number of structural features of the '<em>Protocol Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+  int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
+   * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
    * @generated
-   * @ordered
    */
-  int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
+  int TCP_CONNECTOR_DEF = 2;
 
   /**
    * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -360,6 +246,16 @@ public interface Net4jDefsPackage extends EPackage
   int TCP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 3;
 
   /**
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
+   * @generated
+   */
+  int ACCEPTOR_DEF = 3;
+
+  /**
    * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -402,6 +298,16 @@ public interface Net4jDefsPackage extends EPackage
   int ACCEPTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
 
   /**
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
+   * @generated
+   */
+  int TCP_ACCEPTOR_DEF = 4;
+
+  /**
    * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -468,6 +374,16 @@ public interface Net4jDefsPackage extends EPackage
   int TCP_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 3;
 
   /**
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
+   * @generated
+   */
+  int JVM_ACCEPTOR_DEF = 5;
+
+  /**
    * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -518,6 +434,16 @@ public interface Net4jDefsPackage extends EPackage
   int JVM_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
 
   /**
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
+   * @generated
+   */
+  int JVM_CONNECTOR_DEF = 6;
+
+  /**
    * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -576,6 +502,16 @@ public interface Net4jDefsPackage extends EPackage
   int JVM_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
 
   /**
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
+   * @generated
+   */
+  int HTTP_CONNECTOR_DEF = 7;
+
+  /**
    * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -634,56 +570,14 @@ public interface Net4jDefsPackage extends EPackage
   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 -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
+   * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
    * @generated
-   * @ordered
    */
-  int CHALLENGE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 2;
+  int TCP_SELECTOR_DEF = 8;
 
   /**
    * The number of structural features of the '<em>TCP Selector Def</em>' class. <!-- begin-user-doc --> <!--
@@ -695,223 +589,111 @@ public interface Net4jDefsPackage extends EPackage
   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 -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
+   * <em>Server Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
+   * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
    * @generated
-   * @ordered
    */
-  int CREDENTIALS_PROVIDER_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+  int SERVER_PROTOCOL_FACTORY_DEF = 9;
 
   /**
-   * The number of structural features of the '<em>Credentials Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Server Protocol Factory 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;
+  int SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.UserManagerDefImpl <em>User Manager Def</em>}'
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider 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()
+   * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
    * @generated
    */
-  int USER = 18;
+  int BUFFER_PROVIDER_DEF = 10;
 
   /**
-   * 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 --> <!--
+   * The number of structural features of the '<em>Buffer Provider Def</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int USER_MANAGER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
+  int BUFFER_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl <em>Randomizer Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @see org.eclipse.net4j.net4jdefs.impl.RandomizerDefImpl
-   * @see org.eclipse.net4j.net4jdefs.impl.Net4jDefsPackageImpl#getRandomizerDef()
+   * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
+   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
    * @generated
    */
-  int RANDOMIZER_DEF = 20;
+  int BUFFER_POOL_DEF = 11;
 
   /**
-   * The number of structural features of the '<em>Randomizer Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
+   * The number of structural features of the '<em>Buffer Pool Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int RANDOMIZER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
+  int BUFFER_POOL_DEF_FEATURE_COUNT = BUFFER_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ConnectorDef <em>Connector Def</em>}'. <!--
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.ConnectorDef#getUserID()
    * @see #getConnectorDef()
    * @generated
    */
   EAttribute getConnectorDef_UserID();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getBufferProvider
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.ConnectorDef#getBufferProvider()
    * @see #getConnectorDef()
    * @generated
    */
   EReference getConnectorDef_BufferProvider();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getExecutorService
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.ConnectorDef#getExecutorService()
    * @see #getConnectorDef()
    * @generated
    */
   EReference getConnectorDef_ExecutorService();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.ConnectorDef#getNegotiator
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.ConnectorDef#getNegotiator()
    * @see #getConnectorDef()
    * @generated
    */
@@ -919,107 +701,107 @@ public interface Net4jDefsPackage extends EPackage
 
   /**
    * Returns the meta object for the reference list '
-   * {@link org.eclipse.net4j.net4jdefs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'. <!--
+   * {@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider()
    * @see #getConnectorDef()
    * @generated
    */
   EReference getConnectorDef_ClientProtocolProvider();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.TCPConnectorDef
    * @generated
    */
   EClass getTCPConnectorDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getTcpSelectorDef
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.TCPConnectorDef#getPort()
    * @see #getTCPConnectorDef()
    * @generated
    */
   EAttribute getTCPConnectorDef_Port();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.AcceptorDef <em>Acceptor Def</em>}'. <!--
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.AcceptorDef
    * @generated
    */
   EClass getAcceptorDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getBufferProvider
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.AcceptorDef#getBufferProvider()
    * @see #getAcceptorDef()
    * @generated
    */
   EReference getAcceptorDef_BufferProvider();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getExecutorService
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.AcceptorDef#getExecutorService()
    * @see #getAcceptorDef()
    * @generated
    */
   EReference getAcceptorDef_ExecutorService();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.AcceptorDef#getNegotiator
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.AcceptorDef#getNegotiator()
    * @see #getAcceptorDef()
    * @generated
    */
@@ -1027,344 +809,173 @@ public interface Net4jDefsPackage extends EPackage
 
   /**
    * Returns the meta object for the reference list '
-   * {@link org.eclipse.net4j.net4jdefs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'. <!--
+   * {@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.TCPAcceptorDef#getPort()
    * @see #getTCPAcceptorDef()
    * @generated
    */
   EAttribute getTCPAcceptorDef_Port();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef#getTcpSelectorDef
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.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 org.eclipse.net4j.defs.HTTPConnectorDef#getUrl()
    * @see #getHTTPConnectorDef()
    * @generated
    */
   EAttribute getHTTPConnectorDef_Url();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.NegotiatorDef <em>Negotiator Def</em>}'. <!--
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector 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
+   * @see org.eclipse.net4j.defs.TCPSelectorDef
    * @generated
    */
   EClass getTCPSelectorDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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 -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.BufferPoolDef
    * @generated
    */
   EClass getBufferPoolDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.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.
@@ -1387,11 +998,11 @@ public interface Net4jDefsPackage extends EPackage
   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 -->
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
      * @generated
      */
     EClass CONNECTOR_DEF = eINSTANCE.getConnectorDef();
@@ -1437,21 +1048,21 @@ public interface Net4jDefsPackage extends EPackage
     EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ClientProtocolFactoryDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
      * @generated
      */
     EClass CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getClientProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
      * @generated
      */
     EClass TCP_CONNECTOR_DEF = eINSTANCE.getTCPConnectorDef();
@@ -1481,11 +1092,11 @@ public interface Net4jDefsPackage extends EPackage
     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>}'
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
      * @generated
      */
     EClass ACCEPTOR_DEF = eINSTANCE.getAcceptorDef();
@@ -1523,11 +1134,11 @@ public interface Net4jDefsPackage extends EPackage
     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 -->
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
      * @generated
      */
     EClass TCP_ACCEPTOR_DEF = eINSTANCE.getTCPAcceptorDef();
@@ -1557,11 +1168,11 @@ public interface Net4jDefsPackage extends EPackage
     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 -->
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
      * @generated
      */
     EClass JVM_ACCEPTOR_DEF = eINSTANCE.getJVMAcceptorDef();
@@ -1575,11 +1186,11 @@ public interface Net4jDefsPackage extends EPackage
     EAttribute JVM_ACCEPTOR_DEF__NAME = eINSTANCE.getJVMAcceptorDef_Name();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
      * @generated
      */
     EClass JVM_CONNECTOR_DEF = eINSTANCE.getJVMConnectorDef();
@@ -1593,11 +1204,11 @@ public interface Net4jDefsPackage extends EPackage
     EAttribute JVM_CONNECTOR_DEF__NAME = eINSTANCE.getJVMConnectorDef_Name();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.HTTPConnectorDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
      * @generated
      */
     EClass HTTP_CONNECTOR_DEF = eINSTANCE.getHTTPConnectorDef();
@@ -1611,199 +1222,55 @@ public interface Net4jDefsPackage extends EPackage
     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 -->
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
      * @generated
      */
     EClass TCP_SELECTOR_DEF = eINSTANCE.getTCPSelectorDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ServerProtocolFactoryDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
      * @generated
      */
     EClass SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getServerProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.BufferProviderDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
+     * @see org.eclipse.net4j.defs.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 -->
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
+     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
      * @generated
      */
     EClass BUFFER_POOL_DEF = eINSTANCE.getBufferPoolDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.net4jdefs.impl.ProtocolProviderDefImpl
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.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()
+     * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
+     * @see org.eclipse.net4j.defs.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/defs/ProtocolProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
new file mode 100644
index 0000000000..11c0c26fd5
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: ProtocolProviderDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+import org.eclipse.net4j.util.defs.Def;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getProtocolProviderDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ProtocolProviderDef extends Def
+{
+
+} // ProtocolProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
new file mode 100644
index 0000000000..4a9d645b94
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: ServerProtocolFactoryDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Server Protocol Factory Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getServerProtocolFactoryDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ServerProtocolFactoryDef extends ProtocolProviderDef
+{
+
+} // ServerProtocolFactoryDef
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/defs/TCPAcceptorDef.java
index 6215807aed..3be8234e8e 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: TCPAcceptorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: TCPAcceptorDef.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc
@@ -12,19 +18,18 @@ package org.eclipse.net4j.net4jdefs;
  * <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.defs.TCPAcceptorDef#getHost <em>Host</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef()
  * @model
  * @generated
  */
 public interface TCPAcceptorDef extends AcceptorDef
 {
-
   /**
    * Returns the value of the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
@@ -34,14 +39,14 @@ public interface TCPAcceptorDef extends AcceptorDef
    * 
    * @return the value of the '<em>Host</em>' attribute.
    * @see #setHost(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Host()
+   * @see org.eclipse.net4j.defs.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. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -60,14 +65,14 @@ public interface TCPAcceptorDef extends AcceptorDef
    * 
    * @return the value of the '<em>Port</em>' attribute.
    * @see #setPort(int)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_Port()
+   * @see org.eclipse.net4j.defs.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. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -87,15 +92,15 @@ public interface TCPAcceptorDef extends AcceptorDef
    * 
    * @return the value of the '<em>Tcp Selector Def</em>' reference.
    * @see #setTcpSelectorDef(TCPSelectorDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPAcceptorDef_TcpSelectorDef()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.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.
@@ -103,4 +108,5 @@ public interface TCPAcceptorDef extends AcceptorDef
    * @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/defs/TCPConnectorDef.java
index c64c2be5f9..97cfdbbc20 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
@@ -1,10 +1,16 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: TCPConnectorDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: TCPConnectorDef.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs;
+package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Connector Def</b></em>'. <!-- end-user-doc
@@ -12,13 +18,13 @@ package org.eclipse.net4j.net4jdefs;
  * <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.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef()
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef()
  * @model
  * @generated
  */
@@ -34,15 +40,15 @@ public interface TCPConnectorDef extends ConnectorDef
    * 
    * @return the value of the '<em>Tcp Selector Def</em>' reference.
    * @see #setTcpSelectorDef(TCPSelectorDef)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_TcpSelectorDef()
+   * @see org.eclipse.net4j.defs.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 -->
+   * Sets the value of the '{@link org.eclipse.net4j.defs.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.
@@ -60,14 +66,14 @@ public interface TCPConnectorDef extends ConnectorDef
    * 
    * @return the value of the '<em>Host</em>' attribute.
    * @see #setHost(String)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Host()
+   * @see org.eclipse.net4j.defs.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. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -88,14 +94,14 @@ public interface TCPConnectorDef extends ConnectorDef
    * @see #isSetPort()
    * @see #unsetPort()
    * @see #setPort(int)
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPConnectorDef_Port()
+   * @see org.eclipse.net4j.defs.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. <!--
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
@@ -108,7 +114,7 @@ public interface TCPConnectorDef extends ConnectorDef
   void setPort(int value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see #isSetPort()
@@ -119,8 +125,8 @@ public interface TCPConnectorDef extends ConnectorDef
   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 -->
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.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()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
new file mode 100644
index 0000000000..3de3b8c5bb
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: TCPSelectorDef.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
+ */
+package org.eclipse.net4j.defs;
+
+import org.eclipse.net4j.util.defs.Def;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
+ * -->
+ * 
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPSelectorDef()
+ * @model
+ * @generated
+ */
+public interface TCPSelectorDef extends Def
+{
+
+} // TCPSelectorDef
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/defs/impl/AcceptorDefImpl.java
index a328353427..19a1242c69 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/defs/impl/AcceptorDefImpl.java
@@ -1,25 +1,27 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *   André Dietisheim - initial API and implementation
  *
- * $Id: AcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.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.protocol.IProtocolProvider;
+import org.eclipse.net4j.defs.AcceptorDef;
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
+import org.eclipse.net4j.defs.util.Net4jDefsUtil;
 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.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.impl.DefImpl;
 import org.eclipse.net4j.util.security.INegotiator;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -31,8 +33,6 @@ 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;
 
 /**
@@ -40,11 +40,10 @@ import java.util.concurrent.ExecutorService;
  * <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.defs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
  * </ul>
  * </p>
  * 
@@ -135,10 +134,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
-        }
       }
     }
     return bufferProvider;
@@ -164,10 +161,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     BufferPoolDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
-    }
   }
 
   /**
@@ -184,10 +179,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
-        }
       }
     }
     return executorService;
@@ -213,10 +206,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     ThreadPoolDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
-    }
   }
 
   /**
@@ -233,10 +224,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
-        }
       }
     }
     return negotiator;
@@ -264,10 +253,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
-    }
   }
 
   /**
@@ -282,10 +269,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           null, oldNegotiatorESet));
-    }
   }
 
   /**
@@ -321,9 +306,7 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   public void unsetServerProtocolProvider()
   {
     if (serverProtocolProvider != null)
-    {
       ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
-    }
   }
 
   /**
@@ -348,21 +331,15 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     {
     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();
@@ -467,35 +444,17 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
    */
   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()));
+      config.setProtocolProvider(Net4jDefsUtil.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/defs/impl/BufferPoolDefImpl.java
index 5915415f2e..4d2ed46198 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/defs/impl/BufferPoolDefImpl.java
@@ -1,15 +1,19 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *   André Dietisheim - initial API and implementation
  *
- * $Id: BufferPoolDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
 import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.net4jdefs.BufferPoolDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
@@ -52,9 +56,6 @@ public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPo
   @Override
   protected Object createInstance()
   {
-    IBufferProvider bufferProvider = Net4jUtil.createBufferPool();
-    // LifecycleUtil.activate(bufferProvider);
-    return bufferProvider;
+    return Net4jUtil.createBufferPool();
   }
-
 } // 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/defs/impl/BufferProviderDefImpl.java
index a4dbad459e..f06becfac9 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/defs/impl/BufferProviderDefImpl.java
@@ -1,14 +1,20 @@
 /**
- * <copyright>
- * </copyright>
+ *  * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ *  * 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:
+ *  *    André Dietisheim - initial API and implementation
  *
- * $Id: BufferProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: BufferProviderDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.defs.BufferProviderDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.util.defs.impl.DefImpl;
 
 import org.eclipse.emf.ecore.EClass;
 
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/defs/impl/ClientProtocolFactoryDefImpl.java
index 367550018d..f9921b6583 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/defs/impl/ClientProtocolFactoryDefImpl.java
@@ -1,13 +1,19 @@
 /**
- * <copyright>
- * </copyright>
+ *  * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ *  * 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:
+ *  *    André Dietisheim - initial API and implementation
  *
- * $Id: ClientProtocolFactoryDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: ClientProtocolFactoryDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
-import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
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/defs/impl/ConnectorDefImpl.java
index 348f4f7871..84669f39d5 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/defs/impl/ConnectorDefImpl.java
@@ -1,23 +1,29 @@
 /**
- * <copyright>
- * </copyright>
+ *  * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ *  * 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:
+ *  *    André Dietisheim - initial API and implementation
  *
- * $Id: ConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: ConnectorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
 import org.eclipse.net4j.ITransportConfig;
 import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-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.defs.BufferProviderDef;
+import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
+import org.eclipse.net4j.defs.ConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.util.Net4jDefsUtil;
 import org.eclipse.net4j.protocol.IProtocolProvider;
 import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.impl.DefImpl;
 import org.eclipse.net4j.util.security.INegotiator;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -33,18 +39,16 @@ import org.eclipse.spi.net4j.Connector;
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
 
-// TODO: Auto-generated Javadoc
 /**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Connector Def</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Connector Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl#getUserID <em>User ID</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ConnectorDefImpl#getClientProtocolProvider <em>Client Protocol Provider
- * </em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getExecutorService <em>Executor Service</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getNegotiator <em>Negotiator</em>}</li>
+ * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
  * </ul>
  * </p>
  * 
@@ -52,16 +56,23 @@ import java.util.concurrent.ExecutorService;
  */
 public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 {
-
   /**
    * 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;
 
@@ -122,31 +133,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected EList<ClientProtocolFactoryDef> clientProtocolProvider;
 
   /**
-   * The cached value of the '{@link #getBufferProviderDef() <em>Buffer Provider Def</em>}' reference. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   */
-  protected BufferProviderDef bufferProviderDef;
-
-  /**
-   * The cached value of the '{@link #getExecutorServiceDef() <em>Executor Service Def</em>}' reference. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   */
-  protected ExecutorServiceDef executorServiceDef;
-
-  /**
-   * The cached value of the '{@link #getNegotiatorDef() <em>Negotiator Def</em>}' reference. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   */
-  protected NegotiatorDef negotiatorDef;
-
-  /**
-   * The cached value of the '{@link #getClientProtocolFactoryDef() <em>Client Protocol Factory Def</em>}' reference
-   * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   */
-  protected EList<ClientProtocolFactoryDef> clientProtocolFactoryDef;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    */
@@ -156,9 +143,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @return the e class
    * @generated
    */
   @Override
@@ -168,9 +154,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @return the user id
    * @generated
    */
   public String getUserID()
@@ -179,10 +164,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @param newUserID
-   *          the new user id
    * @generated
    */
   public void setUserID(String newUserID)
@@ -192,10 +175,8 @@ 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));
-    }
   }
 
   /**
@@ -210,10 +191,8 @@ 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));
-    }
   }
 
   /**
@@ -240,10 +219,8 @@ 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;
@@ -269,10 +246,8 @@ 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));
-    }
   }
 
   /**
@@ -289,10 +264,8 @@ 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;
@@ -318,10 +291,8 @@ 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));
-    }
   }
 
   /**
@@ -338,10 +309,8 @@ 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;
@@ -369,10 +338,8 @@ 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));
-    }
   }
 
   /**
@@ -387,10 +354,8 @@ 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));
-    }
   }
 
   /**
@@ -426,9 +391,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public void unsetClientProtocolProvider()
   {
     if (clientProtocolProvider != null)
-    {
       ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
-    }
   }
 
   /**
@@ -442,15 +405,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @param featureID
-   *          the feature id
-   * @param resolve
-   *          the resolve
-   * @param coreType
-   *          the core type
-   * @return the object
    * @generated
    */
   @Override
@@ -462,21 +418,15 @@ 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();
@@ -485,12 +435,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @param featureID
-   *          the feature id
-   * @param newValue
-   *          the new value
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -520,10 +466,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @param featureID
-   *          the feature id
    * @generated
    */
   @Override
@@ -551,11 +495,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @param featureID
-   *          the feature id
-   * @return true, if e is set
    * @generated
    */
   @Override
@@ -578,29 +519,22 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
-   * @return the string
    * @generated
    */
   @Override
   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();
   }
@@ -614,6 +548,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
    * <li>{@link IProtocolProvider}</li>
    * </ul>
    * 
+   * @param config
+   *          the transport config
    * @ADDED
    */
   protected void configure(ITransportConfig config)
@@ -622,7 +558,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     config.setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
     if (isSetClientProtocolProvider())
     {
-      config.setProtocolProvider(AcceptorDefImpl.createFactoriesProtocolProvider(getClientProtocolProvider()));
+      config.setProtocolProvider(Net4jDefsUtil.createFactoriesProtocolProvider(getClientProtocolProvider()));
     }
     if (isSetNegotiator())
     {
@@ -658,10 +594,4 @@ 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/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
index af2a794eb6..90c4453205 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/defs/impl/HTTPConnectorDefImpl.java
@@ -1,15 +1,21 @@
 /**
- * <copyright>
- * </copyright>
+ *  * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ *  * 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:
+ *  *    André Dietisheim - initial API and implementation
  *
- * $Id: HTTPConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: HTTPConnectorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
+import org.eclipse.net4j.defs.HTTPConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
 import org.eclipse.net4j.http.common.IHTTPConnector;
 import org.eclipse.net4j.internal.http.HTTPClientConnector;
-import org.eclipse.net4j.net4jdefs.HTTPConnectorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
 import org.eclipse.net4j.util.CheckUtil;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -17,12 +23,12 @@ 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.defs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
  * 
@@ -89,9 +95,7 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
     String oldUrl = url;
     url = newUrl;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
-    }
   }
 
   /**
@@ -169,9 +173,7 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
@@ -183,7 +185,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
   /**
    * @ADDED
    */
-  @Override
   protected IHTTPConnector createInstance()
   {
     HTTPClientConnector connector = new HTTPClientConnector();
@@ -195,9 +196,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
     return connector;
   }
 
-  /**
-   * @ADDED
-   */
   @Override
   protected void validateDefinition()
   {
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/defs/impl/JVMAcceptorDefImpl.java
index 2d0c3e9525..9318f85827 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/defs/impl/JVMAcceptorDefImpl.java
@@ -1,15 +1,21 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: JVMAcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: JVMAcceptorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
 import org.eclipse.net4j.buffer.IBufferProvider;
+import org.eclipse.net4j.defs.JVMAcceptorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
 import org.eclipse.net4j.internal.jvm.JVMAcceptor;
-import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
 import org.eclipse.net4j.util.CheckUtil;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -18,18 +24,6 @@ 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
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMAcceptorDefImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
 public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDef
 {
   /**
@@ -92,9 +86,7 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
-    }
   }
 
   /**
@@ -172,9 +164,7 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
@@ -206,3 +196,4 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     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/defs/impl/JVMConnectorDefImpl.java
index 483431a154..a5d26576b4 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/defs/impl/JVMConnectorDefImpl.java
@@ -1,15 +1,21 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: JVMConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: JVMConnectorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
+import org.eclipse.net4j.defs.JVMConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
 import org.eclipse.net4j.internal.jvm.JVMClientConnector;
 import org.eclipse.net4j.jvm.IJVMConnector;
-import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
 import org.eclipse.net4j.util.CheckUtil;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -90,9 +96,7 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
-    }
   }
 
   /**
@@ -170,9 +174,7 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
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/defs/impl/Net4jDefsFactoryImpl.java
index e36245f0f5..e6638f3b51 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/defs/impl/Net4jDefsFactoryImpl.java
@@ -1,26 +1,26 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsFactoryImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsFactoryImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.BufferPoolDef;
-import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.HTTPConnectorDef;
-import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
-import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.net4jdefs.User;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
+package org.eclipse.net4j.defs.impl;
+
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.HTTPConnectorDef;
+import org.eclipse.net4j.defs.JVMAcceptorDef;
+import org.eclipse.net4j.defs.JVMConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsFactory;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.TCPAcceptorDef;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -88,22 +88,10 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
       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");
     }
@@ -169,28 +157,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
    * 
    * @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();
@@ -213,52 +179,21 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
    * 
    * @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()
+  public Net4jDefsPackage getNet4jDefsPackage()
   {
-    RandomizerDefImpl randomizerDef = new RandomizerDefImpl();
-    return randomizerDef;
+    return (Net4jDefsPackage)getEPackage();
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
+   * @deprecated
    * @generated
    */
-  public User createUser()
+  @Deprecated
+  public static Net4jDefsPackage getPackage()
   {
-    UserImpl user = new UserImpl();
-    return user;
+    return Net4jDefsPackage.eINSTANCE;
   }
 
-  /**
-   * <!-- 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/defs/impl/Net4jDefsPackageImpl.java
index 8494fe522d..1a140ce3d3 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/defs/impl/Net4jDefsPackageImpl.java
@@ -1,35 +1,33 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsPackageImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsPackageImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.AcceptorDef;
-import org.eclipse.net4j.net4jdefs.BufferPoolDef;
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.ConnectorDef;
-import org.eclipse.net4j.net4jdefs.CredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.HTTPConnectorDef;
-import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
-import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
-import org.eclipse.net4j.net4jdefs.NegotiatorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.net4jdefs.User;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
+package org.eclipse.net4j.defs.impl;
+
+import org.eclipse.net4j.defs.AcceptorDef;
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.BufferProviderDef;
+import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
+import org.eclipse.net4j.defs.ConnectorDef;
+import org.eclipse.net4j.defs.HTTPConnectorDef;
+import org.eclipse.net4j.defs.JVMAcceptorDef;
+import org.eclipse.net4j.defs.JVMConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsFactory;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ProtocolProviderDef;
+import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
+import org.eclipse.net4j.defs.TCPAcceptorDef;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -105,27 +103,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * 
    * @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;
 
   /**
@@ -157,41 +134,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   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>
@@ -200,7 +142,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#eNS_URI
+   * @see org.eclipse.net4j.defs.Net4jDefsPackage#eNS_URI
    * @see #init()
    * @generated
    */
@@ -237,9 +179,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   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
@@ -528,66 +468,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * 
    * @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;
@@ -638,106 +518,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * 
    * @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();
@@ -759,9 +539,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -799,15 +577,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     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);
@@ -817,21 +586,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     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);
   }
 
   /**
@@ -850,9 +604,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -870,41 +622,34 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     // Add supertypes to classes
     connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
-    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
+    tcpConnectorDefEClass.getESuperTypes().add(this.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());
+    tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
+    jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
+    jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
     tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
     bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
+    bufferPoolDefEClass.getESuperTypes().add(this.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,
+    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(), getNegotiatorDef(), null, "negotiator", null, 0, 1,
-        ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.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,
+    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);
 
@@ -913,7 +658,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
+    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,
@@ -923,16 +668,16 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
+    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(), 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,
+    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.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);
 
@@ -942,7 +687,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
         !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,
+    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);
 
@@ -961,24 +706,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     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);
 
@@ -994,33 +721,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     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);
   }
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/defs/impl/ProtocolProviderDefImpl.java
index c971ea6b90..c9b44b2906 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/defs/impl/ProtocolProviderDefImpl.java
@@ -1,14 +1,20 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: ProtocolProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: ProtocolProviderDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ProtocolProviderDef;
+import org.eclipse.net4j.util.defs.impl.DefImpl;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ServerProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
index 67244505f7..a3859af529 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ServerProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
@@ -1,13 +1,19 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: ServerProtocolFactoryDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ * $Id: ServerProtocolFactoryDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
 
 import org.eclipse.emf.ecore.EClass;
 
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/defs/impl/TCPAcceptorDefImpl.java
index e62f07d4dc..824f19ced2 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/defs/impl/TCPAcceptorDefImpl.java
@@ -1,16 +1,22 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: TCPAcceptorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: TCPAcceptorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.TCPAcceptorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
 import org.eclipse.net4j.internal.tcp.TCPAcceptor;
 import org.eclipse.net4j.internal.tcp.TCPSelector;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
 import org.eclipse.net4j.tcp.ITCPAcceptor;
 import org.eclipse.net4j.util.CheckUtil;
 
@@ -124,9 +130,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
-    }
   }
 
   /**
@@ -149,9 +153,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     int oldPort = port;
     port = newPort;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
-    }
   }
 
   /**
@@ -168,10 +170,8 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-        }
       }
     }
     return tcpSelectorDef;
@@ -197,10 +197,8 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
-    }
   }
 
   /**
@@ -219,9 +217,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       return new Integer(getPort());
     case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
-      {
         return getTcpSelectorDef();
-      }
       return basicGetTcpSelectorDef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -302,9 +298,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (host: ");
@@ -347,5 +341,4 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     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/defs/impl/TCPConnectorDefImpl.java
index 87ecd817e8..1dc28d4743 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/defs/impl/TCPConnectorDefImpl.java
@@ -1,15 +1,21 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: TCPConnectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: TCPConnectorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
 import org.eclipse.net4j.internal.tcp.TCPClientConnector;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
 import org.eclipse.net4j.tcp.ITCPConnector;
 import org.eclipse.net4j.tcp.ITCPSelector;
 import org.eclipse.net4j.util.CheckUtil;
@@ -126,10 +132,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-        }
       }
     }
     return tcpSelectorDef;
@@ -155,10 +159,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
-    }
   }
 
   /**
@@ -181,9 +183,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
-    }
   }
 
   /**
@@ -224,10 +224,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     boolean oldPortESet = portESet;
     portESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port,
           !oldPortESet));
-    }
   }
 
   /**
@@ -242,10 +240,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     port = PORT_EDEFAULT;
     portESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort,
           PORT_EDEFAULT, oldPortESet));
-    }
   }
 
   /**
@@ -270,9 +266,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     {
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
-      {
         return getTcpSelectorDef();
-      }
       return basicGetTcpSelectorDef();
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
       return getHost();
@@ -357,22 +351,16 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   public String 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();
   }
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/defs/impl/TCPSelectorDefImpl.java
index 393746dbf8..01adeb7d8e 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/defs/impl/TCPSelectorDefImpl.java
@@ -1,26 +1,24 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: TCPSelectorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: TCPSelectorDefImpl.java,v 1.1 2008-12-31 14:43:20 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.impl;
+package org.eclipse.net4j.defs.impl;
 
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.TCPSelectorDef;
 import org.eclipse.net4j.internal.tcp.TCPSelector;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
+import org.eclipse.net4j.util.defs.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
- * -->
- * <p>
- * </p>
- * 
- * @generated
- */
 public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
 {
   /**
@@ -54,7 +52,6 @@ public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
   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/util/Net4jDefsAdapterFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
index 319156804f..26c42f9ba8 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/defs/util/Net4jDefsAdapterFactory.java
@@ -1,34 +1,32 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsAdapterFactory.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsAdapterFactory.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.util;
-
-import org.eclipse.net4j.net4jdefs.AcceptorDef;
-import org.eclipse.net4j.net4jdefs.BufferPoolDef;
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.ConnectorDef;
-import org.eclipse.net4j.net4jdefs.CredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.HTTPConnectorDef;
-import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
-import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
-import org.eclipse.net4j.net4jdefs.NegotiatorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.net4jdefs.User;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
-import org.eclipse.net4j.util.net4jutildefs.Def;
+package org.eclipse.net4j.defs.util;
+
+import org.eclipse.net4j.defs.AcceptorDef;
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.BufferProviderDef;
+import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
+import org.eclipse.net4j.defs.ConnectorDef;
+import org.eclipse.net4j.defs.HTTPConnectorDef;
+import org.eclipse.net4j.defs.JVMAcceptorDef;
+import org.eclipse.net4j.defs.JVMConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ProtocolProviderDef;
+import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
+import org.eclipse.net4j.defs.TCPAcceptorDef;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
+import org.eclipse.net4j.util.defs.Def;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -39,7 +37,7 @@ 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.net4jdefs.Net4jDefsPackage
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
 public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
@@ -142,24 +140,6 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
     }
 
     @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();
@@ -190,36 +170,6 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
     }
 
     @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();
@@ -247,12 +197,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * 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 -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.ConnectorDef
    * @generated
    */
   public Adapter createConnectorDefAdapter()
@@ -261,13 +211,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef
    * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
    * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
    * 
    * @return the new adapter.
-   * @see org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef
+   * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef
    * @generated
    */
   public Adapter createClientProtocolFactoryDefAdapter()
@@ -276,13 +226,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPConnectorDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.TCPConnectorDef
    * @generated
    */
   public Adapter createTCPConnectorDefAdapter()
@@ -291,12 +241,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * 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 -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.AcceptorDef
    * @generated
    */
   public Adapter createAcceptorDefAdapter()
@@ -305,12 +255,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.TCPAcceptorDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.TCPAcceptorDef
    * @generated
    */
   public Adapter createTCPAcceptorDefAdapter()
@@ -319,12 +269,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMAcceptorDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.JVMAcceptorDef
    * @generated
    */
   public Adapter createJVMAcceptorDefAdapter()
@@ -333,13 +283,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.JVMConnectorDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.JVMConnectorDef
    * @generated
    */
   public Adapter createJVMConnectorDefAdapter()
@@ -348,13 +298,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.HTTPConnectorDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.HTTPConnectorDef
    * @generated
    */
   public Adapter createHTTPConnectorDefAdapter()
@@ -363,56 +313,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * 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
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.TCPSelectorDef
    * @generated
    */
   public Adapter createTCPSelectorDefAdapter()
@@ -421,13 +327,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.ServerProtocolFactoryDef
    * @generated
    */
   public Adapter createServerProtocolFactoryDefAdapter()
@@ -436,13 +342,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.BufferProviderDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.BufferProviderDef
    * @generated
    */
   public Adapter createBufferProviderDefAdapter()
@@ -451,12 +357,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * 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 -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.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
+   * @see org.eclipse.net4j.defs.BufferPoolDef
    * @generated
    */
   public Adapter createBufferPoolDefAdapter()
@@ -465,13 +371,13 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef
    * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
    * 
    * @return the new adapter.
-   * @see org.eclipse.net4j.net4jdefs.ProtocolProviderDef
+   * @see org.eclipse.net4j.defs.ProtocolProviderDef
    * @generated
    */
   public Adapter createProtocolProviderDefAdapter()
@@ -480,84 +386,12 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * 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>}'. <!--
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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
+   * @see org.eclipse.net4j.util.defs.Def
    * @generated
    */
   public Adapter createDefAdapter()
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/defs/util/Net4jDefsSwitch.java
index 9471ca70da..bd1d59f6e0 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/defs/util/Net4jDefsSwitch.java
@@ -1,34 +1,32 @@
 /**
- * <copyright>
- * </copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
  *
- * $Id: Net4jDefsSwitch.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
+ * $Id: Net4jDefsSwitch.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
  */
-package org.eclipse.net4j.net4jdefs.util;
-
-import org.eclipse.net4j.net4jdefs.AcceptorDef;
-import org.eclipse.net4j.net4jdefs.BufferPoolDef;
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.ConnectorDef;
-import org.eclipse.net4j.net4jdefs.CredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.HTTPConnectorDef;
-import org.eclipse.net4j.net4jdefs.JVMAcceptorDef;
-import org.eclipse.net4j.net4jdefs.JVMConnectorDef;
-import org.eclipse.net4j.net4jdefs.NegotiatorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.ProtocolProviderDef;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.net4jdefs.TCPAcceptorDef;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.net4jdefs.User;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
-import org.eclipse.net4j.util.net4jutildefs.Def;
+package org.eclipse.net4j.defs.util;
+
+import org.eclipse.net4j.defs.AcceptorDef;
+import org.eclipse.net4j.defs.BufferPoolDef;
+import org.eclipse.net4j.defs.BufferProviderDef;
+import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
+import org.eclipse.net4j.defs.ConnectorDef;
+import org.eclipse.net4j.defs.HTTPConnectorDef;
+import org.eclipse.net4j.defs.JVMAcceptorDef;
+import org.eclipse.net4j.defs.JVMConnectorDef;
+import org.eclipse.net4j.defs.Net4jDefsPackage;
+import org.eclipse.net4j.defs.ProtocolProviderDef;
+import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
+import org.eclipse.net4j.defs.TCPAcceptorDef;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.defs.TCPSelectorDef;
+import org.eclipse.net4j.util.defs.Def;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -41,7 +39,7 @@ import java.util.List;
  * 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
+ * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
 public class Net4jDefsSwitch<T>
@@ -114,13 +112,9 @@ public class Net4jDefsSwitch<T>
       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:
@@ -128,17 +122,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -146,17 +134,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -164,13 +146,9 @@ public class Net4jDefsSwitch<T>
       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:
@@ -178,17 +156,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -196,17 +168,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -214,17 +180,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -232,67 +192,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -300,13 +204,9 @@ public class Net4jDefsSwitch<T>
       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:
@@ -314,17 +214,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -332,13 +226,9 @@ public class Net4jDefsSwitch<T>
       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:
@@ -346,17 +236,11 @@ public class Net4jDefsSwitch<T>
       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:
@@ -364,83 +248,9 @@ public class Net4jDefsSwitch<T>
       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:
@@ -570,53 +380,6 @@ public class Net4jDefsSwitch<T>
   }
 
   /**
-   * 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 -->
    * 
@@ -694,83 +457,6 @@ public class Net4jDefsSwitch<T>
   }
 
   /**
-   * 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 -->
    * 
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
new file mode 100644
index 0000000000..7387085e59
--- /dev/null
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * 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:
+ *    André Dietisheim - initial API and implementation
+ *
+ * $Id: Net4jDefsUtil.java,v 1.1 2008-12-31 14:43:19 estepper Exp $
+ */
+package org.eclipse.net4j.defs.util;
+
+import org.eclipse.net4j.FactoriesProtocolProvider;
+import org.eclipse.net4j.defs.Net4jDefsFactory;
+import org.eclipse.net4j.defs.ProtocolProviderDef;
+import org.eclipse.net4j.defs.TCPConnectorDef;
+import org.eclipse.net4j.protocol.IProtocolProvider;
+import org.eclipse.net4j.tcp.ITCPConnector;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.factory.IFactory;
+
+import java.util.Iterator;
+import java.util.List;
+
+public 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)
+  {
+    FactoriesProtocolProvider protocolProvider = new FactoriesProtocolProvider();
+    for (Iterator<PPD> iterator = protocolFactoryDef.iterator(); iterator.hasNext();)
+    {
+      PPD protocolProviderDef = iterator.next();
+      protocolProvider.addFactory((IFactory)protocolProviderDef.getInstance());
+    }
+    return protocolProvider;
+  }
+
+  public static TCPConnectorDef createTCPConnectorDef(final String host)
+  {
+    return createTCPConnectorDef(host, ITCPConnector.DEFAULT_PORT);
+  }
+
+  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/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java
deleted file mode 100644
index 37b3fd6f1b..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferPoolDef.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getBufferPoolDef()
- * @model
- * @generated
- */
-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
deleted file mode 100644
index d9f0fb55e1..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/BufferProviderDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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
- * -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getBufferProviderDef()
- * @model abstract="true"
- * @generated
- */
-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
deleted file mode 100644
index 07ed101643..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ChallengeNegotiatorDef.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * <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>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getChallengeNegotiatorDef()
- * @model
- * @generated
- */
-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();
-
-  /**
-   * 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();
-
-  /**
-   * 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
deleted file mode 100644
index 4a55359263..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ClientProtocolFactoryDef.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getClientProtocolFactoryDef()
- * @model abstract="true"
- * @generated
- */
-public interface ClientProtocolFactoryDef extends ProtocolProviderDef
-{
-} // ClientProtocolFactoryDef
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
deleted file mode 100644
index 2aa61e8937..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/CredentialsProviderDef.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * <p>
- * The following features are supported:
- * <ul>
- * <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();
-
-  /**
-   * 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/NegotiatorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java
deleted file mode 100644
index d47bd4f6ab..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/NegotiatorDef.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getNegotiatorDef()
- * @model abstract="true"
- * @generated
- */
-public interface NegotiatorDef extends Def
-{
-} // NegotiatorDef
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
deleted file mode 100644
index 92b33e3eea..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/PasswordCredentialsProviderDef.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <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();
-
-  /**
-   * 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
deleted file mode 100644
index 77e07ecd15..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ProtocolProviderDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getProtocolProviderDef()
- * @model abstract="true"
- * @generated
- */
-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
deleted file mode 100644
index 48ac17b58c..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/RandomizerDef.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getRandomizerDef()
- * @model
- * @generated
- */
-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
deleted file mode 100644
index d397687a92..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ResponseNegotiatorDef.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * <p>
- * The following features are supported:
- * <ul>
- * <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
-{
-
-  /**
-   * 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);
-} // 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
deleted file mode 100644
index 60aa39c30b..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerConnector.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <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();
-
-  /**
-   * 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
deleted file mode 100644
index 758ba80770..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/ServerProtocolFactoryDef.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getServerProtocolFactoryDef()
- * @model abstract="true"
- * @generated
- */
-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
deleted file mode 100644
index cd060b3c03..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/SeverProtocolFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jdefsPackage#getSeverProtocolFactory()
- * @model
- * @generated
- */
-public interface SeverProtocolFactory extends Def
-{
-} // SeverProtocolFactory
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
deleted file mode 100644
index 841fbbaf16..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/TCPSelectorDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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
- * -->
- * 
- * @see org.eclipse.net4j.net4jdefs.Net4jDefsPackage#getTCPSelectorDef()
- * @model
- * @generated
- */
-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
deleted file mode 100644
index e6bb5b4451..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/User.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $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 -->
- * <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>
- * </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();
-
-  /**
-   * 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();
-
-  /**
-   * 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
deleted file mode 100644
index c7d36391e0..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/UserManagerDef.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UserManagerDef.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs;
-
-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
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <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
-{
-
-  /**
-   * 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();
-
-  /**
-   * 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/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java
deleted file mode 100644
index 7eff6eafa3..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ChallengeNegotiatorDefImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ChallengeNegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.ChallengeNegotiatorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.security.ChallengeNegotiator;
-import org.eclipse.net4j.util.security.IRandomizer;
-import org.eclipse.net4j.util.security.IUserManager;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Challenge Negotiator Def</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl#getUserManager <em>User Manager</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.ChallengeNegotiatorDefImpl#getRandomizer <em>Randomizer</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements ChallengeNegotiatorDef
-{
-
-  /**
-   * The cached value of the '{@link #getUserManager() <em>User Manager</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getUserManager()
-   * @generated
-   * @ordered
-   */
-  protected UserManagerDef userManager;
-
-  /**
-   * The cached value of the '{@link #getRandomizer() <em>Randomizer</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getRandomizer()
-   * @generated
-   * @ordered
-   */
-  protected RandomizerDef randomizer;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ChallengeNegotiatorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.CHALLENGE_NEGOTIATOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public UserManagerDef getUserManager()
-  {
-    if (userManager != null && userManager.eIsProxy())
-    {
-      InternalEObject oldUserManager = (InternalEObject)userManager;
-      userManager = (UserManagerDef)eResolveProxy(oldUserManager);
-      if (userManager != oldUserManager)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
-        }
-      }
-    }
-    return userManager;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public UserManagerDef basicGetUserManager()
-  {
-    return userManager;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setUserManager(UserManagerDef newUserManager)
-  {
-    UserManagerDef oldUserManager = userManager;
-    userManager = newUserManager;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER,
-          oldUserManager, userManager));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public RandomizerDef getRandomizer()
-  {
-    if (randomizer != null && randomizer.eIsProxy())
-    {
-      InternalEObject oldRandomizer = (InternalEObject)randomizer;
-      randomizer = (RandomizerDef)eResolveProxy(oldRandomizer);
-      if (randomizer != oldRandomizer)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer));
-        }
-      }
-    }
-    return randomizer;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public RandomizerDef basicGetRandomizer()
-  {
-    return randomizer;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setRandomizer(RandomizerDef newRandomizer)
-  {
-    RandomizerDef oldRandomizer = randomizer;
-    randomizer = newRandomizer;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER,
-          oldRandomizer, randomizer));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    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);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
-      setUserManager((UserManagerDef)newValue);
-      return;
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
-      setRandomizer((RandomizerDef)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
-      setUserManager((UserManagerDef)null);
-      return;
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
-      setRandomizer((RandomizerDef)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
-      return userManager != null;
-    case Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
-      return randomizer != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected Object createInstance()
-  {
-    ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator();
-    challengeNegotiator.setRandomizer((IRandomizer)getRandomizer().getInstance());
-    challengeNegotiator.setUserManager((IUserManager)getUserManager().getInstance());
-
-    return challengeNegotiator;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER), "randomizer is not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER), "user manager is not set!");
-  }
-
-} // ChallengeNegotiatorDefImpl
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
deleted file mode 100644
index 3f83587ea7..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/CredentialsProviderDefImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CredentialsProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.CredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-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 -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <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;
-
-  /**
-   * 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
-   */
-  @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 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 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 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();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (userID: ");
-    result.append(userID);
-    result.append(')');
-    return result.toString();
-  }
-
-} // CredentialsProviderDefImpl
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
deleted file mode 100644
index 9e9657e19b..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/NegotiatorDefImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.NegotiatorDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-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 -->
- * <p>
- * </p>
- * 
- * @generated
- */
-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;
-  }
-
-} // NegotiatorDefImpl
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
deleted file mode 100644
index f8990d1630..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/PasswordCredentialsProviderDefImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PasswordCredentialsProviderDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.PasswordCredentialsProviderDef;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-import org.eclipse.net4j.util.security.PasswordCredentials;
-import org.eclipse.net4j.util.security.PasswordCredentialsProvider;
-
-import org.eclipse.emf.common.notify.Notification;
-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>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <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();
-  }
-
-  /**
-   * @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/RandomizerDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/RandomizerDefImpl.java
deleted file mode 100644
index 7fd359a4f2..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/RandomizerDefImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RandomizerDefImpl.java,v 1.1 2008-12-28 18:07:28 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.RandomizerDef;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
-import org.eclipse.net4j.util.security.Randomizer;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Randomizer Def</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
- * 
- * @generated
- */
-public class RandomizerDefImpl extends DefImpl implements RandomizerDef
-{
-  @Override
-  protected Object createInstance()
-  {
-    return new Randomizer();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected RandomizerDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.RANDOMIZER_DEF;
-  }
-
-} // RandomizerDefImpl
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
deleted file mode 100644
index 57f3f96527..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/ResponseNegotiatorDefImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ResponseNegotiatorDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.CredentialsProviderDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.ResponseNegotiatorDef;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-import org.eclipse.net4j.util.security.ResponseNegotiator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>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>
- * </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;
-
-  /**
-   * <!-- 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
-   */
-  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 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 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 boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
-      return credentialsProvider != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * @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/UserImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java
deleted file mode 100644
index 68df079476..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UserImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.User;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-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 -->
- * <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>
- * </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
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
deleted file mode 100644
index 6c3e856771..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/impl/UserManagerDefImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UserManagerDefImpl.java,v 1.2 2008-12-30 08:43:13 estepper Exp $
- */
-package org.eclipse.net4j.net4jdefs.impl;
-
-import org.eclipse.net4j.net4jdefs.Net4jDefsPackage;
-import org.eclipse.net4j.net4jdefs.User;
-import org.eclipse.net4j.net4jdefs.UserManagerDef;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
-import org.eclipse.net4j.util.security.UserManager;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-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
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <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);
-  }
-
-  /**
-   * @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
deleted file mode 100644
index 6ce76a350a..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/ConnectorDefBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- * 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;
-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;
-
-  public ConnectorDefBuilder()
-  {
-    super();
-  }
-
-  public ConnectorDefBuilder bufferProvider(BufferProviderDef bufferProviderDef)
-  {
-    this.bufferProviderDef = bufferProviderDef;
-    return this;
-  }
-
-  public ConnectorDefBuilder executorService(ExecutorServiceDef executorServiceDef)
-  {
-    this.executorServiceDef = executorServiceDef;
-    return this;
-  }
-
-  public void validate()
-  {
-    CheckUtil.checkState(bufferProviderDef != null, "bufferProviderDef is not set!");
-    CheckUtil.checkState(executorServiceDef != null, "executorServiceDef is not set!");
-  }
-
-  public void build(ConnectorDef connectorDef)
-  {
-    validate();
-
-    connectorDef.setBufferProvider(bufferProviderDef);
-    connectorDef.setExecutorService(executorServiceDef);
-  }
-}
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
deleted file mode 100644
index ee9c3c905a..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/Net4jDefsUtil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * 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.Net4jDefsFactory;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Net4jDefsUtil
-{
-  private Net4jDefsUtil()
-  {
-  }
-
-  /*
-   * 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
deleted file mode 100644
index 6ce4f8d930..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/net4jdefs/util/TCPClientConnectorBuilder.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * 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;
-import org.eclipse.net4j.net4jdefs.BufferProviderDef;
-import org.eclipse.net4j.net4jdefs.Net4jDefsFactory;
-import org.eclipse.net4j.net4jdefs.TCPConnectorDef;
-import org.eclipse.net4j.net4jdefs.TCPSelectorDef;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.util.CheckUtil;
-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 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;
-    return this;
-  }
-
-  public TCPClientConnectorBuilder host(String host)
-  {
-    this.host = host;
-    return this;
-  }
-
-  public TCPClientConnectorBuilder executorServiceDef(ThreadPoolDef threadPoolDef)
-  {
-    executorService = threadPoolDef;
-    return this;
-  }
-
-  public TCPClientConnectorBuilder bufferDef(BufferPoolDef bufferPoolDef)
-  {
-    bufferProviderDef = bufferPoolDef;
-    return this;
-  }
-
-  public TCPConnectorDef build()
-  {
-    TCPConnectorDef tcpClientConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
-
-    CheckUtil.checkState(host != null, "host is not set!");
-    tcpClientConnectorDef.setHost(host);
-
-    tcpClientConnectorDef.setPort(port);
-
-    tcpClientConnectorDef.setBufferProvider(bufferProviderDef);
-    tcpClientConnectorDef.setExecutorService(executorService);
-    tcpClientConnectorDef.setTcpSelectorDef(tcpSelectorDef);
-
-    return tcpClientConnectorDef;
-  }
-}