Keyword: refactor provider-name

entity/Activity_entity/Activity_entity.aod

@@ -197,7 +197,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Contract_entity/Contract_entity.aod

@@ -208,7 +208,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -223,7 +223,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -238,7 +238,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Keyword_entity/Keyword_entity.aod

@@ -65,7 +65,7 @@
       <documentation>%aditoprj%/entity/Keyword_entity/entityfields/containername_param/documentation.adoc</documentation>
     </entityParameter>
     <entityProvider>
-      <name>generic_dfi</name>
+      <name>SpecificContainerKeywords</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <lookupIdfield>KEYID</lookupIdfield>
       <recordContainer>db</recordContainer>
@@ -122,7 +122,7 @@
       <children>
         <entityParameter>
           <name>onlyActives</name>
-          <code>%aditoprj%/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js</code>
+          <code>%aditoprj%/entity/Keyword_entity/entityfields/specificcontainerkeywords/children/onlyactives/code.js</code>
           <expose v="true" />
         </entityParameter>
       </children>

entity/Keyword_entity/documentation.adoc

 Keyword
 =======
+:toc:
 
 Simply said: A keyword is a list of key-value pairs. 
 
@@ -20,7 +21,12 @@ Keyword Entry::
 Keyword::
   Keyword describes the whole set of elements like keyword container and keyword entry. It's more like a virtual bracket for the whole construct.
   
-== Structure ==
+
+== Types of Keywords ==
+
+=== Simple Key-Value lists ===
+
+==== The Structure ====
 
 .abstract structure of keywords
 ["graphviz", subs="attributes+"]
@@ -74,4 +80,26 @@ And, to clarify an example:
 |52ce5785|2b2091eb|inactive|ContactStatus
 |=======
 
+=== Extended Key-Value lists with special Attributes ===
+
+Basically this is a extension of the <<Simple Key-Value lists>>.
+Sometimes it's neccesary to have some more propierties within a keyword-entry.
+Example:
+
+You've got a Keyword-container for Types of Communication with basically the following values:
+
+- mobile phone
+- landline phone
+- email-address
+- web-address
+
+If you want to add a general type of information like "PHONE", "MAIL", "WEB" you've to add a keyword-attribute to the keyword-entry where you can store that information.
+
+
+=== Complex Keyword as own entity ===
+
+Sometimes you've a special case where the keyword entity cannot provide all the functioality. 
+
+In that case you can always define you own entity and create your own database strucutre to represent all the information and provide all the functions you need.
 
+As an example, this could be the `Country_Entity`
\ No newline at end of file

entity/Keyword_entity/entityfields/specificcontainerkeywords/children/onlyactives/code.js

+import("system.result");
+result.string("true");//TODO: provider-code is not executed correct (did not receive the value from here)
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -323,7 +323,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Order_entity/Order_entity.aod

@@ -284,7 +284,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Organisation_entity/Organisation_entity.aod

@@ -434,7 +434,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Productprice_entity/Productprice_entity.aod

@@ -150,7 +150,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Keyword_entity</entityName>
-        <fieldName>generic_dfi</fieldName>
+        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>