CommonAPI-D-Bus-Tools 3.1.8

COVESA · Oct 11, 2016 · 6701309 · 6701309
1 parent 5e25670
commit 6701309
Show file tree

Hide file tree

Showing 71 changed files with 10,534 additions and 630 deletions.
diff --git a/INSTALL b/INSTALL
@@ -4,8 +4,8 @@
 :version:
 
 == Copyright
-Copyright (C) 2015, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
-Copyright (C) 2015, GENIVI Alliance, Inc.
+Copyright (C) 2015,2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
+Copyright (C) 2015,2016 GENIVI Alliance, Inc.
 
 This file is part of GENIVI Project IPC Common API C++.
 

diff --git a/org.genivi.commonapi.dbus.cli.feature/feature.xml b/org.genivi.commonapi.dbus.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.cli.feature"
       label="CommonAPI D-Bus CLI Generator Feature"
-      version="3.1.5.qualifier"
+      version="3.1.8.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">

diff --git a/org.genivi.commonapi.dbus.cli.feature/pom.xml b/org.genivi.commonapi.dbus.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product b/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.5" useFeatures="true" includeLaunchers="true">
+<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.8" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/org.genivi.commonapi.dbus.cli.product/pom.xml b/org.genivi.commonapi.dbus.cli.product/pom.xml
@@ -131,7 +131,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: commonapi D-Bus generator Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.dbus.cli;singleton:=true
-Bundle-Version: 3.1.5.qualifier
+Bundle-Version: 3.1.8.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.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.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.genivi.commonapi.console,
- org.genivi.commonapi.dbus;bundle-version="3.1.5"
+ org.genivi.commonapi.dbus;bundle-version="3.1.8"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: BMW AG
diff --git a/org.genivi.commonapi.dbus.cli/pom.xml b/org.genivi.commonapi.dbus.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/CommandLineHandlerDBus.java b/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/CommandLineHandlerDBus.java
@@ -126,7 +126,7 @@ public int excute(CommandLine parsedArguments) {
 				cliTool.listGeneratedFiles();
 			}
 			// finally invoke the generator.
-			cliTool.generateDBus(files);
+			return cliTool.generateDBus(files);
 		} else {
 			System.out.println("A *.fidl or *.fdepl file was not specified !");
 		}

diff --git a/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/DBusCommandlineToolMain.java b/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/DBusCommandlineToolMain.java
@@ -85,24 +85,24 @@ public DBusCommandlineToolMain() {
 
 	}
 
-	public void generateDBus(List<String> fileList) {
+	public int generateDBus(List<String> fileList) {
 		francaGenerator = injector.getInstance(FrancaDBusGenerator.class);
 
-		doGenerate(fileList);
+		return doGenerate(fileList);
 	}
-	
+
 	protected String normalize(String _path) {
 		File itsFile = new File(_path);
 		return itsFile.getAbsolutePath();
 	}
 
 	/**
 	 * Call the franca generator for the specified list of files.
-	 * 
+	 *
 	 * @param fileList
 	 *            the list of files to generate code from
 	 */
-	protected void doGenerate(List<String> _fileList) {
+	protected int doGenerate(List<String> _fileList) {
 		fsa.setOutputConfigurations(FPreferencesDBus.getInstance()
 				.getOutputpathConfiguration());
 
@@ -118,7 +118,7 @@ protected void doGenerate(List<String> _fileList) {
 			String absolutePath = normalize(path);
 			fileList.add(absolutePath);
 		}
-		
+
 		for (String file : fileList) {
 			URI uri = URI.createFileURI(file);
 			Resource resource = null;
@@ -169,27 +169,27 @@ protected void doGenerate(List<String> _fileList) {
 		}
 		fsa.clearFileList();
 		dumpGeneratedFiles = false;
-		System.exit(error_state);
+		return error_state;
 	}
 
 	/**
 	 * Validate the fidl/fdepl file resource
-	 * 
+	 *
 	 * @param resource
-	 */	
+	 */
 	public void validateDBus(Resource resource) {
 		EObject model = null;
 		CommandlineValidator cliValidator = new CommandlineValidator(
 				cliMessageAcceptor);
-		
+
 		//ConsoleLogger.printLog("validating " + resource.getURI().lastSegment());
 
 		model = cliValidator.loadResource(resource);
 
 		if (model != null) {
 			if (model instanceof FDModel) {
-				// Many error logs would be displayed if a SomeIP deployment file had DBus 
-				// deployment information (or vice versa).  
+				// Many error logs would be displayed if a SomeIP deployment file had DBus
+				// deployment information (or vice versa).
 				// Therefore don't validate fdepl files for DBus at the moment
 				return;
 				// cliValidator.validateImports((FDModel) model, resource.getURI());
@@ -221,7 +221,7 @@ public void setNoCommonCode() {
 				"false");
 		ConsoleLogger.printLog("No common code will be generated");
 	}
-	
+
 	public void setNoProxyCode() {
 		dbusPref.setPreference(PreferenceConstantsDBus.P_GENERATE_PROXY_DBUS,
 				"false");
@@ -320,7 +320,7 @@ public void disableSyncCalls() {
 	/**
 	 * Set the text from a file which will be inserted as a comment in each
 	 * generated file (for example your license)
-	 * 
+	 *
 	 * @param fileWithText
 	 * @return
 	 */
@@ -334,7 +334,8 @@ public void setLicenseText(String fileWithText) {
 		}
 	}
 
-	public String getFrancaVersion() {
+	@Override
+    public String getFrancaVersion() {
 		return Platform.getBundle("org.franca.core").getVersion().toString();
 	}
 

diff --git a/org.genivi.commonapi.dbus.feature/feature.xml b/org.genivi.commonapi.dbus.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.feature"
       label="%featureName"
-      version="3.1.5.qualifier"
+      version="3.1.8.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.feature/pom.xml b/org.genivi.commonapi.dbus.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.releng/pom.xml b/org.genivi.commonapi.dbus.releng/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
     <repositories>

diff --git a/org.genivi.commonapi.dbus.target/org.genivi.commonapi.dbus.target.target b/org.genivi.commonapi.dbus.target/org.genivi.commonapi.dbus.target.target
@@ -4,7 +4,7 @@
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.franca.ui.sdk.feature.group" version="0.9.1.201412191134"/>
 <unit id="org.franca.core.sdk.feature.group" version="0.9.1.201412191134"/>
-<repository location="http://franca.eclipselabs.org.codespot.com/git/update_site/releases"/>
+<repository location="http://franca.github.io/franca/update_site/releases"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.platform.sdk" version="4.4.1.M20140925-0400"/>

diff --git a/org.genivi.commonapi.dbus.target/pom.xml b/org.genivi.commonapi.dbus.target/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API DBus UI
 Bundle-SymbolicName: org.genivi.commonapi.dbus.ui;singleton:=true
-Bundle-Version: 3.1.5.qualifier
+Bundle-Version: 3.1.8.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.ui.CommonApiDBusUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -14,8 +14,8 @@ 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="3.0.0",
- org.genivi.commonapi.core.ui;bundle-version="3.1.5";visibility:=reexport,
- org.genivi.commonapi.dbus;bundle-version="3.1.5";visibility:=reexport,
+ org.genivi.commonapi.core.ui;bundle-version="3.1.8";visibility:=reexport,
+ org.genivi.commonapi.dbus;bundle-version="3.1.8";visibility:=reexport,
  org.franca.core.dsl.ui;bundle-version="0.9.1",
  org.franca.deploymodel.dsl.ui;bundle-version="0.9.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/org.genivi.commonapi.dbus.ui/pom.xml b/org.genivi.commonapi.dbus.ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.updatesite/Build CommonAPI-DBus Tools.launch b/org.genivi.commonapi.dbus.updatesite/Build CommonAPI-DBus Tools.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="target.id=org.genivi.commonapi.dbus.target"/>
+<listEntry value="COREPATH=../../ascgit017.CommonAPI-Tools"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.genivi.commonapi.dbus.releng}"/>
+</launchConfiguration>
diff --git a/org.genivi.commonapi.dbus.updatesite/category.xml b/org.genivi.commonapi.dbus.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.1.5.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.5.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_3.1.8.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.8.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.5.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.5.qualifier">
+   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.8.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.8.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">

diff --git a/org.genivi.commonapi.dbus.updatesite/pom.xml b/org.genivi.commonapi.dbus.updatesite/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator.feature/feature.xml b/org.genivi.commonapi.dbus.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.validator.feature"
       label="%featureName"
-      version="3.1.5.qualifier"
+      version="3.1.8.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.validator.feature/pom.xml b/org.genivi.commonapi.dbus.validator.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commonapi DBus Validator
 Bundle-SymbolicName: org.genivi.commonapi.dbus.validator;singleton:=true
-Bundle-Version: 3.1.5.qualifier
+Bundle-Version: 3.1.8.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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.1.5";visibility:=reexport,
- org.genivi.commonapi.dbus.ui;bundle-version="3.1.5";visibility:=reexport
+ org.genivi.commonapi.core;bundle-version="3.1.8";visibility:=reexport,
+ org.genivi.commonapi.dbus.ui;bundle-version="3.1.8";visibility:=reexport
 Export-Package: org.genivi.commonapi.dbus.validator
diff --git a/org.genivi.commonapi.dbus.validator/pom.xml b/org.genivi.commonapi.dbus.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/...ivi.commonapi.dbus.validator/src/org/genivi/commonapi/dbus/validator/ValidatorDBusUi.java b/...ivi.commonapi.dbus.validator/src/org/genivi/commonapi/dbus/validator/ValidatorDBusUi.java
@@ -23,10 +23,16 @@ public class ValidatorDBusUi extends ValidatorDBus {
     @Override
     public void validateModel(FModel model,
             ValidationMessageAcceptor messageAcceptor) {
-        if (!isValidatorEnabled()) {
-            return;
+        try {
+            if (!isValidatorEnabled()) {
+                return;
+            }
+            super.validateModel(model, messageAcceptor);
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+            throw ex;
         }
-        super.validateModel(model, messageAcceptor);
     }