added missing type / method in fidl-files for tests

updated generated code

55 files changed, 63 insertions, 53 deletions

diff --git a/src/test/commonapi/tests/DerivedTypeCollection.cpp b/src/test/commonapi/tests/DerivedTypeCollection.cpp
index 16a1b4e..4b20076 100644
--- a/src/test/commonapi/tests/DerivedTypeCollection.cpp
+++ b/src/test/commonapi/tests/DerivedTypeCollection.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.h b/src/test/commonapi/tests/DerivedTypeCollection.h
index 5cdcfd0..c54d9c7 100644
--- a/src/test/commonapi/tests/DerivedTypeCollection.h
+++ b/src/test/commonapi/tests/DerivedTypeCollection.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/PredefinedTypeCollection.h b/src/test/commonapi/tests/PredefinedTypeCollection.h
index 2935703..4e991f2 100644
--- a/src/test/commonapi/tests/PredefinedTypeCollection.h
+++ b/src/test/commonapi/tests/PredefinedTypeCollection.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterface.h b/src/test/commonapi/tests/TestInterface.h
index 1c8151e..b6603e3 100644
--- a/src/test/commonapi/tests/TestInterface.h
+++ b/src/test/commonapi/tests/TestInterface.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/commonapi/tests/TestInterfaceDBusProxy.cpp
index ef42634..6830c10 100644
--- a/src/test/commonapi/tests/TestInterfaceDBusProxy.cpp
+++ b/src/test/commonapi/tests/TestInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceDBusProxy.h b/src/test/commonapi/tests/TestInterfaceDBusProxy.h
index 9ac236a..1006c5f 100644
--- a/src/test/commonapi/tests/TestInterfaceDBusProxy.h
+++ b/src/test/commonapi/tests/TestInterfaceDBusProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index 40cb19e..c453606 100644
--- a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.h b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.h
index b5b1868..6033c61 100644
--- a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.h
+++ b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceProxy.h b/src/test/commonapi/tests/TestInterfaceProxy.h
index e940343..c9889b0 100644
--- a/src/test/commonapi/tests/TestInterfaceProxy.h
+++ b/src/test/commonapi/tests/TestInterfaceProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceProxyBase.h b/src/test/commonapi/tests/TestInterfaceProxyBase.h
index ff2dd5d..f623bad 100644
--- a/src/test/commonapi/tests/TestInterfaceProxyBase.h
+++ b/src/test/commonapi/tests/TestInterfaceProxyBase.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceStub.h b/src/test/commonapi/tests/TestInterfaceStub.h
index 4cc48e7..b021356 100644
--- a/src/test/commonapi/tests/TestInterfaceStub.h
+++ b/src/test/commonapi/tests/TestInterfaceStub.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceStubDefault.cpp b/src/test/commonapi/tests/TestInterfaceStubDefault.cpp
index 5003bd0..d7171c9 100644
--- a/src/test/commonapi/tests/TestInterfaceStubDefault.cpp
+++ b/src/test/commonapi/tests/TestInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/TestInterfaceStubDefault.h b/src/test/commonapi/tests/TestInterfaceStubDefault.h
index ff320ea..625e11d 100644
--- a/src/test/commonapi/tests/TestInterfaceStubDefault.h
+++ b/src/test/commonapi/tests/TestInterfaceStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterface.h b/src/test/commonapi/tests/managed/BranchInterface.h
index 1578005..67f999a 100644
--- a/src/test/commonapi/tests/managed/BranchInterface.h
+++ b/src/test/commonapi/tests/managed/BranchInterface.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
index 0e461a6..8c557c5 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
+++ b/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.h b/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.h
index da40530..885c790 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceDBusProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
index 48e9006..5484e85 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.h b/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.h
index 6421978..650bff3 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceProxy.h b/src/test/commonapi/tests/managed/BranchInterfaceProxy.h
index a61efd1..7da0d9f 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceProxy.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceProxyBase.h b/src/test/commonapi/tests/managed/BranchInterfaceProxyBase.h
index d8cb010..2e8c354 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceProxyBase.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceProxyBase.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceStub.h b/src/test/commonapi/tests/managed/BranchInterfaceStub.h
index 01a01d5..7336009 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceStub.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceStub.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.cpp b/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
index ccb5c9d..1abf32e 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
+++ b/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.h b/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.h
index 5ea7ea7..bf7eabe 100644
--- a/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.h
+++ b/src/test/commonapi/tests/managed/BranchInterfaceStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterface.h b/src/test/commonapi/tests/managed/LeafInterface.h
index dc1d0d8..89aac87 100644
--- a/src/test/commonapi/tests/managed/LeafInterface.h
+++ b/src/test/commonapi/tests/managed/LeafInterface.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
index 8274ef4..5c163da 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
+++ b/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.h b/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.h
index 41f1e64..6616c80 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceDBusProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
index d843e01..698c9b7 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.h b/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.h
index 797ea90..beed513 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceProxy.h b/src/test/commonapi/tests/managed/LeafInterfaceProxy.h
index 94f8bcb..8414e8f 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceProxy.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceProxyBase.h b/src/test/commonapi/tests/managed/LeafInterfaceProxyBase.h
index 7e8d718..5e41392 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceProxyBase.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceProxyBase.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceStub.h b/src/test/commonapi/tests/managed/LeafInterfaceStub.h
index d31561b..f116197 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceStub.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceStub.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.cpp b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
index 01dd58b..4e88951 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
+++ b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
index fdedc9c..a673a87 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterface.h b/src/test/commonapi/tests/managed/RootInterface.h
index f239090..45efdf0 100644
--- a/src/test/commonapi/tests/managed/RootInterface.h
+++ b/src/test/commonapi/tests/managed/RootInterface.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
index b73d399..b7eb845 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
+++ b/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.h b/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.h
index cf00826..e4f6f29 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceDBusProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
index 7857f58..525f9a3 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.h b/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.h
index f8973a4..fb5bb6b 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceProxy.h b/src/test/commonapi/tests/managed/RootInterfaceProxy.h
index b01808e..e550a99 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceProxy.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceProxyBase.h b/src/test/commonapi/tests/managed/RootInterfaceProxyBase.h
index 7ebe721..20a18be 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceProxyBase.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceProxyBase.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceStub.h b/src/test/commonapi/tests/managed/RootInterfaceStub.h
index 749a26a..100c07c 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceStub.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceStub.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/commonapi/tests/managed/RootInterfaceStubDefault.cpp
index a87861d..f349054 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+++ b/src/test/commonapi/tests/managed/RootInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/RootInterfaceStubDefault.h b/src/test/commonapi/tests/managed/RootInterfaceStubDefault.h
index 6fdba46..d46aedd 100644
--- a/src/test/commonapi/tests/managed/RootInterfaceStubDefault.h
+++ b/src/test/commonapi/tests/managed/RootInterfaceStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRoot.h b/src/test/commonapi/tests/managed/SecondRoot.h
index 0b55364..600bfbf 100644
--- a/src/test/commonapi/tests/managed/SecondRoot.h
+++ b/src/test/commonapi/tests/managed/SecondRoot.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/commonapi/tests/managed/SecondRootDBusProxy.cpp
index b1eb31a..f43fde1 100644
--- a/src/test/commonapi/tests/managed/SecondRootDBusProxy.cpp
+++ b/src/test/commonapi/tests/managed/SecondRootDBusProxy.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootDBusProxy.h b/src/test/commonapi/tests/managed/SecondRootDBusProxy.h
index 4942927..782d890 100644
--- a/src/test/commonapi/tests/managed/SecondRootDBusProxy.h
+++ b/src/test/commonapi/tests/managed/SecondRootDBusProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
index e7e7719..fef5822 100644
--- a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
index 8fdb7dc..ea5168f 100644
--- a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
+++ b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootProxy.h b/src/test/commonapi/tests/managed/SecondRootProxy.h
index 2eb8cc1..9e45686 100644
--- a/src/test/commonapi/tests/managed/SecondRootProxy.h
+++ b/src/test/commonapi/tests/managed/SecondRootProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootProxyBase.h b/src/test/commonapi/tests/managed/SecondRootProxyBase.h
index 2c6d805..88eded8 100644
--- a/src/test/commonapi/tests/managed/SecondRootProxyBase.h
+++ b/src/test/commonapi/tests/managed/SecondRootProxyBase.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootStub.h b/src/test/commonapi/tests/managed/SecondRootStub.h
index 7789e5d..685fc05 100644
--- a/src/test/commonapi/tests/managed/SecondRootStub.h
+++ b/src/test/commonapi/tests/managed/SecondRootStub.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/commonapi/tests/managed/SecondRootStubDefault.cpp
index 2e1f42b..ff4965b 100644
--- a/src/test/commonapi/tests/managed/SecondRootStubDefault.cpp
+++ b/src/test/commonapi/tests/managed/SecondRootStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/commonapi/tests/managed/SecondRootStubDefault.h b/src/test/commonapi/tests/managed/SecondRootStubDefault.h
index 7c3a99d..2d5072f 100644
--- a/src/test/commonapi/tests/managed/SecondRootStubDefault.h
+++ b/src/test/commonapi/tests/managed/SecondRootStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/test-derived-types.fidl b/src/test/test-derived-types.fidl
index 07d3873..3326fd1 100644
--- a/src/test/test-derived-types.fidl
+++ b/src/test/test-derived-types.fidl
@@ -75,6 +75,10 @@ typeCollection DerivedTypeCollection {
 		UInt32 numberValue
 		DerivedTypeCollection.TestPolymorphicStruct polymorphicMember
 	}
+	
+	struct StructWithEnumKeyMap {
+		TestEnumMap testMap
+	}
 }
 
 
diff --git a/src/test/test-interface-proxy.fidl b/src/test/test-interface-proxy.fidl
index 4e57734..e2fa975 100644
--- a/src/test/test-interface-proxy.fidl
+++ b/src/test/test-interface-proxy.fidl
@@ -74,6 +74,12 @@ interface TestInterface {
     		DerivedTypeCollection.StructWithPolymorphicMember inStruct
     	}
     }
+    
+    method TestStructWithEnumKeyMapMember {
+    	in {
+    		DerivedTypeCollection.StructWithEnumKeyMap inStruct
+    	}
+    }
 
 
 	broadcast TestPredefinedTypeBroadcast {