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

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

1 files changed, 35 insertions, 11 deletions

diff --git a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
index 09d9c56ddc..c980695e24 100644
--- a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
+++ b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
@@ -2,17 +2,18 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.net4j.defs/src"
-    modelPluginID="org.eclipse.net4j.defs" modelName="Org.eclipse.net4j" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//net4jutildefs">
+    editDirectory="" editorDirectory="" modelPluginID="org.eclipse.net4j.defs" modelName="Org.eclipse.net4j"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//net4jutildefs">
   <foreignModel>org.eclipse.net4j.defs.ecore</foreignModel>
   <genPackages prefix="Net4jDefs" basePackage="org.eclipse.net4j" disposableProviderFactory="true"
       ecorePackage="org.eclipse.net4j.defs.ecore#/">
     <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ConnectorDef">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//ConnectorDef/userID"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProviderDef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/executorServiceDef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/negotiatorDef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolFactoryDef"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProvider"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/executorService"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/negotiator"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolProvider"/>
     </genClasses>
     <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
     <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPConnectorDef">
@@ -21,9 +22,10 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/port"/>
     </genClasses>
     <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//AcceptorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/negotiatorDef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/threadPoolDef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferPoolDef"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferProvider"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/executorService"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/negotiator"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/serverProtocolProvider"/>
     </genClasses>
     <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/host"/>
@@ -40,9 +42,31 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//HTTPConnectorDef/url"/>
     </genClasses>
     <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//NegotiatorDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//ResponseNegotiatorDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//ChallengeNegotiatorDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//ResponseNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ResponseNegotiatorDef/credentialsProvider"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//ChallengeNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ChallengeNegotiatorDef/userManager"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ChallengeNegotiatorDef/randomizer"/>
+    </genClasses>
     <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPSelectorDef"/>
     <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//BufferProviderDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//BufferPoolDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ProtocolProviderDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//CredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//CredentialsProviderDef/userID"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//PasswordCredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//PasswordCredentialsProviderDef/password"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//User">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//User/userID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//User/password"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//UserManagerDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//UserManagerDef/user"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//RandomizerDef"/>
   </genPackages>
 </genmodel:GenModel>