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

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

53 files changed, 6275 insertions, 1919 deletions

diff --git a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.core.resources.prefs
index a303376b77..39633e5c86 100644
--- a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Wed Nov 26 10:40:36 CET 2008
+#Tue Dec 30 17:20:54 CET 2008
 eclipse.preferences.version=1
 encoding//model/org.eclipse.net4j.util.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.core.prefs
index fa9592e2e1..f099459afc 100644
--- a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon Dec 15 16:14:06 CET 2008
+#Wed Dec 31 15:39:12 CET 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,16 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.ui.prefs
index ea76f47ba5..be07238c43 100644
--- a/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.net4j.util.defs/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,4 @@
-#Mon Dec 15 16:14:05 CET 2008
+#Wed Dec 31 15:39:12 CET 2008
 cleanup.add_default_serial_version_id=true
 cleanup.add_generated_serial_version_id=false
 cleanup.add_missing_annotations=true
@@ -6,14 +6,14 @@ cleanup.add_missing_deprecated_annotations=true
 cleanup.add_missing_methods=false
 cleanup.add_missing_nls_tags=false
 cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
+cleanup.add_serial_version_id=true
 cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
 cleanup.format_source_code_changes_only=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
@@ -22,14 +22,14 @@ cleanup.make_type_abstract_if_missing_method=false
 cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
+cleanup.organize_imports=true
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=false
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces=true
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
 cleanup.remove_unnecessary_casts=true
@@ -42,23 +42,29 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=false
+cleanup.use_blocks=true
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access=true
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
+cleanup_profile=_EMFT
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
-formatter_profile=_Unmanaged profile 'EMFT' mine
+formatter_profile=_EMFT
 formatter_settings_version=11
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
+org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/***************************************************************************\r\n * Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n *    Eike Stepper - initial API and implementation\r\n **************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
index ac2f957df0..ca054555b4 100644
--- a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.net4j.util.net4jutildefs;version="2.0.0",
- org.eclipse.net4j.util.net4jutildefs.impl;version="2.0.0",
- org.eclipse.net4j.util.net4jutildefs.util;version="2.0.0"
+Export-Package: org.eclipse.net4j.util.defs;version="2.0.0",
+ org.eclipse.net4j.util.defs.impl;version="2.0.0",
+ org.eclipse.net4j.util.defs.util;version="2.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore
index 8690dbf769..a0a33c5b7b 100644
--- a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore
+++ b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="net4jutildefs"
-    nsURI="http://www.eclipse.org/NET4J/util/defs/1.0.0" nsPrefix="net4jutildefs">
-  <eClassifiers xsi:type="ecore:EClass" name="DefsContainer">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defs"
+    nsURI="http://www.eclipse.org/NET4J/util/defs/1.0.0" nsPrefix="net4j.util.defs">
+  <eClassifiers xsi:type="ecore:EClass" name="DefContainer">
     <eStructuralFeatures xsi:type="ecore:EReference" name="definitions" lowerBound="1"
         upperBound="-1" eType="#//Def" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultDefinition" eType="#//Def"/>
@@ -15,4 +15,35 @@
   <eClassifiers xsi:type="ecore:EClass" name="ExecutorServiceDef" abstract="true"
       eSuperTypes="#//Def"/>
   <eClassifiers xsi:type="ecore:EClass" name="ThreadPoolDef" eSuperTypes="#//ExecutorServiceDef"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RandomizerDef" eSuperTypes="#//Def">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="algorithmName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="providerName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="seed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByteArray"
+        unsettable="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UserManagerDef" eSuperTypes="#//Def">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="user" lowerBound="1" upperBound="-1"
+        eType="#//User" unsettable="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="User">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="password" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PasswordCredentialsProviderDef" eSuperTypes="#//CredentialsProviderDef">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="password" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CredentialsProviderDef" abstract="true"
+      eSuperTypes="#//Def">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NegotiatorDef" abstract="true" eSuperTypes="#//Def"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ResponseNegotiatorDef" eSuperTypes="#//NegotiatorDef">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="credentialsProvider" eType="#//CredentialsProviderDef"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ChallengeNegotiatorDef" eSuperTypes="#//NegotiatorDef">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="userManager" eType="#//UserManagerDef"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="randomizer" eType="#//RandomizerDef"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecorediag b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecorediag
index fc32908075..9e92762eb9 100644
--- a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecorediag
+++ b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecorediag
@@ -1,117 +1,389 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_R5E7MbueEd2h0phgI_C1DA" type="EcoreTools" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_R7A04LueEd2h0phgI_C1DA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_R7EfQLueEd2h0phgI_C1DA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_R7FGULueEd2h0phgI_C1DA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R7FGUbueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_R7FGUrueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R7FGU7ueEd2h0phgI_C1DA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_R7FtYLueEd2h0phgI_C1DA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R7FtYbueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_R7FtYrueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R7FtY7ueEd2h0phgI_C1DA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_R7A04bueEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//DefsContainer"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R7A04rueEd2h0phgI_C1DA" x="760" y="44"/>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_1VQv4NaNEd2NXrd06-kp9w" type="EcoreTools" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_1VVBUNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VVoYNaNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VVoYdaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VVoYtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VVoY9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VVoZNaNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VVoZdaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VVoZtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VVoZ9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VVoaNaNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VVBUdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//DefContainer"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VVBUtaNEd2NXrd06-kp9w" x="32" y="160"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_R7FtZLueEd2h0phgI_C1DA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_R7GUcLueEd2h0phgI_C1DA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_R7GUcbueEd2h0phgI_C1DA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R7GUcrueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_R7GUc7ueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R7GUdLueEd2h0phgI_C1DA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_R7G7gLueEd2h0phgI_C1DA" type="5002">
-      <children xmi:type="notation:Node" xmi:id="_R7G7hLueEd2h0phgI_C1DA" type="2002">
+  <children xmi:type="notation:Node" xmi:id="_1VVoadaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VWPcNaNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VWPcdaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VWPctaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VWPc9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VW2gNaNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VW2gdaNEd2NXrd06-kp9w" type="5002">
+      <children xmi:type="notation:Node" xmi:id="_1VW2hdaNEd2NXrd06-kp9w" type="2002">
         <element xmi:type="ecore:EOperation" href="org.eclipse.net4j.util.defs.ecore#//Def/getInstance"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R7G7hbueEd2h0phgI_C1DA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VW2htaNEd2NXrd06-kp9w"/>
       </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R7G7gbueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_R7G7grueEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R7G7g7ueEd2h0phgI_C1DA"/>
+      <children xmi:type="notation:Node" xmi:id="_1VW2h9aNEd2NXrd06-kp9w" type="2002">
+        <element xmi:type="ecore:EOperation" href="org.eclipse.net4j.util.defs.ecore#//Def/unsetInstance"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VW2iNaNEd2NXrd06-kp9w"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VW2gtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VW2g9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VW2hNaNEd2NXrd06-kp9w"/>
     </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_R7FtZbueEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VVoataNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
     <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//Def"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R7FtZrueEd2h0phgI_C1DA" x="352" y="32"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VVoa9aNEd2NXrd06-kp9w" x="384" y="32"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_Nc51YLufEd2h0phgI_C1DA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Nc7DgLufEd2h0phgI_C1DA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Nc7DgbufEd2h0phgI_C1DA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Nc7DgrufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Nc7Dg7ufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Nc7DhLufEd2h0phgI_C1DA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Nc7qkLufEd2h0phgI_C1DA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Nc7qkbufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Nc7qkrufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Nc7qk7ufEd2h0phgI_C1DA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Nc51YbufEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10" fillColor="13761016" lineColor="0"/>
+  <children xmi:type="notation:Node" xmi:id="_1VXdkNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VXdk9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VXdlNaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VXdldaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VXdltaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VXdl9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VXdmNaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VXdmdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VXdmtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VXdm9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VXdkdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
     <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//ExecutorServiceDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nc51YrufEd2h0phgI_C1DA" x="208" y="144"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VXdktaNEd2NXrd06-kp9w" x="192" y="160"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_SgsfYLufEd2h0phgI_C1DA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_SgtGcLufEd2h0phgI_C1DA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_SgtGcbufEd2h0phgI_C1DA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SgtGcrufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SgtGc7ufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SgtGdLufEd2h0phgI_C1DA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_SgttgLufEd2h0phgI_C1DA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SgttgbufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SgttgrufEd2h0phgI_C1DA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Sgttg7ufEd2h0phgI_C1DA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SgsfYbufEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10" fillColor="13761016" lineColor="0"/>
+  <children xmi:type="notation:Node" xmi:id="_1VYEoNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VYEo9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VYEpNaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VYEpdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VYEptaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VYEp9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VYrsNaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VYrsdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VYrstaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VYrs9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VYEodaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
     <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//ThreadPoolDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SgsfYrufEd2h0phgI_C1DA" x="224" y="240"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VYEotaNEd2NXrd06-kp9w" x="144" y="304"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VYrtNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VYrt9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VYruNaNEd2NXrd06-kp9w" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_1VZSxdaNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//RandomizerDef/algorithmName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VZSxtaNEd2NXrd06-kp9w"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_1VZSx9aNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//RandomizerDef/providerName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VZSyNaNEd2NXrd06-kp9w"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_1VZ50NaNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//RandomizerDef/seed"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VZ50daNEd2NXrd06-kp9w"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VYrudaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VYrutaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VZSwNaNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VZSwdaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VZSwtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VZSw9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VZSxNaNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VYrtdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//RandomizerDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VYrttaNEd2NXrd06-kp9w" x="816" y="160"/>
   </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_R5E7MrueEd2h0phgI_C1DA"/>
+  <children xmi:type="notation:Node" xmi:id="_1VZ50taNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VZ51daNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VZ51taNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Vag4NaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1Vag4daNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Vag4taNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1Vag49aNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Vag5NaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1Vag5daNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Vag5taNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VZ509aNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//UserManagerDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VZ51NaNEd2NXrd06-kp9w" x="1056" y="160"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1Vag59aNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1Vag6taNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VbH8NaNEd2NXrd06-kp9w" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_1VbH-NaNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//User/userID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VbH-daNEd2NXrd06-kp9w"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_1VbH-taNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//User/password"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VbH-9aNEd2NXrd06-kp9w"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VbH8daNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VbH8taNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VbH89aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VbH9NaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VbH9daNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VbH9taNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VbH99aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1Vag6NaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//User"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Vag6daNEd2NXrd06-kp9w" x="1056" y="32"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VbvANaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VbvA9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VbvBNaNEd2NXrd06-kp9w" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_1VcWFNaNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef/password"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1VcWFdaNEd2NXrd06-kp9w"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VbvBdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VbvBtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VbvB9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VcWENaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VcWEdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VcWEtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VcWE9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VbvAdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VbvAtaNEd2NXrd06-kp9w" x="320" y="304"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VcWFtaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1Vc9INaNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1Vc9IdaNEd2NXrd06-kp9w" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_1Vc9KdaNEd2NXrd06-kp9w" type="2001">
+        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef/userID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vc9KtaNEd2NXrd06-kp9w"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Vc9ItaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1Vc9I9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Vc9JNaNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1Vc9JdaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Vc9JtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1Vc9J9aNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Vc9KNaNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VcWF9aNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VcWGNaNEd2NXrd06-kp9w" x="400" y="160"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VdkMNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VdkM9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VdkNNaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VdkNdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VdkNtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VdkN9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VdkONaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VdkOdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VdkOtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VdkO9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VdkMdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VdkMtaNEd2NXrd06-kp9w" x="640" y="160"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VeLQNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VeLQ9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VeLRNaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VeLRdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VeLRtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VeLR9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VeyUNaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VeyUdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VeyUtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VeyU9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VeLQdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VeLQtaNEd2NXrd06-kp9w" x="608" y="304"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_1VeyVNaNEd2NXrd06-kp9w" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_1VeyV9aNEd2NXrd06-kp9w" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_1VeyWNaNEd2NXrd06-kp9w" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VeyWdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VeyWtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VeyW9aNEd2NXrd06-kp9w"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VfZYNaNEd2NXrd06-kp9w" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_1VfZYdaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1VfZYtaNEd2NXrd06-kp9w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1VfZY9aNEd2NXrd06-kp9w"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_1VeyVdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VeyVtaNEd2NXrd06-kp9w" x="848" y="304"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_1VQv4daNEd2NXrd06-kp9w"/>
   <element xmi:type="ecore:EPackage" href="org.eclipse.net4j.util.defs.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_R7IwsLueEd2h0phgI_C1DA" type="3002" source="_R7A04LueEd2h0phgI_C1DA" target="_R7FtZLueEd2h0phgI_C1DA">
-    <children xmi:type="notation:Node" xmi:id="_R7JXwLueEd2h0phgI_C1DA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_R7JXwbueEd2h0phgI_C1DA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_R7J-0LueEd2h0phgI_C1DA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_R7J-0bueEd2h0phgI_C1DA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_R7IwsbueEd2h0phgI_C1DA" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_R7IwsrueEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//DefsContainer/definitions"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R7Iws7ueEd2h0phgI_C1DA" points="[0, 0, 1, 60]$[0, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R8I2QLueEd2h0phgI_C1DA" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R8JdULueEd2h0phgI_C1DA" id="(0.49726775,1.0)"/>
+  <edges xmi:type="notation:Edge" xmi:id="_1VfZZNaNEd2NXrd06-kp9w" type="3002" source="_1VVBUNaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1VfZaNaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1VfZadaNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VfZataNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1VfZa9aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VfZZdaNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VfZZtaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//DefContainer/definitions"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VfZZ9aNEd2NXrd06-kp9w" points="[0, 0, -340, 60]$[340, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WjJUNaNEd2NXrd06-kp9w" id="(0.6666667,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WjJUdaNEd2NXrd06-kp9w" id="(0.24878049,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VgAcNaNEd2NXrd06-kp9w" type="3002" source="_1VVBUNaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1VgngNaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1VgngdaNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VgngtaNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vgng9aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VgAcdaNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VgActaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//DefContainer/defaultDefinition"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VgAc9aNEd2NXrd06-kp9w" points="[0, 0, -349, 60]$[349, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WiiQtaNEd2NXrd06-kp9w" id="(0.33333334,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WiiQ9aNEd2NXrd06-kp9w" id="(0.12195122,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VgnhNaNEd2NXrd06-kp9w" type="3003" source="_1VXdkNaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VgnhdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VgnhtaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vgnh9aNEd2NXrd06-kp9w" points="[0, 0, -195, 60]$[0, -30, -195, 30]$[195, -30, 0, 30]$[195, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdpwNaNEd2NXrd06-kp9w" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdpwdaNEd2NXrd06-kp9w" id="(0.3707317,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VgniNaNEd2NXrd06-kp9w" type="3003" source="_1VYEoNaNEd2NXrd06-kp9w" target="_1VXdkNaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VgnidaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VgnitaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vgni9aNEd2NXrd06-kp9w" points="[1, 0, 0, 102]$[1, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdCsNaNEd2NXrd06-kp9w" id="(0.49565217,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdCsdaNEd2NXrd06-kp9w" id="(0.033333335,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VhOkNaNEd2NXrd06-kp9w" type="3003" source="_1VYrtNaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VhOkdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VhOktaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VhOk9aNEd2NXrd06-kp9w" points="[0, 0, 364, 60]$[0, -30, 364, 30]$[-364, -30, 0, 30]$[-364, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgGAtaNEd2NXrd06-kp9w" id="(0.4973545,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgtENaNEd2NXrd06-kp9w" id="(0.74634147,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1Vh1oNaNEd2NXrd06-kp9w" type="3002" source="_1VZ50taNEd2NXrd06-kp9w" target="_1Vag59aNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1Vh1pNaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vh1pdaNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1Vh1ptaNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vh1p9aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1Vh1odaNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1Vh1otaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//UserManagerDef/user"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vh1o9aNEd2NXrd06-kp9w" points="[1, 0, 1, 60]$[1, -60, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WeQ0daNEd2NXrd06-kp9w" id="(0.49612403,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WeQ0taNEd2NXrd06-kp9w" id="(0.4966443,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_R7J-0rueEd2h0phgI_C1DA" type="3002" source="_R7A04LueEd2h0phgI_C1DA" target="_R7FtZLueEd2h0phgI_C1DA">
-    <children xmi:type="notation:Node" xmi:id="_R7Kl4LueEd2h0phgI_C1DA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_R7Kl4bueEd2h0phgI_C1DA" x="-38" y="29"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_R7Kl4rueEd2h0phgI_C1DA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_R7Kl47ueEd2h0phgI_C1DA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_R7J-07ueEd2h0phgI_C1DA" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_R7J-1LueEd2h0phgI_C1DA" fontName="UnDotum" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//DefsContainer/defaultDefinition"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R7J-1bueEd2h0phgI_C1DA" points="[0, 0, 1, 60]$[0, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R8KEYLueEd2h0phgI_C1DA" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R8KEYbueEd2h0phgI_C1DA" id="(0.49726775,1.0)"/>
+  <edges xmi:type="notation:Edge" xmi:id="_1Vh1qNaNEd2NXrd06-kp9w" type="3003" source="_1VZ50taNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1Vh1qdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1Vh1qtaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vh1q9aNEd2NXrd06-kp9w" points="[1, 0, 525, 60]$[1, -30, 525, 30]$[-524, -30, 0, 30]$[-524, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdpwtaNEd2NXrd06-kp9w" id="(0.24806201,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WeQ0NaNEd2NXrd06-kp9w" id="(0.87317073,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Qs4_cLufEd2h0phgI_C1DA" type="3003" source="_Nc51YLufEd2h0phgI_C1DA" target="_R7FtZLueEd2h0phgI_C1DA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Qs4_cbufEd2h0phgI_C1DA" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Qs4_crufEd2h0phgI_C1DA" fontName="UnDotum"/>
+  <edges xmi:type="notation:Edge" xmi:id="_1VicsNaNEd2NXrd06-kp9w" type="3003" source="_1VbvANaNEd2NXrd06-kp9w" target="_1VcWFtaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VicsdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VicstaNEd2NXrd06-kp9w" fontName="Sans"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qs4_c7ufEd2h0phgI_C1DA" points="[0, 0, -142, 60]$[0, -30, -142, 30]$[143, -30, 1, 30]$[143, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y6_pULufEd2h0phgI_C1DA" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qs60oLufEd2h0phgI_C1DA" id="(0.32786885,1.0)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vics9aNEd2NXrd06-kp9w" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdCstaNEd2NXrd06-kp9w" id="(0.74891776,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WdCs9aNEd2NXrd06-kp9w" id="(0.49710983,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VictNaNEd2NXrd06-kp9w" type="3003" source="_1VcWFtaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VictdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VicttaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vict9aNEd2NXrd06-kp9w" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WcboNaNEd2NXrd06-kp9w" id="(0.49710983,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WcbodaNEd2NXrd06-kp9w" id="(0.49756098,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VicuNaNEd2NXrd06-kp9w" type="3003" source="_1VdkMNaNEd2NXrd06-kp9w" target="_1VVoadaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VicudaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VicutaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vicu9aNEd2NXrd06-kp9w" points="[0, 0, 179, 60]$[0, -30, 179, 30]$[-179, -30, 0, 30]$[-179, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgGANaNEd2NXrd06-kp9w" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgGAdaNEd2NXrd06-kp9w" id="(0.6195122,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VicvNaNEd2NXrd06-kp9w" type="3002" source="_1VeLQNaNEd2NXrd06-kp9w" target="_1VcWFtaNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1VjDwNaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1VjDwdaNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1VjDwtaNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1VjDw9aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VicvdaNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VicvtaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef/credentialsProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vicv9aNEd2NXrd06-kp9w" points="[0, 0, 119, 94]$[-102, -61, 17, 33]$[-118, -94, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgtE9aNEd2NXrd06-kp9w" id="(0.24855492,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WhUINaNEd2NXrd06-kp9w" id="(0.7456647,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VjDxNaNEd2NXrd06-kp9w" type="3003" source="_1VeLQNaNEd2NXrd06-kp9w" target="_1VdkMNaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VjDxdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VjDxtaNEd2NXrd06-kp9w" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VjDx9aNEd2NXrd06-kp9w" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgtEdaNEd2NXrd06-kp9w" id="(0.49710983,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WgtEtaNEd2NXrd06-kp9w" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1VjDyNaNEd2NXrd06-kp9w" type="3002" source="_1VeyVNaNEd2NXrd06-kp9w" target="_1VZ50taNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1Vjq0NaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vjq0daNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1Vjq0taNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vjq09aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1VjDydaNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1VjDytaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/userManager"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VjDy9aNEd2NXrd06-kp9w" points="[0, 0, -150, 102]$[103, -61, -47, 41]$[151, -102, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WhUIdaNEd2NXrd06-kp9w" id="(0.75,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WhUItaNEd2NXrd06-kp9w" id="(0.49612403,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_1Vjq1NaNEd2NXrd06-kp9w" type="3002" source="_1VeyVNaNEd2NXrd06-kp9w" target="_1VYrtNaNEd2NXrd06-kp9w">
+    <children xmi:type="notation:Node" xmi:id="_1Vjq2NaNEd2NXrd06-kp9w" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vjq2daNEd2NXrd06-kp9w" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_1Vjq2taNEd2NXrd06-kp9w" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Vjq29aNEd2NXrd06-kp9w" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1Vjq1daNEd2NXrd06-kp9w" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1Vjq1taNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/randomizer"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vjq19aNEd2NXrd06-kp9w" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Wh7MNaNEd2NXrd06-kp9w" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Wh7MdaNEd2NXrd06-kp9w" id="(0.6243386,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_USOHYLufEd2h0phgI_C1DA" type="3003" source="_SgsfYLufEd2h0phgI_C1DA" target="_Nc51YLufEd2h0phgI_C1DA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_USOHYbufEd2h0phgI_C1DA" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_USOHYrufEd2h0phgI_C1DA" fontName="UnDotum"/>
+  <edges xmi:type="notation:Edge" xmi:id="_1Vjq3NaNEd2NXrd06-kp9w" type="3003" source="_1VeyVNaNEd2NXrd06-kp9w" target="_1VdkMNaNEd2NXrd06-kp9w">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1Vjq3daNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1Vjq3taNEd2NXrd06-kp9w" fontName="Sans"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_USOHY7ufEd2h0phgI_C1DA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y7GXALufEd2h0phgI_C1DA" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_USQjoLufEd2h0phgI_C1DA" id="(0.5,1.0)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Vjq39aNEd2NXrd06-kp9w" points="[0, 0, 163, 102]$[0, -30, 163, 72]$[-163, -30, 0, 72]$[-163, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WiiQNaNEd2NXrd06-kp9w" id="(0.25,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WiiQdaNEd2NXrd06-kp9w" id="(0.74561405,1.0)"/>
   </edges>
 </notation:Diagram>
diff --git a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
index a36a230819..161346c017 100644
--- a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
+++ b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+<<<<<<< org.eclipse.net4j.util.defs.genmodel
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    André Dietisheim - initial API and implementation"
+    modelDirectory="/org.eclipse.net4j.util.defs/src" modelPluginID="org.eclipse.net4j.util.defs"
+    modelName="Org.eclipse.net4j.util" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false" language="en">
+=======
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.net4j.util.defs/src"
     editDirectory="" editorDirectory="" modelPluginID="org.eclipse.net4j.util.defs"
     modelName="Org.eclipse.net4j.util" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false">
+>>>>>>> 1.2
   <foreignModel>org.eclipse.net4j.util.defs.ecore</foreignModel>
   <genPackages prefix="Net4jUtilDefs" basePackage="org.eclipse.net4j.util" disposableProviderFactory="true"
       ecorePackage="org.eclipse.net4j.util.defs.ecore#/">
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//DefsContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefsContainer/definitions"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefsContainer/defaultDefinition"/>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//DefContainer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/definitions"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/defaultDefinition"/>
     </genClasses>
     <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//Def">
       <genOperations ecoreOperation="org.eclipse.net4j.util.defs.ecore#//Def/getInstance"/>
@@ -18,5 +25,34 @@
     </genClasses>
     <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ExecutorServiceDef"/>
     <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ThreadPoolDef"/>
+<<<<<<< org.eclipse.net4j.util.defs.genmodel
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//RandomizerDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/algorithmName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/providerName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/seed"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//UserManagerDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//UserManagerDef/user"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//User">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/userID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/password"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef/password"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef/userID"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef/credentialsProvider"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/userManager"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/randomizer"/>
+    </genClasses>
+=======
+>>>>>>> 1.2
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.net4j.util.defs/plugin.xml b/plugins/org.eclipse.net4j.util.defs/plugin.xml
index 72dabe7b6e..80bc66ce01 100644
--- a/plugins/org.eclipse.net4j.util.defs/plugin.xml
+++ b/plugins/org.eclipse.net4j.util.defs/plugin.xml
@@ -5,7 +5,7 @@
  <copyright>
  </copyright>
 
- $Id: plugin.xml,v 1.1 2008-12-28 18:07:28 estepper Exp $
+ $Id: plugin.xml,v 1.2 2008-12-31 14:43:37 estepper Exp $
 -->
 
 <plugin>
@@ -13,7 +13,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://www.eclipse.org/NET4J/util/defs/1.0.0"
-            class="org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage"
+            class="org.eclipse.net4j.util.defs.Net4jUtilDefsPackage"
             genModel="model/org.eclipse.net4j.util.defs.genmodel"/>
    </extension>
 
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
new file mode 100644
index 0000000000..6b4588b2e7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
@@ -0,0 +1,88 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ChallengeNegotiatorDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- 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.util.defs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.Net4jUtilDefsPackage#getChallengeNegotiatorDef_UserManager()
+   * @model
+   * @generated
+   */
+  UserManagerDef getUserManager();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs.Net4jUtilDefsPackage#getChallengeNegotiatorDef_Randomizer()
+   * @model
+   * @generated
+   */
+  RandomizerDef getRandomizer();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
new file mode 100644
index 0000000000..70b13b6426
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
@@ -0,0 +1,60 @@
+/**
+ * <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
+ * </copyright>
+ * 
+ * $Id: CredentialsProviderDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- 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.util.defs.CredentialsProviderDef#getUserID <em>User ID</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.Net4jUtilDefsPackage#getCredentialsProviderDef_UserID()
+   * @model
+   * @generated
+   */
+  String getUserID();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/Def.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
new file mode 100644
index 0000000000..3b17bbecb2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
@@ -0,0 +1,45 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Def.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Def</b></em>'. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Def extends EObject
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @model kind="operation"
+   * @generated
+   */
+  Object getInstance();
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @model
+   * @generated
+   */
+  void unsetInstance();
+
+  public boolean isTouched();
+} // Def
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
new file mode 100644
index 0000000000..08331766e6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
@@ -0,0 +1,79 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: DefContainer.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Defs Container</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition <em>Default Definition</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer()
+ * @model
+ * @generated
+ */
+public interface DefContainer extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Definitions</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.net4j.util.defs.Def}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Definitions</em>' containment reference list isn't clear, there really should be more of
+   * a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Definitions</em>' containment reference list.
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer_Definitions()
+   * @model containment="true" required="true"
+   * @generated
+   */
+  EList<Def> getDefinitions();
+
+  /**
+   * Returns the value of the '<em><b>Default Definition</b></em>' reference. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Default Definition</em>' reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Default Definition</em>' reference.
+   * @see #setDefaultDefinition(Def)
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer_DefaultDefinition()
+   * @model
+   * @generated
+   */
+  Def getDefaultDefinition();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition
+   * <em>Default Definition</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Default Definition</em>' reference.
+   * @see #getDefaultDefinition()
+   * @generated
+   */
+  void setDefaultDefinition(Def value);
+
+} // DefsContainer
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefException.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java
index 3574259b79..90565f8cdc 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefException.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java
@@ -1,4 +1,4 @@
-package org.eclipse.net4j.util.net4jutildefs;
+package org.eclipse.net4j.util.defs;
 
 public class DefException extends RuntimeException
 {
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
new file mode 100644
index 0000000000..369fe99a55
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
@@ -0,0 +1,27 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ExecutorServiceDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Executor Service Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getExecutorServiceDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ExecutorServiceDef extends Def
+{
+} // ExecutorServiceDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
new file mode 100644
index 0000000000..7125dc1214
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
@@ -0,0 +1,27 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: NegotiatorDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Negotiator Def</b></em>'. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getNegotiatorDef()
+ * @model abstract="true"
+ * @generated
+ */
+public interface NegotiatorDef extends Def
+{
+
+} // NegotiatorDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
new file mode 100644
index 0000000000..d151dcae31
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
@@ -0,0 +1,108 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsFactory.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
+ * the model. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
+ * @generated
+ */
+public interface Net4jUtilDefsFactory extends EFactory
+{
+  /**
+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  Net4jUtilDefsFactory eINSTANCE = org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl.init();
+
+  /**
+   * Returns a new object of class '<em>Def Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Def Container</em>'.
+   * @generated
+   */
+  DefContainer createDefContainer();
+
+  /**
+   * Returns a new object of class '<em>Thread Pool Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Thread Pool Def</em>'.
+   * @generated
+   */
+  ThreadPoolDef createThreadPoolDef();
+
+  /**
+   * 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 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>User</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>User</em>'.
+   * @generated
+   */
+  User createUser();
+
+  /**
+   * 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>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 the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the package supported by this factory.
+   * @generated
+   */
+  Net4jUtilDefsPackage getNet4jUtilDefsPackage();
+
+} // Net4jUtilDefsFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
new file mode 100644
index 0000000000..d190f4e9c2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
@@ -0,0 +1,922 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsPackage.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface Net4jUtilDefsPackage extends EPackage
+{
+  /**
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNAME = "defs";
+
+  /**
+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0";
+
+  /**
+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNS_PREFIX = "net4j.util.defs";
+
+  /**
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  Net4jUtilDefsPackage eINSTANCE = org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.DefContainerImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDefContainer()
+   * @generated
+   */
+  int DEF_CONTAINER = 0;
+
+  /**
+   * The feature id for the '<em><b>Definitions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int DEF_CONTAINER__DEFINITIONS = 0;
+
+  /**
+   * The feature id for the '<em><b>Default Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int DEF_CONTAINER__DEFAULT_DEFINITION = 1;
+
+  /**
+   * The number of structural features of the '<em>Def Container</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int DEF_CONTAINER_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.DefImpl <em>Def</em>}' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.DefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDef()
+   * @generated
+   */
+  int DEF = 1;
+
+  /**
+   * The number of structural features of the '<em>Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int DEF_FEATURE_COUNT = 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
+   * <em>Executor Service Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
+   * @generated
+   */
+  int EXECUTOR_SERVICE_DEF = 2;
+
+  /**
+   * The number of structural features of the '<em>Executor Service Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EXECUTOR_SERVICE_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
+   * @generated
+   */
+  int THREAD_POOL_DEF = 3;
+
+  /**
+   * The number of structural features of the '<em>Thread Pool Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int THREAD_POOL_DEF_FEATURE_COUNT = EXECUTOR_SERVICE_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl <em>Randomizer Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getRandomizerDef()
+   * @generated
+   */
+  int RANDOMIZER_DEF = 4;
+
+  /**
+   * The feature id for the '<em><b>Algorithm Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RANDOMIZER_DEF__ALGORITHM_NAME = DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Provider Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RANDOMIZER_DEF__PROVIDER_NAME = DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>Seed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RANDOMIZER_DEF__SEED = DEF_FEATURE_COUNT + 2;
+
+  /**
+   * The number of structural features of the '<em>Randomizer Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RANDOMIZER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl <em>User Manager Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUserManagerDef()
+   * @generated
+   */
+  int USER_MANAGER_DEF = 5;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.UserImpl <em>User</em>}' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.UserImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUser()
+   * @generated
+   */
+  int USER = 6;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
+   * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getCredentialsProviderDef()
+   * @generated
+   */
+  int CREDENTIALS_PROVIDER_DEF = 8;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
+   * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getPasswordCredentialsProviderDef()
+   * @generated
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF = 7;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getNegotiatorDef()
+   * @generated
+   */
+  int NEGOTIATOR_DEF = 9;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
+   * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getResponseNegotiatorDef()
+   * @generated
+   */
+  int RESPONSE_NEGOTIATOR_DEF = 10;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
+   * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
+   * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getChallengeNegotiatorDef()
+   * @generated
+   */
+  int CHALLENGE_NEGOTIATOR_DEF = 11;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.DefContainer <em>Def Container</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Def Container</em>'.
+   * @see org.eclipse.net4j.util.defs.DefContainer
+   * @generated
+   */
+  EClass getDefContainer();
+
+  /**
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the containment reference list '<em>Definitions</em>'.
+   * @see org.eclipse.net4j.util.defs.DefContainer#getDefinitions()
+   * @see #getDefContainer()
+   * @generated
+   */
+  EReference getDefContainer_Definitions();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition
+   * <em>Default Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Default Definition</em>'.
+   * @see org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition()
+   * @see #getDefContainer()
+   * @generated
+   */
+  EReference getDefContainer_DefaultDefinition();
+
+  /**
+   * 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 = DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>User Manager Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int USER_MANAGER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int 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 ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CREDENTIALS_PROVIDER_DEF__USER_ID = DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Credentials Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF__USER_ID = CREDENTIALS_PROVIDER_DEF__USER_ID;
+
+  /**
+   * The feature id for the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Password Credentials Provider Def</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PASSWORD_CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Negotiator Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int NEGOTIATOR_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Credentials Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Response Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int RESPONSE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The feature id for the '<em><b>User Manager</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Randomizer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Challenge Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHALLENGE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 2;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Def</em>'.
+   * @see org.eclipse.net4j.util.defs.Def
+   * @generated
+   */
+  EClass getDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef
+   * <em>Executor Service Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Executor Service Def</em>'.
+   * @see org.eclipse.net4j.util.defs.ExecutorServiceDef
+   * @generated
+   */
+  EClass getExecutorServiceDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ThreadPoolDef <em>Thread Pool Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Thread Pool Def</em>'.
+   * @see org.eclipse.net4j.util.defs.ThreadPoolDef
+   * @generated
+   */
+  EClass getThreadPoolDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.RandomizerDef
+   * @generated
+   */
+  EClass getRandomizerDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName
+   * <em>Algorithm Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Algorithm Name</em>'.
+   * @see org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName()
+   * @see #getRandomizerDef()
+   * @generated
+   */
+  EAttribute getRandomizerDef_AlgorithmName();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName
+   * <em>Provider Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Provider Name</em>'.
+   * @see org.eclipse.net4j.util.defs.RandomizerDef#getProviderName()
+   * @see #getRandomizerDef()
+   * @generated
+   */
+  EAttribute getRandomizerDef_ProviderName();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Seed</em>'.
+   * @see org.eclipse.net4j.util.defs.RandomizerDef#getSeed()
+   * @see #getRandomizerDef()
+   * @generated
+   */
+  EAttribute getRandomizerDef_Seed();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.UserManagerDef
+   * @generated
+   */
+  EClass getUserManagerDef();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.defs.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.util.defs.UserManagerDef#getUser()
+   * @see #getUserManagerDef()
+   * @generated
+   */
+  EReference getUserManagerDef_User();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.User <em>User</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>User</em>'.
+   * @see org.eclipse.net4j.util.defs.User
+   * @generated
+   */
+  EClass getUser();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.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.util.defs.User#getUserID()
+   * @see #getUser()
+   * @generated
+   */
+  EAttribute getUser_UserID();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.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.util.defs.User#getPassword()
+   * @see #getUser()
+   * @generated
+   */
+  EAttribute getUser_Password();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.PasswordCredentialsProviderDef
+   * @generated
+   */
+  EClass getPasswordCredentialsProviderDef();
+
+  /**
+   * Returns the meta object for the attribute '
+   * {@link org.eclipse.net4j.util.defs.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.util.defs.PasswordCredentialsProviderDef#getPassword()
+   * @see #getPasswordCredentialsProviderDef()
+   * @generated
+   */
+  EAttribute getPasswordCredentialsProviderDef_Password();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.CredentialsProviderDef
+   * @generated
+   */
+  EClass getCredentialsProviderDef();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.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.util.defs.CredentialsProviderDef#getUserID()
+   * @see #getCredentialsProviderDef()
+   * @generated
+   */
+  EAttribute getCredentialsProviderDef_UserID();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.NegotiatorDef <em>Negotiator Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Negotiator Def</em>'.
+   * @see org.eclipse.net4j.util.defs.NegotiatorDef
+   * @generated
+   */
+  EClass getNegotiatorDef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.ResponseNegotiatorDef
+   * @generated
+   */
+  EClass getResponseNegotiatorDef();
+
+  /**
+   * Returns the meta object for the reference '
+   * {@link org.eclipse.net4j.util.defs.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.util.defs.ResponseNegotiatorDef#getCredentialsProvider()
+   * @see #getResponseNegotiatorDef()
+   * @generated
+   */
+  EReference getResponseNegotiatorDef_CredentialsProvider();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.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.util.defs.ChallengeNegotiatorDef
+   * @generated
+   */
+  EClass getChallengeNegotiatorDef();
+
+  /**
+   * Returns the meta object for the reference '
+   * {@link org.eclipse.net4j.util.defs.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.util.defs.ChallengeNegotiatorDef#getUserManager()
+   * @see #getChallengeNegotiatorDef()
+   * @generated
+   */
+  EReference getChallengeNegotiatorDef_UserManager();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.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.util.defs.ChallengeNegotiatorDef#getRandomizer()
+   * @see #getChallengeNegotiatorDef()
+   * @generated
+   */
+  EReference getChallengeNegotiatorDef_Randomizer();
+
+  /**
+   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
+  Net4jUtilDefsFactory getNet4jUtilDefsFactory();
+
+  /**
+   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+   * <ul>
+   * <li>each class,</li>
+   * <li>each feature of each class,</li>
+   * <li>each enum,</li>
+   * <li>and each data type</li>
+   * </ul>
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  interface Literals
+  {
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.DefContainerImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDefContainer()
+     * @generated
+     */
+    EClass DEF_CONTAINER = eINSTANCE.getDefContainer();
+
+    /**
+     * The meta object literal for the '<em><b>Definitions</b></em>' containment reference list feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference DEF_CONTAINER__DEFINITIONS = eINSTANCE.getDefContainer_Definitions();
+
+    /**
+     * The meta object literal for the '<em><b>Default Definition</b></em>' reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference DEF_CONTAINER__DEFAULT_DEFINITION = eINSTANCE.getDefContainer_DefaultDefinition();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.DefImpl <em>Def</em>}' class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.DefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDef()
+     * @generated
+     */
+    EClass DEF = eINSTANCE.getDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
+     * <em>Executor Service Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
+     * @generated
+     */
+    EClass EXECUTOR_SERVICE_DEF = eINSTANCE.getExecutorServiceDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
+     * <em>Thread Pool Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
+     * @generated
+     */
+    EClass THREAD_POOL_DEF = eINSTANCE.getThreadPoolDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
+     * <em>Randomizer Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getRandomizerDef()
+     * @generated
+     */
+    EClass RANDOMIZER_DEF = eINSTANCE.getRandomizerDef();
+
+    /**
+     * The meta object literal for the '<em><b>Algorithm Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute RANDOMIZER_DEF__ALGORITHM_NAME = eINSTANCE.getRandomizerDef_AlgorithmName();
+
+    /**
+     * The meta object literal for the '<em><b>Provider Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute RANDOMIZER_DEF__PROVIDER_NAME = eINSTANCE.getRandomizerDef_ProviderName();
+
+    /**
+     * The meta object literal for the '<em><b>Seed</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute RANDOMIZER_DEF__SEED = eINSTANCE.getRandomizerDef_Seed();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
+     * <em>User Manager Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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.util.defs.impl.UserImpl <em>User</em>}' class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.UserImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
+     * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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.util.defs.impl.CredentialsProviderDefImpl
+     * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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.util.defs.impl.NegotiatorDefImpl
+     * <em>Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getNegotiatorDef()
+     * @generated
+     */
+    EClass NEGOTIATOR_DEF = eINSTANCE.getNegotiatorDef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
+     * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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.util.defs.impl.ChallengeNegotiatorDefImpl
+     * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
+     * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#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();
+
+  }
+
+} // Net4jUtilDefsPackage
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
new file mode 100644
index 0000000000..dfa451c398
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
@@ -0,0 +1,60 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: PasswordCredentialsProviderDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- 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.util.defs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.Net4jUtilDefsPackage#getPasswordCredentialsProviderDef_Password()
+   * @model
+   * @generated
+   */
+  String getPassword();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
new file mode 100644
index 0000000000..159cfe2d46
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
@@ -0,0 +1,195 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: RandomizerDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Randomizer Def</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getRandomizerDef()
+ * @model
+ * @generated
+ */
+public interface RandomizerDef extends Def
+{
+  /**
+   * Returns the value of the '<em><b>Algorithm Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Algorithm Name</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Algorithm Name</em>' attribute.
+   * @see #isSetAlgorithmName()
+   * @see #unsetAlgorithmName()
+   * @see #setAlgorithmName(String)
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getRandomizerDef_AlgorithmName()
+   * @model unsettable="true"
+   * @generated
+   */
+  String getAlgorithmName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Algorithm Name</em>' attribute.
+   * @see #isSetAlgorithmName()
+   * @see #unsetAlgorithmName()
+   * @see #getAlgorithmName()
+   * @generated
+   */
+  void setAlgorithmName(String value);
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}
+   * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetAlgorithmName()
+   * @see #getAlgorithmName()
+   * @see #setAlgorithmName(String)
+   * @generated
+   */
+  void unsetAlgorithmName();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName
+   * <em>Algorithm Name</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Algorithm Name</em>' attribute is set.
+   * @see #unsetAlgorithmName()
+   * @see #getAlgorithmName()
+   * @see #setAlgorithmName(String)
+   * @generated
+   */
+  boolean isSetAlgorithmName();
+
+  /**
+   * Returns the value of the '<em><b>Provider Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Provider Name</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Provider Name</em>' attribute.
+   * @see #isSetProviderName()
+   * @see #unsetProviderName()
+   * @see #setProviderName(String)
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getRandomizerDef_ProviderName()
+   * @model unsettable="true"
+   * @generated
+   */
+  String getProviderName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Provider Name</em>' attribute.
+   * @see #isSetProviderName()
+   * @see #unsetProviderName()
+   * @see #getProviderName()
+   * @generated
+   */
+  void setProviderName(String value);
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetProviderName()
+   * @see #getProviderName()
+   * @see #setProviderName(String)
+   * @generated
+   */
+  void unsetProviderName();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName
+   * <em>Provider Name</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Provider Name</em>' attribute is set.
+   * @see #unsetProviderName()
+   * @see #getProviderName()
+   * @see #setProviderName(String)
+   * @generated
+   */
+  boolean isSetProviderName();
+
+  /**
+   * Returns the value of the '<em><b>Seed</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Seed</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Seed</em>' attribute.
+   * @see #isSetSeed()
+   * @see #unsetSeed()
+   * @see #setSeed(byte[])
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getRandomizerDef_Seed()
+   * @model unsettable="true"
+   * @generated
+   */
+  byte[] getSeed();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Seed</em>' attribute.
+   * @see #isSetSeed()
+   * @see #unsetSeed()
+   * @see #getSeed()
+   * @generated
+   */
+  void setSeed(byte[] value);
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #isSetSeed()
+   * @see #getSeed()
+   * @see #setSeed(byte[])
+   * @generated
+   */
+  void unsetSeed();
+
+  /**
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}'
+   * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return whether the value of the '<em>Seed</em>' attribute is set.
+   * @see #unsetSeed()
+   * @see #getSeed()
+   * @see #setSeed(byte[])
+   * @generated
+   */
+  boolean isSetSeed();
+
+} // RandomizerDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
new file mode 100644
index 0000000000..8c566ac9af
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
@@ -0,0 +1,60 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ResponseNegotiatorDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- 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.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.Net4jUtilDefsPackage#getResponseNegotiatorDef_CredentialsProvider()
+   * @model
+   * @generated
+   */
+  CredentialsProviderDef getCredentialsProvider();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
new file mode 100644
index 0000000000..6aa016435e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
@@ -0,0 +1,26 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ThreadPoolDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Thread Pool Def</b></em>'. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getThreadPoolDef()
+ * @model
+ * @generated
+ */
+public interface ThreadPoolDef extends ExecutorServiceDef
+{
+} // ThreadPoolDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
new file mode 100644
index 0000000000..781877eaa9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
@@ -0,0 +1,89 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: User.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+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.util.defs.User#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.User#getPassword <em>Password</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.Net4jUtilDefsPackage#getUser_UserID()
+   * @model
+   * @generated
+   */
+  String getUserID();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs.Net4jUtilDefsPackage#getUser_Password()
+   * @model
+   * @generated
+   */
+  String getPassword();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
new file mode 100644
index 0000000000..eaf507b5b6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
@@ -0,0 +1,74 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: UserManagerDef.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs;
+
+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.util.defs.UserManagerDef#getUser <em>User</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#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.util.defs.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.util.defs.Net4jUtilDefsPackage#getUserManagerDef_User()
+   * @model unsettable="true" required="true"
+   * @generated
+   */
+  EList<User> getUser();
+
+  /**
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.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.util.defs.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.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
new file mode 100644
index 0000000000..1bcb050317
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
@@ -0,0 +1,282 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ChallengeNegotiatorDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.defs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+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.util.defs.impl.ChallengeNegotiatorDefImpl#getUserManager <em>User Manager</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.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 Net4jUtilDefsPackage.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,
+              Net4jUtilDefsPackage.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,
+          Net4jUtilDefsPackage.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,
+              Net4jUtilDefsPackage.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, Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
+      if (resolve)
+        return getUserManager();
+      return basicGetUserManager();
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
+      setUserManager((UserManagerDef)newValue);
+      return;
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
+      setUserManager((UserManagerDef)null);
+      return;
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
+      return userManager != null;
+    case Net4jUtilDefsPackage.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(Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER), "randomizer is not set!");
+    CheckUtil.checkState(eIsSet(Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER),
+        "user manager is not set!");
+  }
+
+} // ChallengeNegotiatorDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
new file mode 100644
index 0000000000..1024e5a275
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
@@ -0,0 +1,187 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: CredentialsProviderDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.CredentialsProviderDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+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.util.defs.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 Net4jUtilDefsPackage.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, Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
new file mode 100644
index 0000000000..8f117b7f95
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
@@ -0,0 +1,243 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: DefContainerImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.DefContainer;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Defs Container</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefinitions <em>Definitions</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefaultDefinition <em>Default Definition</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class DefContainerImpl extends EObjectImpl implements DefContainer
+{
+  /**
+   * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference list. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getDefinitions()
+   * @generated
+   * @ordered
+   */
+  protected EList<Def> definitions;
+
+  /**
+   * The cached value of the '{@link #getDefaultDefinition() <em>Default Definition</em>}' reference. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getDefaultDefinition()
+   * @generated
+   * @ordered
+   */
+  protected Def defaultDefinition;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected DefContainerImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jUtilDefsPackage.Literals.DEF_CONTAINER;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EList<Def> getDefinitions()
+  {
+    if (definitions == null)
+    {
+      definitions = new EObjectContainmentEList<Def>(Def.class, this, Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS);
+    }
+    return definitions;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Def getDefaultDefinition()
+  {
+    if (defaultDefinition != null && defaultDefinition.eIsProxy())
+    {
+      InternalEObject oldDefaultDefinition = (InternalEObject)defaultDefinition;
+      defaultDefinition = (Def)eResolveProxy(oldDefaultDefinition);
+      if (defaultDefinition != oldDefaultDefinition)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
+      }
+    }
+    return defaultDefinition;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Def basicGetDefaultDefinition()
+  {
+    return defaultDefinition;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setDefaultDefinition(Def newDefaultDefinition)
+  {
+    Def oldDefaultDefinition = defaultDefinition;
+    defaultDefinition = newDefaultDefinition;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION,
+          oldDefaultDefinition, defaultDefinition));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS:
+      return ((InternalEList<?>)getDefinitions()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS:
+      return getDefinitions();
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
+      if (resolve)
+        return getDefaultDefinition();
+      return basicGetDefaultDefinition();
+    }
+    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 Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS:
+      getDefinitions().clear();
+      getDefinitions().addAll((Collection<? extends Def>)newValue);
+      return;
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
+      setDefaultDefinition((Def)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS:
+      getDefinitions().clear();
+      return;
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
+      setDefaultDefinition((Def)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFINITIONS:
+      return definitions != null && !definitions.isEmpty();
+    case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
+      return defaultDefinition != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} // DefsContainerImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
index 04956d3e63..308d0fcac4 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
@@ -1,20 +1,26 @@
 /**
  * <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
  * </copyright>
  *
- * $Id: DefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
+ * $Id: DefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
  */
-package org.eclipse.net4j.util.net4jutildefs.impl;
+package org.eclipse.net4j.util.defs.impl;
 
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
 import org.eclipse.net4j.util.event.EventUtil;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.lifecycle.ILifecycle;
 import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.util.Net4jUtilDefsUtil;
-import org.eclipse.net4j.util.net4jutildefs.util.Net4jUtilDefsUtil.IVisitor;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
@@ -35,11 +41,13 @@ import java.util.List;
 public abstract class DefImpl extends EObjectImpl implements Def
 {
 
-  /** The instance. */
+  /** The internal instance. */
   private Object instance;
 
+  /** the touched (dirty) state */
   private boolean touched;
 
+  /* Lifecycle listener for the internal instance */
   protected IListener instanceListener = new LifecycleEventAdapter()
   {
     @Override
@@ -52,12 +60,6 @@ public abstract class DefImpl extends EObjectImpl implements Def
     }
   };
 
-  /**
-   * this might be changed to a content adapter across non-containment references
-   * 
-   * @see Recipe: Subclass EContentAdapter to receive notifications across non-containment references
-   * @see http://wiki.eclipse.org/EMF/Recipes#Recipe:_Data_Migration
-   */
   /** adapter that tracks if this def was touched */
   protected Adapter touchedAdapter = new AdapterImpl()
   {
@@ -79,7 +81,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
    * 
-   * @generated
+   * @generated NOT
    */
   protected DefImpl()
   {
@@ -87,6 +89,12 @@ public abstract class DefImpl extends EObjectImpl implements Def
     eAdapters().add(touchedAdapter);
   }
 
+  /**
+   * Gets the internal instance.
+   * 
+   * @return the internal instance
+   * @ADDED
+   */
   public Object getInternalInstance()
   {
     return instance;
@@ -134,6 +142,9 @@ public abstract class DefImpl extends EObjectImpl implements Def
     }
   }
 
+  /**
+   * @ADDED
+   */
   private void setInstance()
   {
     validateDefinition();
@@ -142,12 +153,24 @@ public abstract class DefImpl extends EObjectImpl implements Def
     activateInstance(instance);
   }
 
+  /**
+   * Activate a given instance.
+   * 
+   * @param instance
+   *          the instance to activate
+   * @ADDED
+   */
   protected void activateInstance(Object instance)
   {
     LifecycleUtil.activate(instance);
   }
 
-  protected void deactivateInstance()
+  /**
+   * Deactivate a given instance.
+   * 
+   * @ADDED
+   */
+  protected void deactivateInstance(Object instance)
   {
     LifecycleUtil.deactivate(instance);
   }
@@ -156,11 +179,11 @@ public abstract class DefImpl extends EObjectImpl implements Def
    * <!-- begin-user-doc -->Unsets the instance managed by this Definition. The internal reference to it is cleared and
    * internal listeners to it are removed <!-- end-user-doc -->
    * 
-   * @generated NOT
+   * @ADDED
    */
   public void unsetInstance()
   {
-    deactivateInstance();
+    deactivateInstance(instance);
   }
 
   /**
@@ -168,6 +191,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
    * <em>defintion</em> is present
    * 
    * @return <code>true</code>, if the instance in this definition is set
+   * @ADDED
    */
   public boolean isSetInstance()
   {
@@ -179,49 +203,81 @@ public abstract class DefImpl extends EObjectImpl implements Def
    * instance.
    * 
    * @return true, if this definition was touched since it created its internal instance
+   * @ADDED
    */
   public boolean isTouched()
   {
-    IVisitor<EStructuralFeature> structuralFeaturesVisitor = new Net4jUtilDefsUtil.IVisitor<EStructuralFeature>()
+    if (touched)
+    {
+      return touched = true;
+    }
+    else
+    {
+      touched = areReferencedDefsTouched();
+    }
+    return touched;
+  }
+
+  /**
+   * Returns whether any referenced def is touched
+   * 
+   * @return true, if there's any referenced def that has been touched
+   */
+  protected boolean areReferencedDefsTouched()
+  {
+    boolean touched = false;
+    for (EStructuralFeature structuralFeature : eClass().getEStructuralFeatures())
     {
-      public void visit(EStructuralFeature structuralFeature)
+      if (structuralFeature.getEType().eClass() == Net4jUtilDefsPackage.eINSTANCE.getDef().eClass())
       {
-        if (structuralFeature.getEType().eClass() == Net4jUtilDefsPackage.eINSTANCE.getDef().eClass())
+        Object referencedObject = eGet(structuralFeature, true);
+        if (referencedObject != null)
         {
-          Object referencedObject = eGet(structuralFeature, true);
-          if (referencedObject != null)
+          if (structuralFeature.getUpperBound() != -1)
           {
-            if (structuralFeature.getUpperBound() != -1)
+            if (((Def)referencedObject).isTouched())
             {
-              touched |= ((Def)referencedObject).isTouched();
+              touched = true;
+              break;
             }
-            else
+          }
+          else
+          {
+            List<?> referenceList = (List<?>)referencedObject;
+            for (Object reference : referenceList)
             {
-              List referenceList = (List)referencedObject;
-              for (Object reference : referenceList)
+              if (((Def)reference).isTouched())
               {
-                touched |= ((Def)reference).isTouched();
+                touched = true;
+                break;
               }
             }
           }
         }
       }
-    };
-
-    Net4jUtilDefsUtil.doForAllStructuralFeatures(structuralFeaturesVisitor, eClass().getEStructuralFeatures());
+    }
     return touched;
   }
 
+  /**
+   * @ADDED
+   */
   protected void wireInstance(Object instance)
   {
     EventUtil.addListener(instance, instanceListener);
   }
 
+  /**
+   * @ADDED
+   */
   protected void unwireInstance(Object instance)
   {
     EventUtil.removeListener(instance, instanceListener);
   }
 
+  /**
+   * @ADDED
+   */
   protected void handleDeactivation(Object instance)
   {
     synchronized (this)
@@ -235,6 +291,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
    * validates the present definition. Subclasses have to provide an implementation
    * 
    * @throws IllegalStateException
+   * @ADDED
    */
   protected void validateDefinition()
   {
@@ -244,11 +301,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
    * Creates a new instance. Subclasses have to provide an implementation
    * 
    * @return a new instance
-   */
-  /**
-   * Creates a new instance. Subclasses have to provide an implementation
-   * 
-   * @return a new instance
+   * @ADDED
    */
   protected abstract Object createInstance();
 
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
new file mode 100644
index 0000000000..a239cf9f55
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
@@ -0,0 +1,53 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ExecutorServiceDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Executor Service Def</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * </p>
+ * 
+ * @generated
+ */
+public abstract class ExecutorServiceDefImpl extends DefImpl implements ExecutorServiceDef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ExecutorServiceDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jUtilDefsPackage.Literals.EXECUTOR_SERVICE_DEF;
+  }
+
+} // ExecutorServiceDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
new file mode 100644
index 0000000000..a59938fffa
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
@@ -0,0 +1,52 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: NegotiatorDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+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 Net4jUtilDefsPackage.Literals.NEGOTIATOR_DEF;
+  }
+
+} // NegotiatorDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
new file mode 100644
index 0000000000..8548d9639a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
@@ -0,0 +1,215 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsFactoryImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.util.defs.DefContainer;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.defs.ResponseNegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.User;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilDefsFactory
+{
+  /**
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public static Net4jUtilDefsFactory init()
+  {
+    try
+    {
+      Net4jUtilDefsFactory theNet4jUtilDefsFactory = (Net4jUtilDefsFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://www.eclipse.org/NET4J/util/defs/1.0.0");
+      if (theNet4jUtilDefsFactory != null)
+      {
+        return theNet4jUtilDefsFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new Net4jUtilDefsFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jUtilDefsFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER:
+      return createDefContainer();
+    case Net4jUtilDefsPackage.THREAD_POOL_DEF:
+      return createThreadPoolDef();
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF:
+      return createRandomizerDef();
+    case Net4jUtilDefsPackage.USER_MANAGER_DEF:
+      return createUserManagerDef();
+    case Net4jUtilDefsPackage.USER:
+      return createUser();
+    case Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF:
+      return createPasswordCredentialsProviderDef();
+    case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF:
+      return createResponseNegotiatorDef();
+    case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF:
+      return createChallengeNegotiatorDef();
+    default:
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public DefContainer createDefContainer()
+  {
+    DefContainerImpl defContainer = new DefContainerImpl();
+    return defContainer;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ThreadPoolDef createThreadPoolDef()
+  {
+    ThreadPoolDefImpl threadPoolDef = new ThreadPoolDefImpl();
+    return threadPoolDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public RandomizerDef createRandomizerDef()
+  {
+    RandomizerDefImpl randomizerDef = new RandomizerDefImpl();
+    return randomizerDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public UserManagerDef createUserManagerDef()
+  {
+    UserManagerDefImpl userManagerDef = new UserManagerDefImpl();
+    return userManagerDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public User createUser()
+  {
+    UserImpl user = new UserImpl();
+    return user;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public PasswordCredentialsProviderDef createPasswordCredentialsProviderDef()
+  {
+    PasswordCredentialsProviderDefImpl passwordCredentialsProviderDef = new PasswordCredentialsProviderDefImpl();
+    return passwordCredentialsProviderDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ResponseNegotiatorDef createResponseNegotiatorDef()
+  {
+    ResponseNegotiatorDefImpl responseNegotiatorDef = new ResponseNegotiatorDefImpl();
+    return responseNegotiatorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ChallengeNegotiatorDef createChallengeNegotiatorDef()
+  {
+    ChallengeNegotiatorDefImpl challengeNegotiatorDef = new ChallengeNegotiatorDefImpl();
+    return challengeNegotiatorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jUtilDefsPackage getNet4jUtilDefsPackage()
+  {
+    return (Net4jUtilDefsPackage)getEPackage();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @deprecated
+   * @generated
+   */
+  @Deprecated
+  public static Net4jUtilDefsPackage getPackage()
+  {
+    return Net4jUtilDefsPackage.eINSTANCE;
+  }
+
+} // Net4jUtilDefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
new file mode 100644
index 0000000000..b529fb8393
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
@@ -0,0 +1,632 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsPackageImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.util.defs.CredentialsProviderDef;
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.DefContainer;
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsFactory;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.defs.ResponseNegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.User;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilDefsPackage
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass defContainerEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass defEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass executorServiceDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass threadPoolDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass randomizerDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass userManagerDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass userEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass passwordCredentialsProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass credentialsProviderDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass negotiatorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass responseNegotiatorDefEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass challengeNegotiatorDefEClass = null;
+
+  /**
+   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+   * EPackage.Registry} by the package package URI value.
+   * <p>
+   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+   * performs initialization of the package, or returns the registered package, if one already exists. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private Net4jUtilDefsPackageImpl()
+  {
+    super(eNS_URI, Net4jUtilDefsFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
+   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
+   * <p>
+   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
+   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
+   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
+   * another.
+   * <p>
+   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
+  public static Net4jUtilDefsPackage init()
+  {
+    if (isInited)
+      return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
+
+    // Obtain or create and register package
+    Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .getEPackage(eNS_URI) instanceof Net4jUtilDefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
+        : new Net4jUtilDefsPackageImpl());
+
+    isInited = true;
+
+    // Create package meta-data objects
+    theNet4jUtilDefsPackage.createPackageContents();
+
+    // Initialize created meta-data
+    theNet4jUtilDefsPackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theNet4jUtilDefsPackage.freeze();
+
+    return theNet4jUtilDefsPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getDefContainer()
+  {
+    return defContainerEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getDefContainer_Definitions()
+  {
+    return (EReference)defContainerEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getDefContainer_DefaultDefinition()
+  {
+    return (EReference)defContainerEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getDef()
+  {
+    return defEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getExecutorServiceDef()
+  {
+    return executorServiceDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getThreadPoolDef()
+  {
+    return threadPoolDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getRandomizerDef()
+  {
+    return randomizerDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getRandomizerDef_AlgorithmName()
+  {
+    return (EAttribute)randomizerDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getRandomizerDef_ProviderName()
+  {
+    return (EAttribute)randomizerDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getRandomizerDef_Seed()
+  {
+    return (EAttribute)randomizerDefEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- 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 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 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 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 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 Net4jUtilDefsFactory getNet4jUtilDefsFactory()
+  {
+    return (Net4jUtilDefsFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private boolean isCreated = false;
+
+  /**
+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated)
+      return;
+    isCreated = true;
+
+    // Create classes and their features
+    defContainerEClass = createEClass(DEF_CONTAINER);
+    createEReference(defContainerEClass, DEF_CONTAINER__DEFINITIONS);
+    createEReference(defContainerEClass, DEF_CONTAINER__DEFAULT_DEFINITION);
+
+    defEClass = createEClass(DEF);
+
+    executorServiceDefEClass = createEClass(EXECUTOR_SERVICE_DEF);
+
+    threadPoolDefEClass = createEClass(THREAD_POOL_DEF);
+
+    randomizerDefEClass = createEClass(RANDOMIZER_DEF);
+    createEAttribute(randomizerDefEClass, RANDOMIZER_DEF__ALGORITHM_NAME);
+    createEAttribute(randomizerDefEClass, RANDOMIZER_DEF__PROVIDER_NAME);
+    createEAttribute(randomizerDefEClass, RANDOMIZER_DEF__SEED);
+
+    userManagerDefEClass = createEClass(USER_MANAGER_DEF);
+    createEReference(userManagerDefEClass, USER_MANAGER_DEF__USER);
+
+    userEClass = createEClass(USER);
+    createEAttribute(userEClass, USER__USER_ID);
+    createEAttribute(userEClass, USER__PASSWORD);
+
+    passwordCredentialsProviderDefEClass = createEClass(PASSWORD_CREDENTIALS_PROVIDER_DEF);
+    createEAttribute(passwordCredentialsProviderDefEClass, PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD);
+
+    credentialsProviderDefEClass = createEClass(CREDENTIALS_PROVIDER_DEF);
+    createEAttribute(credentialsProviderDefEClass, CREDENTIALS_PROVIDER_DEF__USER_ID);
+
+    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);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void initializePackageContents()
+  {
+    if (isInitialized)
+      return;
+    isInitialized = true;
+
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    executorServiceDefEClass.getESuperTypes().add(this.getDef());
+    threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef());
+    randomizerDefEClass.getESuperTypes().add(this.getDef());
+    userManagerDefEClass.getESuperTypes().add(this.getDef());
+    passwordCredentialsProviderDefEClass.getESuperTypes().add(this.getCredentialsProviderDef());
+    credentialsProviderDefEClass.getESuperTypes().add(this.getDef());
+    negotiatorDefEClass.getESuperTypes().add(this.getDef());
+    responseNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
+    challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1,
+        DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(defEClass, Def.class, "Def", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    addEOperation(defEClass, ecorePackage.getEJavaObject(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+    addEOperation(defEClass, null, "unsetInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+    initEClass(executorServiceDefEClass, ExecutorServiceDef.class, "ExecutorServiceDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(threadPoolDefEClass, ThreadPoolDef.class, "ThreadPoolDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(randomizerDefEClass, RandomizerDef.class, "RandomizerDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRandomizerDef_AlgorithmName(), ecorePackage.getEString(), "algorithmName", null, 0, 1,
+        RandomizerDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getRandomizerDef_ProviderName(), ecorePackage.getEString(), "providerName", null, 0, 1,
+        RandomizerDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getRandomizerDef_Seed(), ecorePackage.getEByteArray(), "seed", null, 0, 1, RandomizerDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(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(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(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(negotiatorDefEClass, NegotiatorDef.class, "NegotiatorDef", IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null,
+        "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1,
+        ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1,
+        ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Create resource
+    createResource(eNS_URI);
+  }
+
+} // Net4jUtilDefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
new file mode 100644
index 0000000000..ca4c7c2724
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
@@ -0,0 +1,215 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: PasswordCredentialsProviderDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef;
+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.util.defs.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 Net4jUtilDefsPackage.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,
+          Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
new file mode 100644
index 0000000000..5f9893b03e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
@@ -0,0 +1,436 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: RandomizerDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.security.Randomizer;
+
+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>Randomizer Def</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getAlgorithmName <em>Algorithm Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getProviderName <em>Provider Name</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getSeed <em>Seed</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class RandomizerDefImpl extends DefImpl implements RandomizerDef
+{
+  /**
+   * The default value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getAlgorithmName()
+   * @generated
+   * @ordered
+   */
+  protected static final String ALGORITHM_NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getAlgorithmName()
+   * @generated
+   * @ordered
+   */
+  protected String algorithmName = ALGORITHM_NAME_EDEFAULT;
+
+  /**
+   * This is true if the Algorithm Name attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  protected boolean algorithmNameESet;
+
+  /**
+   * The default value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getProviderName()
+   * @generated
+   * @ordered
+   */
+  protected static final String PROVIDER_NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getProviderName()
+   * @generated
+   * @ordered
+   */
+  protected String providerName = PROVIDER_NAME_EDEFAULT;
+
+  /**
+   * This is true if the Provider Name attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  protected boolean providerNameESet;
+
+  /**
+   * The default value of the '{@link #getSeed() <em>Seed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getSeed()
+   * @generated
+   * @ordered
+   */
+  protected static final byte[] SEED_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getSeed() <em>Seed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getSeed()
+   * @generated
+   * @ordered
+   */
+  protected byte[] seed = SEED_EDEFAULT;
+
+  /**
+   * This is true if the Seed attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  protected boolean seedESet;
+
+  @Override
+  protected Object createInstance()
+  {
+    Randomizer randomizer = new Randomizer();
+    if (isSetAlgorithmName())
+    {
+      randomizer.setAlgorithmName(getAlgorithmName());
+    }
+    if (isSetProviderName())
+    {
+      randomizer.setProviderName(getProviderName());
+    }
+    if (isSetSeed())
+    {
+      randomizer.setSeed(getSeed());
+    }
+    return randomizer;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected RandomizerDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jUtilDefsPackage.Literals.RANDOMIZER_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getAlgorithmName()
+  {
+    return algorithmName;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setAlgorithmName(String newAlgorithmName)
+  {
+    String oldAlgorithmName = algorithmName;
+    algorithmName = newAlgorithmName;
+    boolean oldAlgorithmNameESet = algorithmNameESet;
+    algorithmNameESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
+          oldAlgorithmName, algorithmName, !oldAlgorithmNameESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetAlgorithmName()
+  {
+    String oldAlgorithmName = algorithmName;
+    boolean oldAlgorithmNameESet = algorithmNameESet;
+    algorithmName = ALGORITHM_NAME_EDEFAULT;
+    algorithmNameESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
+          oldAlgorithmName, ALGORITHM_NAME_EDEFAULT, oldAlgorithmNameESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetAlgorithmName()
+  {
+    return algorithmNameESet;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getProviderName()
+  {
+    return providerName;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setProviderName(String newProviderName)
+  {
+    String oldProviderName = providerName;
+    providerName = newProviderName;
+    boolean oldProviderNameESet = providerNameESet;
+    providerNameESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
+          oldProviderName, providerName, !oldProviderNameESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetProviderName()
+  {
+    String oldProviderName = providerName;
+    boolean oldProviderNameESet = providerNameESet;
+    providerName = PROVIDER_NAME_EDEFAULT;
+    providerNameESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
+          oldProviderName, PROVIDER_NAME_EDEFAULT, oldProviderNameESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetProviderName()
+  {
+    return providerNameESet;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public byte[] getSeed()
+  {
+    return seed;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setSeed(byte[] newSeed)
+  {
+    byte[] oldSeed = seed;
+    seed = newSeed;
+    boolean oldSeedESet = seedESet;
+    seedESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed, seed,
+          !oldSeedESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void unsetSeed()
+  {
+    byte[] oldSeed = seed;
+    boolean oldSeedESet = seedESet;
+    seed = SEED_EDEFAULT;
+    seedESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed,
+          SEED_EDEFAULT, oldSeedESet));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public boolean isSetSeed()
+  {
+    return seedESet;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME:
+      return getAlgorithmName();
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME:
+      return getProviderName();
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED:
+      return getSeed();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME:
+      setAlgorithmName((String)newValue);
+      return;
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME:
+      setProviderName((String)newValue);
+      return;
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED:
+      setSeed((byte[])newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME:
+      unsetAlgorithmName();
+      return;
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME:
+      unsetProviderName();
+      return;
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED:
+      unsetSeed();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME:
+      return isSetAlgorithmName();
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME:
+      return isSetProviderName();
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED:
+      return isSetSeed();
+    }
+    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(" (algorithmName: ");
+    if (algorithmNameESet)
+      result.append(algorithmName);
+    else
+      result.append("<unset>");
+    result.append(", providerName: ");
+    if (providerNameESet)
+      result.append(providerName);
+    else
+      result.append("<unset>");
+    result.append(", seed: ");
+    if (seedESet)
+      result.append(seed);
+    else
+      result.append("<unset>");
+    result.append(')');
+    return result.toString();
+  }
+
+} // RandomizerDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
new file mode 100644
index 0000000000..fdb8de4d1c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
@@ -0,0 +1,200 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ResponseNegotiatorDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.CredentialsProviderDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.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.util.defs.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 Net4jUtilDefsPackage.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,
+              Net4jUtilDefsPackage.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,
+          Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
new file mode 100644
index 0000000000..0ff058ded3
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
@@ -0,0 +1,91 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: ThreadPoolDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Thread Pool Def</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * </p>
+ * 
+ * @generated
+ */
+public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadPoolDef
+{
+
+  private static final String THREADGROUP_IDENTIFIER = "net4j";
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ThreadPoolDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Net4jUtilDefsPackage.Literals.THREAD_POOL_DEF;
+  }
+
+  /**
+   * Gets a executor service instance. The current implementation does not reuse an instance created in a former call
+   * TODO: reuse instances
+   * 
+   * @return the instance
+   */
+  @Override
+  protected Object createInstance()
+  {
+    ExecutorService executorService = Executors.newCachedThreadPool(new DaemonThreadFactory(THREADGROUP_IDENTIFIER));
+    return executorService;
+  }
+
+  private static class DaemonThreadFactory implements ThreadFactory
+  {
+    private ThreadGroup threadGroup;
+
+    public DaemonThreadFactory(String threadGroupIdentifier)
+    {
+      super();
+      this.threadGroup = new ThreadGroup(threadGroupIdentifier);
+    }
+
+    public Thread newThread(Runnable r)
+    {
+      Thread thread = new Thread(threadGroup, r);
+      thread.setDaemon(true);
+      return thread;
+    }
+  }
+
+} // ThreadPoolDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
new file mode 100644
index 0000000000..d1d144cbc1
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
@@ -0,0 +1,242 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: UserImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.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.util.defs.impl.UserImpl#getUserID <em>User ID</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.defs.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 Net4jUtilDefsPackage.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, Net4jUtilDefsPackage.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, Net4jUtilDefsPackage.USER__PASSWORD, oldPassword, password));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Net4jUtilDefsPackage.USER__USER_ID:
+      return getUserID();
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.USER__USER_ID:
+      setUserID((String)newValue);
+      return;
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.USER__USER_ID:
+      setUserID(USER_ID_EDEFAULT);
+      return;
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.USER__USER_ID:
+      return USER_ID_EDEFAULT == null ? userID != null : !USER_ID_EDEFAULT.equals(userID);
+    case Net4jUtilDefsPackage.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.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
new file mode 100644
index 0000000000..f0f8939ea7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
@@ -0,0 +1,188 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: UserManagerDefImpl.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.impl;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.User;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+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.util.defs.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 Net4jUtilDefsPackage.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, Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
new file mode 100644
index 0000000000..fb43ef5e67
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
@@ -0,0 +1,372 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsAdapterFactory.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.util;
+
+import org.eclipse.net4j.util.defs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.util.defs.CredentialsProviderDef;
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.DefContainer;
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.defs.ResponseNegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.User;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
+ * method for each class of the model. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
+ * @generated
+ */
+public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected static Net4jUtilDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jUtilDefsAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Net4jUtilDefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
+   * end-user-doc -->
+   * 
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected Net4jUtilDefsSwitch<Adapter> modelSwitch = new Net4jUtilDefsSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseDefContainer(DefContainer object)
+    {
+      return createDefContainerAdapter();
+    }
+
+    @Override
+    public Adapter caseDef(Def object)
+    {
+      return createDefAdapter();
+    }
+
+    @Override
+    public Adapter caseExecutorServiceDef(ExecutorServiceDef object)
+    {
+      return createExecutorServiceDefAdapter();
+    }
+
+    @Override
+    public Adapter caseThreadPoolDef(ThreadPoolDef object)
+    {
+      return createThreadPoolDefAdapter();
+    }
+
+    @Override
+    public Adapter caseRandomizerDef(RandomizerDef object)
+    {
+      return createRandomizerDefAdapter();
+    }
+
+    @Override
+    public Adapter caseUserManagerDef(UserManagerDef object)
+    {
+      return createUserManagerDefAdapter();
+    }
+
+    @Override
+    public Adapter caseUser(User object)
+    {
+      return createUserAdapter();
+    }
+
+    @Override
+    public Adapter casePasswordCredentialsProviderDef(PasswordCredentialsProviderDef object)
+    {
+      return createPasswordCredentialsProviderDefAdapter();
+    }
+
+    @Override
+    public Adapter caseCredentialsProviderDef(CredentialsProviderDef object)
+    {
+      return createCredentialsProviderDefAdapter();
+    }
+
+    @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 defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
+
+  /**
+   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param target
+   *          the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.DefContainer
+   * <em>Def Container</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.defs.DefContainer
+   * @generated
+   */
+  public Adapter createDefContainerAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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.defs.Def
+   * @generated
+   */
+  public Adapter createDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef
+   * <em>Executor Service 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.defs.ExecutorServiceDef
+   * @generated
+   */
+  public Adapter createExecutorServiceDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ThreadPoolDef
+   * <em>Thread 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.util.defs.ThreadPoolDef
+   * @generated
+   */
+  public Adapter createThreadPoolDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.RandomizerDef
+   * @generated
+   */
+  public Adapter createRandomizerDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.UserManagerDef
+   * @generated
+   */
+  public Adapter createUserManagerDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.User
+   * @generated
+   */
+  public Adapter createUserAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.PasswordCredentialsProviderDef
+   * @generated
+   */
+  public Adapter createPasswordCredentialsProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.CredentialsProviderDef
+   * @generated
+   */
+  public Adapter createCredentialsProviderDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.NegotiatorDef
+   * @generated
+   */
+  public Adapter createNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.ResponseNegotiatorDef
+   * @generated
+   */
+  public Adapter createResponseNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.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.util.defs.ChallengeNegotiatorDef
+   * @generated
+   */
+  public Adapter createChallengeNegotiatorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @generated
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} // Net4jUtilDefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
new file mode 100644
index 0000000000..63d37fd43b
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
@@ -0,0 +1,438 @@
+/**
+ * <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
+ * </copyright>
+ *
+ * $Id: Net4jUtilDefsSwitch.java,v 1.1 2008-12-31 14:43:36 estepper Exp $
+ */
+package org.eclipse.net4j.util.defs.util;
+
+import org.eclipse.net4j.util.defs.ChallengeNegotiatorDef;
+import org.eclipse.net4j.util.defs.CredentialsProviderDef;
+import org.eclipse.net4j.util.defs.Def;
+import org.eclipse.net4j.util.defs.DefContainer;
+import org.eclipse.net4j.util.defs.ExecutorServiceDef;
+import org.eclipse.net4j.util.defs.NegotiatorDef;
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+import org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef;
+import org.eclipse.net4j.util.defs.RandomizerDef;
+import org.eclipse.net4j.util.defs.ResponseNegotiatorDef;
+import org.eclipse.net4j.util.defs.ThreadPoolDef;
+import org.eclipse.net4j.util.defs.User;
+import org.eclipse.net4j.util.defs.UserManagerDef;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
+ * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
+ * @generated
+ */
+public class Net4jUtilDefsSwitch<T>
+{
+  /**
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected static Net4jUtilDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Net4jUtilDefsSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Net4jUtilDefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case Net4jUtilDefsPackage.DEF_CONTAINER:
+    {
+      DefContainer defContainer = (DefContainer)theEObject;
+      T result = caseDefContainer(defContainer);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.DEF:
+    {
+      Def def = (Def)theEObject;
+      T result = caseDef(def);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.EXECUTOR_SERVICE_DEF:
+    {
+      ExecutorServiceDef executorServiceDef = (ExecutorServiceDef)theEObject;
+      T result = caseExecutorServiceDef(executorServiceDef);
+      if (result == null)
+        result = caseDef(executorServiceDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.THREAD_POOL_DEF:
+    {
+      ThreadPoolDef threadPoolDef = (ThreadPoolDef)theEObject;
+      T result = caseThreadPoolDef(threadPoolDef);
+      if (result == null)
+        result = caseExecutorServiceDef(threadPoolDef);
+      if (result == null)
+        result = caseDef(threadPoolDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.RANDOMIZER_DEF:
+    {
+      RandomizerDef randomizerDef = (RandomizerDef)theEObject;
+      T result = caseRandomizerDef(randomizerDef);
+      if (result == null)
+        result = caseDef(randomizerDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.USER:
+    {
+      User user = (User)theEObject;
+      T result = caseUser(user);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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 Net4jUtilDefsPackage.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;
+    }
+    default:
+      return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Def Container</em>'. <!-- begin-user-doc -->
+   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Def Container</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseDefContainer(DefContainer object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseDef(Def object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Executor Service 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>Executor Service Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseExecutorServiceDef(ExecutorServiceDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'. <!-- begin-user-doc -->
+   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseThreadPoolDef(ThreadPoolDef 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 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>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>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>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>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>EObject</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
+   * anyway. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} // Net4jUtilDefsSwitch
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java
deleted file mode 100644
index 354ca991ae..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Def.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDef()
- * @model abstract="true"
- * @generated
- */
-public interface Def extends EObject {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	Object getInstance();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void unsetInstance();
-
-	public boolean isTouched();
-} // Def
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java
deleted file mode 100644
index 741c04c5c8..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefsContainer.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Defs Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer()
- * @model
- * @generated
- */
-public interface DefsContainer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Definitions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.net4j.util.net4jutildefs.Def}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Definitions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Definitions</em>' containment reference list.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer_Definitions()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<Def> getDefinitions();
-
-	/**
-	 * Returns the value of the '<em><b>Default Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Definition</em>' reference.
-	 * @see #setDefaultDefinition(Def)
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer_DefaultDefinition()
-	 * @model
-	 * @generated
-	 */
-	Def getDefaultDefinition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Definition</em>' reference.
-	 * @see #getDefaultDefinition()
-	 * @generated
-	 */
-	void setDefaultDefinition(Def value);
-
-} // DefsContainer
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java
deleted file mode 100644
index 0ba08d23da..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExecutorServiceDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Executor Service Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getExecutorServiceDef()
- * @model abstract="true"
- * @generated
- */
-public interface ExecutorServiceDef extends Def {
-} // ExecutorServiceDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java
deleted file mode 100644
index c6d285f085..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public interface Net4jUtilDefsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jUtilDefsFactory eINSTANCE = org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Defs Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Defs Container</em>'.
-	 * @generated
-	 */
-	DefsContainer createDefsContainer();
-
-	/**
-	 * Returns a new object of class '<em>Thread Pool Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Thread Pool Def</em>'.
-	 * @generated
-	 */
-	ThreadPoolDef createThreadPoolDef();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	Net4jUtilDefsPackage getNet4jUtilDefsPackage();
-
-} //Net4jUtilDefsFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java
deleted file mode 100644
index 1a3915864c..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsPackage.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory
- * @model kind="package"
- * @generated
- */
-public interface Net4jUtilDefsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "net4jutildefs";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "net4jutildefs";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jUtilDefsPackage eINSTANCE = org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl <em>Defs Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDefsContainer()
-	 * @generated
-	 */
-	int DEFS_CONTAINER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Definitions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER__DEFINITIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Default Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER__DEFAULT_DEFINITION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Defs Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefImpl <em>Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDef()
-	 * @generated
-	 */
-	int DEF = 1;
-
-	/**
-	 * The number of structural features of the '<em>Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEF_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
-	 * @generated
-	 */
-	int EXECUTOR_SERVICE_DEF = 2;
-
-	/**
-	 * The number of structural features of the '<em>Executor Service Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTOR_SERVICE_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
-	 * @generated
-	 */
-	int THREAD_POOL_DEF = 3;
-
-	/**
-	 * The number of structural features of the '<em>Thread Pool Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int THREAD_POOL_DEF_FEATURE_COUNT = EXECUTOR_SERVICE_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer <em>Defs Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Defs Container</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer
-	 * @generated
-	 */
-	EClass getDefsContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions <em>Definitions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Definitions</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions()
-	 * @see #getDefsContainer()
-	 * @generated
-	 */
-	EReference getDefsContainer_Definitions();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default Definition</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition()
-	 * @see #getDefsContainer()
-	 * @generated
-	 */
-	EReference getDefsContainer_DefaultDefinition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Def
-	 * @generated
-	 */
-	EClass getDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef <em>Executor Service Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Executor Service Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef
-	 * @generated
-	 */
-	EClass getExecutorServiceDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef <em>Thread Pool Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Thread Pool Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef
-	 * @generated
-	 */
-	EClass getThreadPoolDef();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	Net4jUtilDefsFactory getNet4jUtilDefsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl <em>Defs Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDefsContainer()
-		 * @generated
-		 */
-		EClass DEFS_CONTAINER = eINSTANCE.getDefsContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Definitions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFS_CONTAINER__DEFINITIONS = eINSTANCE.getDefsContainer_Definitions();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFS_CONTAINER__DEFAULT_DEFINITION = eINSTANCE.getDefsContainer_DefaultDefinition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefImpl <em>Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDef()
-		 * @generated
-		 */
-		EClass DEF = eINSTANCE.getDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
-		 * @generated
-		 */
-		EClass EXECUTOR_SERVICE_DEF = eINSTANCE.getExecutorServiceDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
-		 * @generated
-		 */
-		EClass THREAD_POOL_DEF = eINSTANCE.getThreadPoolDef();
-
-	}
-
-} //Net4jUtilDefsPackage
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java
deleted file mode 100644
index 0fc07438ab..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ThreadPoolDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Thread Pool Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getThreadPoolDef()
- * @model
- * @generated
- */
-public interface ThreadPoolDef extends ExecutorServiceDef {
-} // ThreadPoolDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java
deleted file mode 100644
index 6dacb44613..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefsContainerImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Defs Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl#getDefaultDefinition <em>Default Definition</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefsContainerImpl extends EObjectImpl implements DefsContainer {
-	/**
-	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefinitions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Def> definitions;
-	/**
-	 * The cached value of the '{@link #getDefaultDefinition() <em>Default Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Def defaultDefinition;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefsContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.DEFS_CONTAINER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EList<Def> getDefinitions() {
-		if (definitions == null) {
-			definitions = new EObjectContainmentEList<Def>(Def.class, this, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS);
-		}
-		return definitions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Def getDefaultDefinition() {
-		if (defaultDefinition != null && defaultDefinition.eIsProxy()) {
-			InternalEObject oldDefaultDefinition = (InternalEObject)defaultDefinition;
-			defaultDefinition = (Def)eResolveProxy(oldDefaultDefinition);
-			if (defaultDefinition != oldDefaultDefinition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
-			}
-		}
-		return defaultDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Def basicGetDefaultDefinition() {
-		return defaultDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultDefinition(Def newDefaultDefinition) {
-		Def oldDefaultDefinition = defaultDefinition;
-		defaultDefinition = newDefaultDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return ((InternalEList<?>)getDefinitions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return getDefinitions();
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				if (resolve) return getDefaultDefinition();
-				return basicGetDefaultDefinition();
-		}
-		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 Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				getDefinitions().clear();
-				getDefinitions().addAll((Collection<? extends Def>)newValue);
-				return;
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				setDefaultDefinition((Def)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				getDefinitions().clear();
-				return;
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				setDefaultDefinition((Def)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return definitions != null && !definitions.isEmpty();
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				return defaultDefinition != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DefsContainerImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java
deleted file mode 100644
index 2b6e0c40cc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExecutorServiceDefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Executor Service Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ExecutorServiceDefImpl extends DefImpl implements ExecutorServiceDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExecutorServiceDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.EXECUTOR_SERVICE_DEF;
-	}
-
-} //ExecutorServiceDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java
deleted file mode 100644
index 3b4b103081..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsFactoryImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilDefsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Net4jUtilDefsFactory init() {
-		try {
-			Net4jUtilDefsFactory theNet4jUtilDefsFactory = (Net4jUtilDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/NET4J/util/defs/1.0.0"); 
-			if (theNet4jUtilDefsFactory != null) {
-				return theNet4jUtilDefsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new Net4jUtilDefsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER: return createDefsContainer();
-			case Net4jUtilDefsPackage.THREAD_POOL_DEF: return createThreadPoolDef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefsContainer createDefsContainer() {
-		DefsContainerImpl defsContainer = new DefsContainerImpl();
-		return defsContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ThreadPoolDef createThreadPoolDef() {
-		ThreadPoolDefImpl threadPoolDef = new ThreadPoolDefImpl();
-		return threadPoolDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsPackage getNet4jUtilDefsPackage() {
-		return (Net4jUtilDefsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static Net4jUtilDefsPackage getPackage() {
-		return Net4jUtilDefsPackage.eINSTANCE;
-	}
-
-} //Net4jUtilDefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java
deleted file mode 100644
index 8547a71bba..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsPackageImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilDefsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defsContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass executorServiceDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass threadPoolDefEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private Net4jUtilDefsPackageImpl() {
-		super(eNS_URI, Net4jUtilDefsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static Net4jUtilDefsPackage init() {
-		if (isInited) return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Net4jUtilDefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Net4jUtilDefsPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theNet4jUtilDefsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNet4jUtilDefsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNet4jUtilDefsPackage.freeze();
-
-		return theNet4jUtilDefsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefsContainer() {
-		return defsContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefsContainer_Definitions() {
-		return (EReference)defsContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefsContainer_DefaultDefinition() {
-		return (EReference)defsContainerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDef() {
-		return defEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExecutorServiceDef() {
-		return executorServiceDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getThreadPoolDef() {
-		return threadPoolDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsFactory getNet4jUtilDefsFactory() {
-		return (Net4jUtilDefsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		defsContainerEClass = createEClass(DEFS_CONTAINER);
-		createEReference(defsContainerEClass, DEFS_CONTAINER__DEFINITIONS);
-		createEReference(defsContainerEClass, DEFS_CONTAINER__DEFAULT_DEFINITION);
-
-		defEClass = createEClass(DEF);
-
-		executorServiceDefEClass = createEClass(EXECUTOR_SERVICE_DEF);
-
-		threadPoolDefEClass = createEClass(THREAD_POOL_DEF);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		executorServiceDefEClass.getESuperTypes().add(this.getDef());
-		threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(defsContainerEClass, DefsContainer.class, "DefsContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefsContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefsContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefsContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1, DefsContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(defEClass, Def.class, "Def", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(defEClass, ecorePackage.getEJavaObject(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(defEClass, null, "unsetInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(executorServiceDefEClass, ExecutorServiceDef.class, "ExecutorServiceDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(threadPoolDefEClass, ThreadPoolDef.class, "ThreadPoolDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //Net4jUtilDefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java
deleted file mode 100644
index c15de7cefc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ThreadPoolDefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Thread Pool Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadPoolDef {
-
-	private static final String THREADGROUP_IDENTIFIER = "net4j";
-	private ThreadGroup threadGroup;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ThreadPoolDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.THREAD_POOL_DEF;
-	}
-
-	/**
-	 * Gets a executor service instance. The current implementation does not
-	 * reuse an instance created in a former call TODO: reuse instances
-	 * 
-	 * @return the instance
-	 * 
-	 */
-	@Override
-	protected Object createInstance() {
-		ExecutorService executorService = Executors
-				.newCachedThreadPool(new DaemonThreadFactory(
-						THREADGROUP_IDENTIFIER));
-		return executorService;
-	}
-
-	private static class DaemonThreadFactory implements ThreadFactory {
-		private ThreadGroup threadGroup;
-
-		public DaemonThreadFactory(String threadGroupIdentifier) {
-			super();
-			this.threadGroup = new ThreadGroup(threadGroupIdentifier);
-		}
-
-		public Thread newThread(Runnable r) {
-			Thread thread = new Thread(threadGroup, r);
-			thread.setDaemon(true);
-			return thread;
-		}
-	}
-
-} //ThreadPoolDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java
deleted file mode 100644
index ac1788c581..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsAdapterFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jUtilDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = Net4jUtilDefsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Net4jUtilDefsSwitch<Adapter> modelSwitch =
-		new Net4jUtilDefsSwitch<Adapter>() {
-			@Override
-			public Adapter caseDefsContainer(DefsContainer object) {
-				return createDefsContainerAdapter();
-			}
-			@Override
-			public Adapter caseDef(Def object) {
-				return createDefAdapter();
-			}
-			@Override
-			public Adapter caseExecutorServiceDef(ExecutorServiceDef object) {
-				return createExecutorServiceDefAdapter();
-			}
-			@Override
-			public Adapter caseThreadPoolDef(ThreadPoolDef object) {
-				return createThreadPoolDefAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer <em>Defs Container</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.DefsContainer
-	 * @generated
-	 */
-	public Adapter createDefsContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Def
-	 * @generated
-	 */
-	public Adapter createDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef <em>Executor Service 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.ExecutorServiceDef
-	 * @generated
-	 */
-	public Adapter createExecutorServiceDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef <em>Thread 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.util.net4jutildefs.ThreadPoolDef
-	 * @generated
-	 */
-	public Adapter createThreadPoolDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //Net4jUtilDefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java
deleted file mode 100644
index 878d5501cc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsSwitch.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public class Net4jUtilDefsSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jUtilDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = Net4jUtilDefsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER: {
-				DefsContainer defsContainer = (DefsContainer)theEObject;
-				T result = caseDefsContainer(defsContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.DEF: {
-				Def def = (Def)theEObject;
-				T result = caseDef(def);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.EXECUTOR_SERVICE_DEF: {
-				ExecutorServiceDef executorServiceDef = (ExecutorServiceDef)theEObject;
-				T result = caseExecutorServiceDef(executorServiceDef);
-				if (result == null) result = caseDef(executorServiceDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.THREAD_POOL_DEF: {
-				ThreadPoolDef threadPoolDef = (ThreadPoolDef)theEObject;
-				T result = caseThreadPoolDef(threadPoolDef);
-				if (result == null) result = caseExecutorServiceDef(threadPoolDef);
-				if (result == null) result = caseDef(threadPoolDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Defs Container</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>Defs Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefsContainer(DefsContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDef(Def object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Executor Service 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>Executor Service Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExecutorServiceDef(ExecutorServiceDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseThreadPoolDef(ThreadPoolDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //Net4jUtilDefsSwitch
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java
deleted file mode 100644
index 24504fc3a9..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * The Class Net4jUtilDefsUtil.
- */
-public class Net4jUtilDefsUtil
-{
-
-  /**
-   * Are equal.
-   * 
-   * @param thisObject
-   *          the this object
-   * @param thatObject
-   *          the that object
-   * @return true, if successful
-   */
-  public static boolean areEqual(Object thisObject, Object thatObject)
-  {
-    boolean areEqual = false;
-    if (thisObject == null && thatObject == null)
-    {
-      areEqual = true;
-    }
-    else if (thisObject != null && thisObject != null)
-    {
-      areEqual = thisObject.equals(thatObject);
-    }
-    return areEqual;
-  }
-
-  /**
-   * Are equal.
-   * 
-   * @param thisList
-   *          the this list
-   * @param thatList
-   *          the that list
-   * @return true, if successful
-   */
-  public static boolean areEqual(List<?> thisList, List<?> thatList)
-  {
-    boolean areEqual = false;
-    if (thisList != null && thatList != null && thisList.size() == thatList.size())
-    {
-      for (int i = 0; i < thisList.size(); i++)
-      {
-        if (!areEqual(thisList.get(i), thatList.get(i)))
-        {
-          areEqual = false;
-          break;
-        }
-      }
-    }
-    return areEqual;
-  }
-
-  /**
-   * Do for all structural features.
-   * 
-   * @param visitor
-   *          the visitor
-   * @param structuralFeaturesList
-   *          the structural features list
-   */
-  public static <EStructuralFeature> void doForAllStructuralFeatures(IVisitor<EStructuralFeature> visitor,
-      Collection<EStructuralFeature> structuralFeatures)
-  {
-    new VisitorDelegator<EStructuralFeature>(structuralFeatures).visit(visitor);
-  }
-
-  /**
-   * The Class VisitorDelegator. It visits all members of a Collection
-   */
-  private static class VisitorDelegator<V>
-  {
-
-    /** The visited list. */
-    private Collection<V> visitedCollection;
-
-    /**
-     * Instantiates a new visitor delegator.
-     * 
-     * @param list
-     *          the list
-     */
-    private VisitorDelegator(Collection<V> collection)
-    {
-      this.visitedCollection = collection;
-    }
-
-    /**
-     * Visit a member.
-     * 
-     * @param visitor
-     *          the visitor
-     */
-    private void visit(IVisitor<V> visitor)
-    {
-      for (V visitedMember : visitedCollection)
-      {
-        visitor.visit(visitedMember);
-      }
-    }
-
-    /**
-     * Visit a member and break the visits if the current visitor returns <code>flase</code>.
-     * 
-     * @param visitor
-     *          the visitor
-     */
-    private void breakableVisit(IBreakingVisitor<V> visitor)
-    {
-      for (V visitedMember : visitedCollection)
-      {
-        if (!visitor.visit(visitedMember))
-        {
-          break;
-        }
-      }
-    }
-  }
-
-  /**
-   * The Interface IVisitor.
-   */
-  public interface IVisitor<V>
-  {
-
-    /**
-     * Visit.
-     * 
-     * @param visitedMember
-     *          the visited member
-     */
-    public void visit(V visitedMember);
-  }
-
-  /**
-   * The Interface IBreakingVisitor.
-   */
-  public interface IBreakingVisitor<V>
-  {
-
-    /**
-     * Visit.
-     * 
-     * @param visitedMember
-     *          the visited member
-     * @return true, if successful
-     */
-    public boolean visit(V visitedMember);
-  }
-}