From c867e4bb56e8a858f3135c8254f0153061790c01 Mon Sep 17 00:00:00 2001
From: dibpinto <131255173+dibpinto@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:16:22 +0100
Subject: [PATCH] capicxx-someip-tools 3.2.15 (#53)

- Create verification test for noRead
- Update gitignore and cleanup project
- Add FTypeDef in hasNonArrayDeployment
- Added workflow to build the project in Ubuntu, Windows, and macOS
---
 CHANGES                                       |  6 ++
 docx/.project                                 | 27 -------
 docx/index.html                               |  8 +-
 org.genivi.commonapi.releng/pom.xml           |  4 +-
 .../.project                                  | 17 ----
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../.gitignore                                |  2 -
 .../.project                                  | 11 ---
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../commonapi_someip_cli.product              |  2 +-
 .../pom.xml                                   |  2 +-
 org.genivi.commonapi.someip.cli/.classpath    |  7 --
 org.genivi.commonapi.someip.cli/.project      | 28 -------
 .../META-INF/MANIFEST.MF                      |  8 +-
 org.genivi.commonapi.someip.cli/pom.xml       |  2 +-
 .../.classpath                                |  8 --
 .../.gitignore                                |  5 --
 .../.project                                  | 34 --------
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../.settings/org.eclipse.jdt.core.prefs      |  7 --
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../.gitignore                                |  2 -
 org.genivi.commonapi.someip.feature/.project  | 19 -----
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../feature.xml                               |  8 +-
 .../license.html                              | 22 +++---
 org.genivi.commonapi.someip.feature/pom.xml   |  2 +-
 org.genivi.commonapi.someip.releng/.gitignore |  1 -
 org.genivi.commonapi.someip.releng/.project   | 11 ---
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 org.genivi.commonapi.someip.releng/pom.xml    |  2 +-
 org.genivi.commonapi.someip.target/.gitignore |  1 -
 org.genivi.commonapi.someip.target/.project   | 11 ---
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 org.genivi.commonapi.someip.target/pom.xml    |  2 +-
 org.genivi.commonapi.someip.ui/.classpath     |  7 --
 org.genivi.commonapi.someip.ui/.gitignore     |  5 --
 org.genivi.commonapi.someip.ui/.project       | 28 -------
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../.settings/org.eclipse.jdt.core.prefs      |  7 --
 .../META-INF/MANIFEST.MF                      |  8 +-
 org.genivi.commonapi.someip.ui/pom.xml        |  2 +-
 .../.gitignore                                |  2 -
 .../.project                                  | 11 ---
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../category.xml                              |  4 +-
 .../pom.xml                                   |  2 +-
 .../.gitignore                                |  2 -
 .../.project                                  | 17 ----
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../feature.xml                               |  2 +-
 .../license.html                              | 22 +++---
 .../pom.xml                                   |  2 +-
 .../.classpath                                |  7 --
 .../.gitignore                                |  3 -
 .../.project                                  | 28 -------
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../.settings/org.eclipse.jdt.core.prefs      |  7 --
 .../META-INF/MANIFEST.MF                      | 10 +--
 org.genivi.commonapi.someip.validator/pom.xml |  2 +-
 .../.gitignore                                | 20 ++++-
 .../CMakeLists.txt                            |  3 +
 .../fidl/conf/ClientIdService.fdepl.in        | 32 ++++++++
 .../fidl/conf/ti_communication.fdepl.in       | 15 ++++
 .../vsomeip-local-tcp.json                    | 44 +++++++++++
 org.genivi.commonapi.someip/.classpath        |  9 ---
 org.genivi.commonapi.someip/.gitignore        |  5 --
 org.genivi.commonapi.someip/.project          | 34 --------
 .../org.eclipse.core.resources.prefs          |  2 -
 .../.settings/org.eclipse.core.runtime.prefs  |  2 -
 .../.settings/org.eclipse.jdt.core.prefs      |  7 --
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.genivi.commonapi.someip/pom.xml           |  2 +-
 .../FInterfaceSomeIPDeploymentGenerator.xtend | 12 +--
 ...eCollectionSomeIPDeploymentGenerator.xtend |  8 +-
 ...FrancaSomeIPDeploymentAccessorHelper.xtend | 77 +++++++++++++------
 test/.project                                 | 27 -------
 88 files changed, 244 insertions(+), 540 deletions(-)
 delete mode 100644 docx/.project
 delete mode 100644 org.genivi.commonapi.someip.cli.feature/.project
 delete mode 100644 org.genivi.commonapi.someip.cli.product/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.cli.product/.project
 delete mode 100644 org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.cli/.classpath
 delete mode 100644 org.genivi.commonapi.someip.cli/.project
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.classpath
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.project
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.genivi.commonapi.someip.feature/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.feature/.project
 delete mode 100644 org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.releng/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.releng/.project
 delete mode 100644 org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.target/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.target/.project
 delete mode 100644 org.genivi.commonapi.someip.target/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.target/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.ui/.classpath
 delete mode 100644 org.genivi.commonapi.someip.ui/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.ui/.project
 delete mode 100644 org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.ui/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.genivi.commonapi.someip.updatesite/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.updatesite/.project
 delete mode 100644 org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.validator.feature/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.validator.feature/.project
 delete mode 100644 org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.validator/.classpath
 delete mode 100644 org.genivi.commonapi.someip.validator/.gitignore
 delete mode 100644 org.genivi.commonapi.someip.validator/.project
 delete mode 100644 org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip.validator/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.genivi.commonapi.someip.verification/fidl/conf/ClientIdService.fdepl.in
 create mode 100644 org.genivi.commonapi.someip.verification/vsomeip-local-tcp.json
 delete mode 100644 org.genivi.commonapi.someip/.classpath
 delete mode 100644 org.genivi.commonapi.someip/.gitignore
 delete mode 100644 org.genivi.commonapi.someip/.project
 delete mode 100644 org.genivi.commonapi.someip/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 org.genivi.commonapi.someip/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 org.genivi.commonapi.someip/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 test/.project

diff --git a/CHANGES b/CHANGES
index 7eeb3cf..0ce19e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 Changes
 =======
+v3.2.15
+- Create verification test for noRead
+- Update gitignore and cleanup project
+- Add FTypeDef in hasNonArrayDeployment
+- Added workflow to build the project in Ubuntu, Windows, and macOS
+
 v3.2.14
 - Adapt StubAdapter to new ClientId interface
 
diff --git a/docx/.project b/docx/.project
deleted file mode 100644
index 1b38626..0000000
--- a/docx/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>CommonAPI-SomeIP-Tools.docx</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docx/index.html b/docx/index.html
index a233241..43df189 100644
--- a/docx/index.html
+++ b/docx/index.html
@@ -1,8 +1,10 @@
-<html><head>
+<!DOCTYPE html>
+<html lang="en"><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>IPC Common API Tools Project Documentation</title>
 </head>
 <body>
-<table width="100%">
+<table width="100%" summary="Page Header">
+<th></th>
 <tbody><tr>
 <td>
 <a href="http://www.genivi.org/"><img src="images/icons/logo.png" alt="[IPC CommonAPI C++ Tools]"></a></td>
@@ -14,7 +16,7 @@ <h3 style="font-family:&quot;Trebuchet MS&quot;, Helvetica, sans-serif;color:#08
 <br><hr>
 <a href="../">IPC Common API C++ index</a>
 <br><br>
-<TABLE BORDER=1>
+<TABLE BORDER=1 summary="Summary">
 <TR BGCOLOR=silver><TH>Document</TH><TH>HTML</TH><TH>PDF</TH></TR>
 <TR><TD>Tutorial and examples for IPC Common API C++ usage</TD><TD><a href="html/Tutorial.html">Tutorial (HTML)</a></TD><TD><a href="pdf/Tutorial.pdf">Tutorial (PDF)</a></TD></TR>
 <TR><TD>IPC Common API C++ Specification</TD><TD><a href="html/CommonAPISpecification.html">Specification (HTML)</a></TD><TD><a href="pdf/CommonAPISpecification.pdf">Specification (PDF)</a></TD></TR>
diff --git a/org.genivi.commonapi.releng/pom.xml b/org.genivi.commonapi.releng/pom.xml
index 751d120..fdbe047 100644
--- a/org.genivi.commonapi.releng/pom.xml
+++ b/org.genivi.commonapi.releng/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>commonapi</groupId>
     <artifactId>org.genivi.commonapi.releng</artifactId>
-    <version>3.2.14-SNAPSHOT</version>
+    <version>3.2.15-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
         <tycho-version>0.22.0</tycho-version>
@@ -46,7 +46,7 @@
                         <artifact>
                             <groupId>commonapi</groupId>
                             <artifactId>${target.id}</artifactId>
-                            <version>3.2.14-SNAPSHOT</version>
+                            <version>3.2.15-SNAPSHOT</version>
                         </artifact>
                     </target>
                     <filters>
diff --git a/org.genivi.commonapi.someip.cli.feature/.project b/org.genivi.commonapi.someip.cli.feature/.project
deleted file mode 100644
index a144790..0000000
--- a/org.genivi.commonapi.someip.cli.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.cli.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.cli.feature/feature.xml b/org.genivi.commonapi.someip.cli.feature/feature.xml
index 41a44e6..90035fb 100644
--- a/org.genivi.commonapi.someip.cli.feature/feature.xml
+++ b/org.genivi.commonapi.someip.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.someip.cli.feature"
       label="GENIVI CommonAPI Some/IP Console Interface Feature"
-      version="3.2.14.qualifier"
+      version="3.2.15.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">
diff --git a/org.genivi.commonapi.someip.cli.feature/pom.xml b/org.genivi.commonapi.someip.cli.feature/pom.xml
index 6bdc248..c578bfa 100644
--- a/org.genivi.commonapi.someip.cli.feature/pom.xml
+++ b/org.genivi.commonapi.someip.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.cli.product/.gitignore b/org.genivi.commonapi.someip.cli.product/.gitignore
deleted file mode 100644
index 873d37a..0000000
--- a/org.genivi.commonapi.someip.cli.product/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-/target
diff --git a/org.genivi.commonapi.someip.cli.product/.project b/org.genivi.commonapi.someip.cli.product/.project
deleted file mode 100644
index b274526..0000000
--- a/org.genivi.commonapi.someip.cli.product/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.cli.product</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.cli.product/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product b/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product
index f97aefc..6ce2e43 100644
--- a/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product
+++ b/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="GENIVI CommonAPI Some/IP C++ Code Generator" uid="org.genivi.commonapi.someip.cli.product" id="org.genivi.commonapi.someip.cli.product" application="org.genivi.commonapi.console.application" version="3.2.14" useFeatures="true" includeLaunchers="true">
+<product name="GENIVI CommonAPI Some/IP C++ Code Generator" uid="org.genivi.commonapi.someip.cli.product" id="org.genivi.commonapi.someip.cli.product" application="org.genivi.commonapi.console.application" version="3.2.15" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.genivi.commonapi.someip.cli.product/pom.xml b/org.genivi.commonapi.someip.cli.product/pom.xml
index 1815bee..07725a9 100644
--- a/org.genivi.commonapi.someip.cli.product/pom.xml
+++ b/org.genivi.commonapi.someip.cli.product/pom.xml
@@ -144,7 +144,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.someip.cli/.classpath b/org.genivi.commonapi.someip.cli/.classpath
deleted file mode 100644
index eca7bdb..0000000
--- a/org.genivi.commonapi.someip.cli/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.genivi.commonapi.someip.cli/.project b/org.genivi.commonapi.someip.cli/.project
deleted file mode 100644
index 2ae6ce5..0000000
--- a/org.genivi.commonapi.someip.cli/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.cli</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF
index d722253..b67595c 100644
--- a/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI Some/IP Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.someip.cli;singleton:=true
-Bundle-Version: 3.2.14.qualifier
+Bundle-Version: 3.2.15.qualifier
 Bundle-Activator: org.genivi.commonapi.someip.cli.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
- org.genivi.commonapi.console;bundle-version="3.2.14",
- org.genivi.commonapi.someip;bundle-version="3.2.14",
- org.genivi.commonapi.someip.deployment.validator;bundle-version="3.2.14"
+ org.genivi.commonapi.console;bundle-version="3.2.15",
+ org.genivi.commonapi.someip;bundle-version="3.2.15",
+ org.genivi.commonapi.someip.deployment.validator;bundle-version="3.2.15"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
diff --git a/org.genivi.commonapi.someip.cli/pom.xml b/org.genivi.commonapi.someip.cli/pom.xml
index 1374e41..e5b6574 100644
--- a/org.genivi.commonapi.someip.cli/pom.xml
+++ b/org.genivi.commonapi.someip.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.deployment.validator/.classpath b/org.genivi.commonapi.someip.deployment.validator/.classpath
deleted file mode 100644
index 428337e..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.genivi.commonapi.someip.deployment.validator/.gitignore b/org.genivi.commonapi.someip.deployment.validator/.gitignore
deleted file mode 100644
index 18de1d9..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*~
-/bin
-/target
-/src-gen
-/xtend-gen
diff --git a/org.genivi.commonapi.someip.deployment.validator/.project b/org.genivi.commonapi.someip.deployment.validator/.project
deleted file mode 100644
index 54c8ee0..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.deployment.validator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF
index 3524cdf..741c95f 100644
--- a/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI Some/IP Deployment Validator
 Bundle-SymbolicName: org.genivi.commonapi.someip.deployment.validator;singleton:=true
-Bundle-Version: 3.2.14.qualifier
+Bundle-Version: 3.2.15.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
 Export-Package: org.genivi.commonapi.someip.deployment.validator
diff --git a/org.genivi.commonapi.someip.deployment.validator/pom.xml b/org.genivi.commonapi.someip.deployment.validator/pom.xml
index 41e4fb9..4121cfc 100644
--- a/org.genivi.commonapi.someip.deployment.validator/pom.xml
+++ b/org.genivi.commonapi.someip.deployment.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.feature/.gitignore b/org.genivi.commonapi.someip.feature/.gitignore
deleted file mode 100644
index 873d37a..0000000
--- a/org.genivi.commonapi.someip.feature/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-/target
diff --git a/org.genivi.commonapi.someip.feature/.project b/org.genivi.commonapi.someip.feature/.project
deleted file mode 100644
index ade9a02..0000000
--- a/org.genivi.commonapi.someip.feature/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.feature</name>
-	<comment></comment>
-	<projects>
-		<project>org.genivi.commonapi.someip</project>
-		<project>org.genivi.commonapi.someip.ui</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.feature/feature.xml b/org.genivi.commonapi.someip.feature/feature.xml
index 351293e..e839ee5 100644
--- a/org.genivi.commonapi.someip.feature/feature.xml
+++ b/org.genivi.commonapi.someip.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.someip.feature"
       label="%featureName"
-      version="3.2.14.qualifier"
+      version="3.2.15.qualifier"
       provider-name="%providerName">
 
    <copyright>
@@ -17,21 +17,21 @@
          id="org.genivi.commonapi.someip"
          download-size="0"
          install-size="0"
-         version="3.2.14.qualifier"
+         version="3.2.15.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.genivi.commonapi.someip.ui"
          download-size="0"
          install-size="0"
-         version="3.2.14.qualifier"
+         version="3.2.15.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.genivi.commonapi.someip.deployment.validator"
          download-size="0"
          install-size="0"
-         version="3.2.14.qualifier"
+         version="3.2.15.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.genivi.commonapi.someip.feature/license.html b/org.genivi.commonapi.someip.feature/license.html
index 1b04455..60f7253 100644
--- a/org.genivi.commonapi.someip.feature/license.html
+++ b/org.genivi.commonapi.someip.feature/license.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
@@ -13,8 +13,8 @@
   <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
 
   <style type="text/css">
-	body { 	font-family: 'Crimson Text', serif; 
-		max-width: 30em; 
+	body { 	font-family: 'Crimson Text', serif;
+		max-width: 30em;
 		margin-left:auto;
 		margin-right:auto;
 		text-align: justify;
@@ -22,12 +22,12 @@
 		font-size: 110%
 		}
 
-	h1, h2, h3 { 
+	h1, h2, h3 {
 		font-family: 'Lora', serif;
 	     	font-variant: small-caps;
 		}
 
-	h1 { 
+	h1 {
 		text-align: center;
 		-moz-hyphens: none;
 		font-size: 160%;
@@ -37,18 +37,18 @@
 		-moz-hyphens: none;
 		text-align: left;
 		}
-	h3 {	
+	h3 {
 		font-size: 120%;
 		-moz-hyphens: none;
-		text-align: left;		
+		text-align: left;
 		}
 
-	blockquote { 	
+	blockquote {
 		font-family: 'Droid Sans Mono', mono;
-		text-align: left; 
+		text-align: left;
 		-moz-hyphens: none;
 		}
-	
+
 	code {
 		font-family: 'Droid Sans Mono', mono;
 		}
@@ -67,7 +67,7 @@
 	}
 
 	dt {	font-family: 'Lora', serif;
-		font-weight: bold; 
+		font-weight: bold;
 		font-size: 100%;
 		}
 
diff --git a/org.genivi.commonapi.someip.feature/pom.xml b/org.genivi.commonapi.someip.feature/pom.xml
index 4533007..2e7f13a 100644
--- a/org.genivi.commonapi.someip.feature/pom.xml
+++ b/org.genivi.commonapi.someip.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.releng/.gitignore b/org.genivi.commonapi.someip.releng/.gitignore
deleted file mode 100644
index b25c15b..0000000
--- a/org.genivi.commonapi.someip.releng/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/org.genivi.commonapi.someip.releng/.project b/org.genivi.commonapi.someip.releng/.project
deleted file mode 100644
index 4d6dc75..0000000
--- a/org.genivi.commonapi.someip.releng/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.genivi.commonapi.someip.releng</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-    </buildSpec>
-    <natures>
-    </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.releng/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.releng/pom.xml b/org.genivi.commonapi.someip.releng/pom.xml
index 773dcd2..8b32e51 100644
--- a/org.genivi.commonapi.someip.releng/pom.xml
+++ b/org.genivi.commonapi.someip.releng/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
     <repositories>
diff --git a/org.genivi.commonapi.someip.target/.gitignore b/org.genivi.commonapi.someip.target/.gitignore
deleted file mode 100644
index b25c15b..0000000
--- a/org.genivi.commonapi.someip.target/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/org.genivi.commonapi.someip.target/.project b/org.genivi.commonapi.someip.target/.project
deleted file mode 100644
index 09d0989..0000000
--- a/org.genivi.commonapi.someip.target/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.genivi.commonapi.someip.target</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-    </buildSpec>
-    <natures>
-    </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.target/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.target/pom.xml b/org.genivi.commonapi.someip.target/pom.xml
index 12412ee..f77602d 100644
--- a/org.genivi.commonapi.someip.target/pom.xml
+++ b/org.genivi.commonapi.someip.target/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.ui/.classpath b/org.genivi.commonapi.someip.ui/.classpath
deleted file mode 100644
index eca7bdb..0000000
--- a/org.genivi.commonapi.someip.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.genivi.commonapi.someip.ui/.gitignore b/org.genivi.commonapi.someip.ui/.gitignore
deleted file mode 100644
index 18de1d9..0000000
--- a/org.genivi.commonapi.someip.ui/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*~
-/bin
-/target
-/src-gen
-/xtend-gen
diff --git a/org.genivi.commonapi.someip.ui/.project b/org.genivi.commonapi.someip.ui/.project
deleted file mode 100644
index ba6b98a..0000000
--- a/org.genivi.commonapi.someip.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/org.genivi.commonapi.someip.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.ui/META-INF/MANIFEST.MF
index a0c57f6..c093593 100644
--- a/org.genivi.commonapi.someip.ui/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.someip.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI Some/IP UI
 Bundle-SymbolicName: org.genivi.commonapi.someip.ui;singleton:=true
-Bundle-Version: 3.2.14.qualifier
+Bundle-Version: 3.2.15.qualifier
 Bundle-Activator: org.genivi.commonapi.someip.ui.CommonApiSomeIPUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  com.google.inject;bundle-version="[5.0.1,6.0.0)";visibility:=reexport,
- org.genivi.commonapi.core.ui;bundle-version="3.2.14",
- org.genivi.commonapi.someip;bundle-version="3.2.14",
+ org.genivi.commonapi.core.ui;bundle-version="3.2.15",
+ org.genivi.commonapi.someip;bundle-version="3.2.15",
  org.franca.core.dsl.ui;bundle-version="[0.13.1,0.14.0)",
  org.franca.deploymodel.dsl.ui;bundle-version="[0.13.1,0.14.0)",
- org.genivi.commonapi.someip.deployment.validator;bundle-version="3.2.14"
+ org.genivi.commonapi.someip.deployment.validator;bundle-version="3.2.15"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.genivi.commonapi.someip.ui
diff --git a/org.genivi.commonapi.someip.ui/pom.xml b/org.genivi.commonapi.someip.ui/pom.xml
index 4834781..0682df4 100644
--- a/org.genivi.commonapi.someip.ui/pom.xml
+++ b/org.genivi.commonapi.someip.ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.updatesite/.gitignore b/org.genivi.commonapi.someip.updatesite/.gitignore
deleted file mode 100644
index 873d37a..0000000
--- a/org.genivi.commonapi.someip.updatesite/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-/target
diff --git a/org.genivi.commonapi.someip.updatesite/.project b/org.genivi.commonapi.someip.updatesite/.project
deleted file mode 100644
index e53003b..0000000
--- a/org.genivi.commonapi.someip.updatesite/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.genivi.commonapi.someip.updatesite</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-    </buildSpec>
-    <natures>
-    </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.updatesite/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.updatesite/category.xml b/org.genivi.commonapi.someip.updatesite/category.xml
index 5b102cd..63c0364 100644
--- a/org.genivi.commonapi.someip.updatesite/category.xml
+++ b/org.genivi.commonapi.someip.updatesite/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_3.2.14.qualifier.jar" id="org.genivi.commonapi.someip.validator.feature" version="3.2.14.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_3.2.15.qualifier.jar" id="org.genivi.commonapi.someip.validator.feature" version="3.2.15.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.someip.feature_3.2.14.qualifier.jar" id="org.genivi.commonapi.someip.feature" version="3.2.14.qualifier">
+   <feature url="features/org.genivi.commonapi.someip.feature_3.2.15.qualifier.jar" id="org.genivi.commonapi.someip.feature" version="3.2.15.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">
diff --git a/org.genivi.commonapi.someip.updatesite/pom.xml b/org.genivi.commonapi.someip.updatesite/pom.xml
index ba6cdde..041057e 100644
--- a/org.genivi.commonapi.someip.updatesite/pom.xml
+++ b/org.genivi.commonapi.someip.updatesite/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.validator.feature/.gitignore b/org.genivi.commonapi.someip.validator.feature/.gitignore
deleted file mode 100644
index 873d37a..0000000
--- a/org.genivi.commonapi.someip.validator.feature/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-/target
diff --git a/org.genivi.commonapi.someip.validator.feature/.project b/org.genivi.commonapi.someip.validator.feature/.project
deleted file mode 100644
index 2ccf2bc..0000000
--- a/org.genivi.commonapi.someip.validator.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.validator.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.validator.feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.validator.feature/feature.xml b/org.genivi.commonapi.someip.validator.feature/feature.xml
index 2692e22..14bdc19 100644
--- a/org.genivi.commonapi.someip.validator.feature/feature.xml
+++ b/org.genivi.commonapi.someip.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.someip.validator.feature"
       label="%featureName"
-      version="3.2.14.qualifier"
+      version="3.2.15.qualifier"
       provider-name="%providerName">
 
    <copyright>
diff --git a/org.genivi.commonapi.someip.validator.feature/license.html b/org.genivi.commonapi.someip.validator.feature/license.html
index 1b04455..60f7253 100644
--- a/org.genivi.commonapi.someip.validator.feature/license.html
+++ b/org.genivi.commonapi.someip.validator.feature/license.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
@@ -13,8 +13,8 @@
   <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
 
   <style type="text/css">
-	body { 	font-family: 'Crimson Text', serif; 
-		max-width: 30em; 
+	body { 	font-family: 'Crimson Text', serif;
+		max-width: 30em;
 		margin-left:auto;
 		margin-right:auto;
 		text-align: justify;
@@ -22,12 +22,12 @@
 		font-size: 110%
 		}
 
-	h1, h2, h3 { 
+	h1, h2, h3 {
 		font-family: 'Lora', serif;
 	     	font-variant: small-caps;
 		}
 
-	h1 { 
+	h1 {
 		text-align: center;
 		-moz-hyphens: none;
 		font-size: 160%;
@@ -37,18 +37,18 @@
 		-moz-hyphens: none;
 		text-align: left;
 		}
-	h3 {	
+	h3 {
 		font-size: 120%;
 		-moz-hyphens: none;
-		text-align: left;		
+		text-align: left;
 		}
 
-	blockquote { 	
+	blockquote {
 		font-family: 'Droid Sans Mono', mono;
-		text-align: left; 
+		text-align: left;
 		-moz-hyphens: none;
 		}
-	
+
 	code {
 		font-family: 'Droid Sans Mono', mono;
 		}
@@ -67,7 +67,7 @@
 	}
 
 	dt {	font-family: 'Lora', serif;
-		font-weight: bold; 
+		font-weight: bold;
 		font-size: 100%;
 		}
 
diff --git a/org.genivi.commonapi.someip.validator.feature/pom.xml b/org.genivi.commonapi.someip.validator.feature/pom.xml
index 5a06b59..d94c168 100644
--- a/org.genivi.commonapi.someip.validator.feature/pom.xml
+++ b/org.genivi.commonapi.someip.validator.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.validator/.classpath b/org.genivi.commonapi.someip.validator/.classpath
deleted file mode 100644
index eca7bdb..0000000
--- a/org.genivi.commonapi.someip.validator/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.genivi.commonapi.someip.validator/.gitignore b/org.genivi.commonapi.someip.validator/.gitignore
deleted file mode 100644
index ad19da6..0000000
--- a/org.genivi.commonapi.someip.validator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-/bin
-/target
diff --git a/org.genivi.commonapi.someip.validator/.project b/org.genivi.commonapi.someip.validator/.project
deleted file mode 100644
index f8dc3db..0000000
--- a/org.genivi.commonapi.someip.validator/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip.validator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip.validator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/org.genivi.commonapi.someip.validator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.validator/META-INF/MANIFEST.MF
index 244bb3c..470f507 100644
--- a/org.genivi.commonapi.someip.validator/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.someip.validator/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI Some/IP Validator
 Bundle-SymbolicName: org.genivi.commonapi.someip.validator;singleton:=true
-Bundle-Version: 3.2.14.qualifier
+Bundle-Version: 3.2.15.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.2.14";visibility:=reexport,
- org.genivi.commonapi.core.ui;bundle-version="3.2.14",
- org.genivi.commonapi.someip;bundle-version="3.2.14";visibility:=reexport,
- org.genivi.commonapi.someip.ui;bundle-version="3.2.14";visibility:=reexport,
+ org.genivi.commonapi.core;bundle-version="3.2.15";visibility:=reexport,
+ org.genivi.commonapi.core.ui;bundle-version="3.2.15",
+ org.genivi.commonapi.someip;bundle-version="3.2.15";visibility:=reexport,
+ org.genivi.commonapi.someip.ui;bundle-version="3.2.15";visibility:=reexport,
  org.eclipse.emf.common,
  org.genivi.commonapi.someip.deployment.validator
 Export-Package: org.genivi.commonapi.someip.validator
diff --git a/org.genivi.commonapi.someip.validator/pom.xml b/org.genivi.commonapi.someip.validator/pom.xml
index b002103..f81f618 100644
--- a/org.genivi.commonapi.someip.validator/pom.xml
+++ b/org.genivi.commonapi.someip.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip.verification/.gitignore b/org.genivi.commonapi.someip.verification/.gitignore
index 01e116a..0b5cc2e 100644
--- a/org.genivi.commonapi.someip.verification/.gitignore
+++ b/org.genivi.commonapi.someip.verification/.gitignore
@@ -1,5 +1,17 @@
 build
-src-gen
-.settings
-.cproject
-.project
+/org.genivi.commonapi.someip.verification/fidl/ti_advanced_bselective.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_advanced_extended.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_advanced_managed.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_advanced_polymorph.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_communication.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_datatypes_advanced.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_datatypes_combined.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_datatypes_derived.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_datatypes_deployment.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_datatypes_primitive.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_performance_complex.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_performance_primitive.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_runtime.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_stability_sp.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_threading.fdepl
+/org.genivi.commonapi.someip.verification/fidl/mp_selective.fdepl
diff --git a/org.genivi.commonapi.someip.verification/CMakeLists.txt b/org.genivi.commonapi.someip.verification/CMakeLists.txt
index 347c8e9..d7e09bf 100644
--- a/org.genivi.commonapi.someip.verification/CMakeLists.txt
+++ b/org.genivi.commonapi.someip.verification/CMakeLists.txt
@@ -143,6 +143,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fidl/conf/ti_stability_sp.fdepl.in
     "${CMAKE_CURRENT_SOURCE_DIR}/fidl/ti_stability_sp.fdepl" @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fidl/conf/ti_threading.fdepl.in
     "${CMAKE_CURRENT_SOURCE_DIR}/fidl/ti_threading.fdepl" @ONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fidl/conf/ClientIdService.fdepl.in
+    "${CMAKE_CURRENT_SOURCE_DIR}/fidl/ClientIdService.fdepl" @ONLY)
 
 file(GLOB FDEPL_FILES "fidl/*.fdepl")
 list(REMOVE_ITEM FDEPL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/fidl/ti_datatypes_deployment.fdepl")
@@ -211,6 +213,7 @@ file(GLOB GLUE_SRCS
     "${COMMONAPI_SRC_GEN_DEST}/v1/commonapi/runtime/*SomeIP*.cpp"
     "${COMMONAPI_SRC_GEN_DEST}/v1/commonapi/threading/*SomeIP*.cpp"
     "${COMMONAPI_SRC_GEN_DEST}/v1/commonapi/stability/sp/*SomeIP*.cpp"
+    "${COMMONAPI_SRC_GEN_DEST}/v1/commonapi/vsomeipsec/*SomeIP*.cpp"
     ${DERIVED_TYPE_SRC}
     ${POLYMORPHIC_TYPE_SRC}
 )
diff --git a/org.genivi.commonapi.someip.verification/fidl/conf/ClientIdService.fdepl.in b/org.genivi.commonapi.someip.verification/fidl/conf/ClientIdService.fdepl.in
new file mode 100644
index 0000000..f46a951
--- /dev/null
+++ b/org.genivi.commonapi.someip.verification/fidl/conf/ClientIdService.fdepl.in
@@ -0,0 +1,32 @@
+import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-4-SOMEIP_deployment_spec.fdepl"
+import "@COMMONAPI_TEST_FIDL_PATH@/ClientIdService.fidl"
+
+define org.genivi.commonapi.someip.deployment for interface commonapi.vsomeipsec.ClientIdService as TS {
+    SomeIpServiceID = 45525
+
+    attribute a {
+        SomeIpGetterID = 22
+        SomeIpSetterID = 11
+        SomeIpNotifierID = 32769
+        SomeIpNotifierEventGroups = { 1 }
+    }
+
+    broadcast b2 {
+        SomeIpEventID = 32881
+        SomeIpEventGroups = { 32881 }
+    }
+
+    method m {
+        SomeIpMethodID = 100
+    }
+
+}
+
+define org.genivi.commonapi.someip.deployment for provider as CIS_INSTANCE {
+
+    instance commonapi.vsomeipsec.ClientIdService as CIS_ONE {
+        InstanceId = "1"
+        SomeIpInstanceID = 1
+    }
+
+}
diff --git a/org.genivi.commonapi.someip.verification/fidl/conf/ti_communication.fdepl.in b/org.genivi.commonapi.someip.verification/fidl/conf/ti_communication.fdepl.in
index e645d3a..3ec9fd4 100644
--- a/org.genivi.commonapi.someip.verification/fidl/conf/ti_communication.fdepl.in
+++ b/org.genivi.commonapi.someip.verification/fidl/conf/ti_communication.fdepl.in
@@ -35,6 +35,21 @@ define org.genivi.commonapi.someip.deployment for interface commonapi.communicat
         SomeIpNotifierEventGroups = { 1 }
     }
 
+    attribute testE {
+        SomeIpSetterID = 3010
+        SomeIpNotifierID = 33003
+        SomeIpNotifierEventGroups = { 1 }
+    }
+
+    attribute testF {
+        SomeIpNotifierID = 33004
+        SomeIpNotifierEventGroups = { 1 }
+    }
+
+    attribute testG {
+        SomeIpSetterID = 3011
+    }
+
     method testMethod {
         SomeIpMethodID = 515
         SomeIpReliable = true
diff --git a/org.genivi.commonapi.someip.verification/vsomeip-local-tcp.json b/org.genivi.commonapi.someip.verification/vsomeip-local-tcp.json
new file mode 100644
index 0000000..1928b5b
--- /dev/null
+++ b/org.genivi.commonapi.someip.verification/vsomeip-local-tcp.json
@@ -0,0 +1,44 @@
+{
+  "unicast" : "127.0.0.1",
+  "logging":
+  {
+    "level": "debug",
+    "console": "true",
+    "file": { "enable": "false", "path": "/var/log/vsomeip.log" },
+    "dlt": "false"
+  },
+  "applications": [
+    {
+      "name": "service-sample",
+      "id": "0x1277"
+    },
+    {
+      "name": "client-sample",
+      "id": "0x1343"
+    }
+  ],
+  "routing": {
+    "host": {
+      "name": "service-sample",
+      "uid": "1000",
+      "gid": "1000",
+      "unicast": "127.0.0.1",
+      "port": "31490"
+    },
+    "guests": {
+      "unicast": "127.0.0.1",
+      "ports": [
+        {
+          "uid": "1000",
+          "gid": "1000",
+          "ranges": [
+            {
+              "first": 31400,
+              "last": 31489
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/org.genivi.commonapi.someip/.classpath b/org.genivi.commonapi.someip/.classpath
deleted file mode 100644
index 4a3597e..0000000
--- a/org.genivi.commonapi.someip/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.genivi.commonapi.someip/.gitignore b/org.genivi.commonapi.someip/.gitignore
deleted file mode 100644
index 18de1d9..0000000
--- a/org.genivi.commonapi.someip/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*~
-/bin
-/target
-/src-gen
-/xtend-gen
diff --git a/org.genivi.commonapi.someip/.project b/org.genivi.commonapi.someip/.project
deleted file mode 100644
index 3c2d183..0000000
--- a/org.genivi.commonapi.someip/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.genivi.commonapi.someip</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.someip/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.genivi.commonapi.someip/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.someip/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.someip/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.genivi.commonapi.someip/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.genivi.commonapi.someip/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/org.genivi.commonapi.someip/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip/META-INF/MANIFEST.MF
index f10cd2d..435a120 100644
--- a/org.genivi.commonapi.someip/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.someip/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI Some/IP C++ Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 3.2.14.qualifier
+Bundle-Version: 3.2.15.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.someip;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.xtext.util;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.2.14";visibility:=reexport,
+ org.genivi.commonapi.core;bundle-version="3.2.15";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.genivi.commonapi.someip.generator,
diff --git a/org.genivi.commonapi.someip/pom.xml b/org.genivi.commonapi.someip/pom.xml
index 6b9733b..a02cc7a 100644
--- a/org.genivi.commonapi.someip/pom.xml
+++ b/org.genivi.commonapi.someip/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.2.14-SNAPSHOT</version>
+        <version>3.2.15-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPDeploymentGenerator.xtend b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPDeploymentGenerator.xtend
index 5fab95b..7a96856 100644
--- a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPDeploymentGenerator.xtend
+++ b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPDeploymentGenerator.xtend
@@ -184,7 +184,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
     def protected dispatch String generateDeploymentDefinition(FAttribute _attribute, FInterface _interface, PropertyAccessor _accessor) {
         if (_accessor.hasSpecificDeployment(_attribute) || (_attribute.array && _accessor.hasDeployment(_attribute))) {
             var String definition = ""
-            if (_attribute.array && _accessor.hasNonArrayDeployment(_attribute)) {
+            if (_attribute.array && _accessor.hasNonArrayDeployment(_attribute, _attribute.type)) {
                 if (_attribute.type.derived !== null) {
                     definition += _attribute.type.derived.generateDeploymentParameterDefinitions(_interface, _accessor)
                 }
@@ -198,7 +198,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
 		        }
             }
             definition += _attribute.getDeploymentType(_interface, true) + " " + _attribute.name + "Deployment("
-            if (_attribute.array && _accessor.hasNonArrayDeployment(_attribute)) {
+            if (_attribute.array && _accessor.hasNonArrayDeployment(_attribute, _attribute.type)) {
                 definition += "&" + _attribute.name + "ElementDeployment, "
                 definition += getArrayDeploymentParameter(_attribute.type, _attribute, _interface, _accessor)
             } else {
@@ -213,7 +213,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
     def protected String generateDeploymentDefinition(FArgument _argument, FMethod _method, FInterface _interface, PropertyAccessor _accessor) {
         if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
             var String definition = ""
-            if (_argument.array && _accessor.hasNonArrayDeployment(_argument)) {
+            if (_argument.array && _accessor.hasNonArrayDeployment(_argument, _argument.type)) {
                 if (_argument.type.derived !== null) {
                     definition += _argument.type.derived.generateDeploymentParameterDefinitions(_interface, _accessor)
                 }
@@ -227,7 +227,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
                  }
             }
             definition += _argument.getDeploymentType(_interface, true) + " " + _method.name + "_" + _argument.name + "Deployment("
-            if (_argument.array && _accessor.hasNonArrayDeployment(_argument)) {
+            if (_argument.array && _accessor.hasNonArrayDeployment(_argument, _argument.type)) {
                 definition += "&" + _method.name + "_" + _argument.name + "ElementDeployment, "
                 definition += getArrayDeploymentParameter(_argument.type, _argument, _interface, _accessor)
             } else {
@@ -241,7 +241,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
     def protected String generateDeploymentDefinition(FArgument _argument, FBroadcast _broadcast, FInterface _interface, PropertyAccessor _accessor) {
         if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
             var String definition = ""
-            if (_argument.array && _accessor.hasNonArrayDeployment(_argument)) {
+            if (_argument.array && _accessor.hasNonArrayDeployment(_argument, _argument.type)) {
                 definition += _argument.type.getDeploymentType(_interface, true) + " " + _broadcast.name + "_" + _argument.name + "ElementDeployment("
                 definition += getDeploymentParameter(_argument.type, _argument, _interface, _accessor)
                 definition += ");\n";
@@ -252,7 +252,7 @@ class FInterfaceSomeIPDeploymentGenerator extends FTypeCollectionSomeIPDeploymen
 		        }
             }
             definition += _argument.getDeploymentType(_interface, true) + " " + _broadcast.name + "_" + _argument.name + "Deployment("
-            if (_argument.array && _accessor.hasNonArrayDeployment(_argument)) {
+            if (_argument.array && _accessor.hasNonArrayDeployment(_argument, _argument.type)) {
                 definition += "&" + _broadcast.name + "_" + _argument.name + "ElementDeployment, "
                 definition += getArrayDeploymentParameter(_argument.type, _argument, _interface, _accessor)
             } else {
diff --git a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FTypeCollectionSomeIPDeploymentGenerator.xtend b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FTypeCollectionSomeIPDeploymentGenerator.xtend
index 293f772..e06e9bf 100644
--- a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FTypeCollectionSomeIPDeploymentGenerator.xtend
+++ b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FTypeCollectionSomeIPDeploymentGenerator.xtend
@@ -419,13 +419,13 @@ class FTypeCollectionSomeIPDeploymentGenerator {
                 accessorName = _accessor.name.substring(0, _accessor.name.length() - 1)
 
             definition += _field.type.generateDeploymentDefinition(_tc, _accessor)
-            if (_field.array && _accessor.hasNonArrayDeployment(_field)) {
+            if (_field.array && _accessor.hasNonArrayDeployment(_field, _field.type)) {
                 definition += _field.type.getDeploymentType(_tc, false) + " " + accessorName + "ElementDeployment("
                 definition += getDeploymentParameter(_field.type, _field, _tc, _accessor)
                 definition += ");\n";
             }
             definition += _field.getDeploymentType(_tc, true) + " " + accessorName + "Deployment("
-            if (_field.array && _accessor.hasNonArrayDeployment(_field)) {
+            if (_field.array && _accessor.hasNonArrayDeployment(_field, _field.type)) {
                 definition += "&" + accessorName + "ElementDeployment, "
                 definition += getArrayDeploymentParameter(_field.type, _field, _tc, _accessor)
             } else {
@@ -520,13 +520,13 @@ class FTypeCollectionSomeIPDeploymentGenerator {
             var String accessorName = _accessor.name
             if (_accessor.name.length > 0)
                 accessorName = _accessor.name.substring(0, _accessor.name.length() - 1)
-            if (_field.array && _accessor.hasNonArrayDeployment(_field)) {
+            if (_field.array && _accessor.hasNonArrayDeployment(_field, _field.type)) {
                 definition += _field.type.getDeploymentType(_tc, false) + " " + accessorName + "ElementDeployment("
                 definition += getDeploymentParameter(_field.type, _field, _tc, _accessor)
                 definition += ");\n";
             }
             definition += _field.getDeploymentType(_tc, true) + " " + accessorName + "Deployment("
-            if (_field.array && _accessor.hasNonArrayDeployment(_field)) {
+            if (_field.array && _accessor.hasNonArrayDeployment(_field, _field.type)) {
                 definition += "&" + accessorName + "ElementDeployment, "
                 definition += getArrayDeploymentParameter(_field.type, _field, _tc, _accessor)
             } else {
diff --git a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FrancaSomeIPDeploymentAccessorHelper.xtend b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FrancaSomeIPDeploymentAccessorHelper.xtend
index 03e4e50..2665ef0 100644
--- a/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FrancaSomeIPDeploymentAccessorHelper.xtend
+++ b/org.genivi.commonapi.someip/src/org/genivi/commonapi/someip/generator/FrancaSomeIPDeploymentAccessorHelper.xtend
@@ -1383,11 +1383,21 @@ class FrancaSomeIPDeploymentAccessorHelper {
 
         return false
     }
-    
+
     def boolean hasNonArrayDeployment(PropertyAccessor _accessor,
-                                      FTypedElement _attribute) {
-        if (_attribute.type.derived !== null
-            && _attribute.type.derived instanceof FMapType) {
+                                  FTypedElement _attribute, FTypeRef _type) {
+        if (_type.derived !== null
+            && _type.derived instanceof FTypeDef) {
+
+            val typedef = _attribute.type.derived as FTypeDef
+
+            if (predefinedTypeIsBasicType(typedef)) {
+                return _accessor.hasNonArrayDeployment(_attribute, typedef.actualType)
+            }
+        }
+
+        if (_type.derived !== null
+            && _type.derived instanceof FMapType) {
             if (hasSomeIpMapMinLength(_accessor, _attribute)) {
                 return true
             }
@@ -1399,8 +1409,8 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.predefined !== null
-            && _attribute.type.predefined == FBasicTypeId.BYTE_BUFFER) {
+        if (_type.predefined !== null
+            && _type.predefined == FBasicTypeId.BYTE_BUFFER) {
             if (hasSomeIpByteBufferMinLength(_accessor, _attribute)) {
                 return true
             }
@@ -1412,8 +1422,8 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.predefined !== null
-            && _attribute.type.predefined == FBasicTypeId.STRING) {
+        if (_type.predefined !== null
+            && _type.predefined == FBasicTypeId.STRING) {
             if (hasSomeIpStringLength (_accessor, _attribute)) {
                 return true
             }
@@ -1425,8 +1435,8 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.derived !== null
-            && _attribute.type.derived instanceof FStructType) {
+        if (_type.derived !== null
+            && _type.derived instanceof FStructType) {
             if (hasSomeIpStructLengthWidth (_accessor, _attribute)) {
                 return true
             }
@@ -1440,8 +1450,8 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.derived !== null
-            && _attribute.type.derived instanceof FUnionType) {
+        if (_type.derived !== null
+            && _type.derived instanceof FUnionType) {
             if (hasSomeIpUnionLengthWidth (_accessor, _attribute)) {
                 return true
             }
@@ -1454,7 +1464,7 @@ class FrancaSomeIPDeploymentAccessorHelper {
             if (hasSomeIpUnionMaxLength (_accessor, _attribute)) {
                 return true
             }
-            val union = _attribute.type.derived as FUnionType
+            val union = _type.derived as FUnionType
             if (_accessor.isProperOverwrite()) {
                 for (element : union.elements) {
                     if (_accessor.hasSpecificDeployment(element)) {
@@ -1464,8 +1474,8 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.derived !== null
-            && _attribute.type.derived instanceof FEnumerationType) {
+        if (_type.derived !== null
+            && _type.derived instanceof FEnumerationType) {
             if (hasSomeIpEnumWidth(_accessor, _attribute)) {
                 return true
             }
@@ -1477,15 +1487,15 @@ class FrancaSomeIPDeploymentAccessorHelper {
             }
         }
 
-        if (_attribute.type.predefined !== null
-            && (_attribute.type.predefined == FBasicTypeId.INT8
-                || _attribute.type.predefined == FBasicTypeId.INT16
-                || _attribute.type.predefined == FBasicTypeId.INT32
-                || _attribute.type.predefined == FBasicTypeId.INT64
-                || _attribute.type.predefined == FBasicTypeId.UINT8
-                || _attribute.type.predefined == FBasicTypeId.UINT16
-                || _attribute.type.predefined == FBasicTypeId.UINT32
-                || _attribute.type.predefined == FBasicTypeId.UINT64)) {
+        if (_type.predefined !== null
+            && (_type.predefined == FBasicTypeId.INT8
+                || _type.predefined == FBasicTypeId.INT16
+                || _type.predefined == FBasicTypeId.INT32
+                || _type.predefined == FBasicTypeId.INT64
+                || _type.predefined == FBasicTypeId.UINT8
+                || _type.predefined == FBasicTypeId.UINT16
+                || _type.predefined == FBasicTypeId.UINT32
+                || _type.predefined == FBasicTypeId.UINT64)) {
             if (hasSomeIpIntegerBitWidth (_accessor, _attribute)) {
                 return true
             }
@@ -1493,7 +1503,24 @@ class FrancaSomeIPDeploymentAccessorHelper {
                 return true
             }
         }
-
         return false
     }
+
+    def boolean predefinedTypeIsBasicType(FTypeDef typedef) {
+        if (typedef.actualType.predefined == FBasicTypeId.BYTE_BUFFER
+            || typedef.actualType.predefined == FBasicTypeId.STRING
+            || typedef.actualType.predefined == FBasicTypeId.INT8
+            || typedef.actualType.predefined == FBasicTypeId.INT16
+            || typedef.actualType.predefined == FBasicTypeId.INT32
+            || typedef.actualType.predefined == FBasicTypeId.INT64
+            || typedef.actualType.predefined == FBasicTypeId.UINT8
+            || typedef.actualType.predefined == FBasicTypeId.UINT16
+            || typedef.actualType.predefined == FBasicTypeId.UINT32
+            || typedef.actualType.predefined == FBasicTypeId.UINT64) {
+            return true
+        }
+        else {
+            return false
+        }
+    }
 }
diff --git a/test/.project b/test/.project
deleted file mode 100644
index 8032e1c..0000000
--- a/test/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>CommonAPI-SomeIP-Tools.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>